Skip to content

P
Pyston
Commit dc4d003b authored by Kevin Modzelewski's avatar Kevin Modzelewski
Browse files
Options

More refcounting fixes

parent 158465fc
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 45 deletions
src/runtime/builtin_modules/builtins.cpp
View file @ dc4d003b
......@@ -1137,6 +1137,8 @@ extern "C" PyObject* PyErr_NewException(char* name, PyObject* _base, PyObject* d
_base = Exception;
if (dict == NULL)
dict = new BoxedDict();
else
Py_INCREF(dict);
try {
char* dot_pos = strchr(name, '.');
......@@ -1149,11 +1151,13 @@ extern "C" PyObject* PyErr_NewException(char* name, PyObject* _base, PyObject* d
BoxedClass* base = static_cast<BoxedClass*>(_base);
if (PyDict_GetItemString(dict, "__module__") == NULL) {
PyDict_SetItemString(dict, "__module__", boxString(llvm::StringRef(name, dot_pos - name)));
PyDict_SetItemString(dict, "__module__", autoDecref(boxString(llvm::StringRef(name, dot_pos - name))));
}
checkAndThrowCAPIException();
Box* cls = runtimeCall(type_cls, ArgPassSpec(3), boxedName, BoxedTuple::create({ base }), dict, NULL, NULL);
Box* cls = runtimeCall(type_cls, ArgPassSpec(3), boxedName, autoDecref(BoxedTuple::create({ base })), dict, NULL, NULL);
Py_DECREF(boxedName);
Py_DECREF(dict);
return cls;
} catch (ExcInfo e) {
// PyErr_NewException isn't supposed to fail, and callers sometimes take advantage of that
......
src/runtime/capi.cpp
View file @ dc4d003b
......@@ -878,10 +878,12 @@ extern "C" void PyErr_SetExcInfo(PyObject* type, PyObject* value, PyObject* trac
}
extern "C" void PyErr_SetString(PyObject* exception, const char* string) noexcept {
PyErr_SetObject(exception, boxString(string));
PyErr_SetObject(exception, autoDecref(boxString(string)));
}
extern "C" void PyErr_SetObject(PyObject* exception, PyObject* value) noexcept {
Py_XINCREF(exception);
Py_XINCREF(value);
PyErr_Restore(exception, value, NULL);
}
......
src/runtime/dict.cpp
View file @ dc4d003b
......@@ -329,9 +329,18 @@ extern "C" PyObject* PyDict_GetItem(PyObject* dict, PyObject* key) noexcept {
ASSERT(PyDict_Check(dict) || dict->cls == attrwrapper_cls, "%s", getTypeName(dict));
if (PyDict_Check(dict)) {
BoxedDict* d = static_cast<BoxedDict*>(dict);
return d->getOrNull(key);
/* preserve the existing exception */
PyObject* err_type, *err_value, *err_tb;
PyErr_Fetch(&err_type, &err_value, &err_tb);
Box* b = d->getOrNull(key);
/* ignore errors */
PyErr_Restore(err_type, err_value, err_tb);
return b;
}
assert(0 && "check refcounting");
auto&& tstate = _PyThreadState_Current;
if (tstate != NULL && tstate->curexc_type != NULL) {
/* preserve the existing exception */
......@@ -392,7 +401,7 @@ extern "C" int PyDict_Next(PyObject* op, Py_ssize_t* ppos, PyObject** pkey, PyOb
extern "C" PyObject* PyDict_GetItemString(PyObject* dict, const char* key) noexcept {
if (dict->cls == attrwrapper_cls)
return unwrapAttrWrapper(dict)->getattr(internStringMortal(key));
return unwrapAttrWrapper(dict)->getattr(autoDecref(internStringMortal(key)));
Box* key_s;
try {
......@@ -400,7 +409,7 @@ extern "C" PyObject* PyDict_GetItemString(PyObject* dict, const char* key) noexc
} catch (ExcInfo e) {
abort();
}
return PyDict_GetItem(dict, key_s);
return PyDict_GetItem(dict, autoDecref(key_s));
}
Box* dictSetitem(BoxedDict* self, Box* k, Box* v) {
......
src/runtime/hiddenclass.cpp
View file @ dc4d003b
......@@ -79,6 +79,7 @@ HiddenClass* HiddenClass::getOrMakeChild(BoxedString* attr) {
static StatCounter num_hclses("num_hidden_classes");
num_hclses.log();
// XXX: need to hold a ref to the string (or maybe we don't if we can hook the un-interning)
HiddenClass* rtn = new HiddenClass(this);
rtn->attr_offsets[attr] = this->attributeArraySize();
this->children[attr] = rtn;
......
src/runtime/objmodel.cpp
View file @ dc4d003b
......@@ -551,12 +551,28 @@ void BoxedClass::finishInitialization() {
tp_flags |= Py_TPFLAGS_READY;
}
static int
subtype_traverse(PyObject *self, visitproc visit, void *arg)
{
Py_FatalError("unimplemented");
#if 0
PyTypeObject *type, *base;
static int traverse_slots(BoxedClass* type, PyObject* self, visitproc visit, void* arg) noexcept {
Py_ssize_t i, n;
PyMemberDef* mp;
n = Py_SIZE(type);
mp = PyHeapType_GET_MEMBERS((BoxedHeapClass*)type);
for (i = 0; i < n; i++, mp++) {
if (mp->type == T_OBJECT_EX) {
char* addr = (char*)self + mp->offset;
PyObject* obj = *(PyObject**)addr;
if (obj != NULL) {
int err = visit(obj, arg);
if (err)
return err;
}
}
}
return 0;
}
static int subtype_traverse(PyObject* self, visitproc visit, void* arg) noexcept {
PyTypeObject* type, *base;
traverseproc basetraverse;
/* Find the nearest base with a different tp_traverse,
......@@ -574,7 +590,7 @@ subtype_traverse(PyObject *self, visitproc visit, void *arg)
}
if (type->tp_dictoffset != base->tp_dictoffset) {
PyObject **dictptr = _PyObject_GetDictPtr(self);
PyObject** dictptr = _PyObject_GetDictPtr(self);
if (dictptr && *dictptr)
Py_VISIT(*dictptr);
}
......@@ -588,15 +604,28 @@ subtype_traverse(PyObject *self, visitproc visit, void *arg)
if (basetraverse)
return basetraverse(self, visit, arg);
return 0;
#endif
}
static int
subtype_clear(PyObject *self)
{
Py_FatalError("unimplemented");
#if 0
PyTypeObject *type, *base;
static void clear_slots(BoxedClass* type, PyObject* self) noexcept {
Py_ssize_t i, n;
PyMemberDef* mp;
n = Py_SIZE(type);
mp = PyHeapType_GET_MEMBERS((BoxedHeapClass*)type);
for (i = 0; i < n; i++, mp++) {
if (mp->type == T_OBJECT_EX && !(mp->flags & READONLY)) {
char* addr = (char*)self + mp->offset;
PyObject* obj = *(PyObject**)addr;
if (obj != NULL) {
*(PyObject**)addr = NULL;
Py_DECREF(obj);
}
}
}
}
static int subtype_clear(PyObject* self) noexcept {
PyTypeObject* type, *base;
inquiry baseclear;
/* Find the nearest base with a different tp_clear
......@@ -621,24 +650,19 @@ subtype_clear(PyObject *self)
if (baseclear)
return baseclear(self);
return 0;
#endif
}
BoxedHeapClass::BoxedHeapClass(BoxedClass* base, int attrs_offset, int weaklist_offset,
int instance_size, bool is_user_defined, BoxedString* name)
: BoxedClass(base, attrs_offset, weaklist_offset, instance_size, is_user_defined, name->data(), subtype_dealloc, NULL),
BoxedHeapClass::BoxedHeapClass(BoxedClass* base, int attrs_offset, int weaklist_offset, int instance_size,
bool is_user_defined, BoxedString* name)
: BoxedClass(base, attrs_offset, weaklist_offset, instance_size, is_user_defined, name->data(), subtype_dealloc,
PyObject_GC_Del, true, subtype_traverse, subtype_clear),
ht_name(name),
ht_slots(NULL) {
assert(is_user_defined);
/* Always override allocation strategy to use regular heap */
this->tp_alloc = PyType_GenericAlloc;
if (this->tp_flags & Py_TPFLAGS_HAVE_GC) {
this->tp_free = PyObject_GC_Del;
this->tp_traverse = subtype_traverse;
this->tp_clear = subtype_clear;
} else
this->tp_free = PyObject_Del;
assert(this->tp_flags & Py_TPFLAGS_HAVE_GC); // Otherwise, could have avoided setting GC tp slots.
tp_as_number = &as_number;
tp_as_mapping = &as_mapping;
......@@ -667,7 +691,7 @@ BoxedHeapClass* BoxedHeapClass::create(BoxedClass* metaclass, BoxedClass* base,
// expectations as to who was going to calculate them:
assert(!made->tp_mro);
assert(!made->tp_bases);
made->tp_bases = bases;
made->tp_bases = incref(bases);
made->finishInitialization();
assert(made->tp_mro);
......@@ -980,8 +1004,11 @@ void Box::setattr(BoxedString* attr, Box* val, SetattrRewriteArgs* rewrite_args)
assert(offset < hcls->attributeArraySize());
Box* prev = attrs->attr_list->attrs[offset];
attrs->attr_list->attrs[offset] = val;
Py_INCREF(val);
Py_DECREF(prev);
if (rewrite_args) {
assert(0 && "check refcounting");
if (cls->attrs_offset < 0) {
REWRITE_ABORTED("");
......@@ -1491,7 +1518,7 @@ Box* dataDescriptorInstanceSpecialCases(GetattrRewriteArgs* rewrite_args, BoxedS
assert(attr_name->data()[attr_name->size()] == '\0');
raiseExcHelper(AttributeError, "%s", attr_name->data());
}
return rtn;
return incref(rtn);
}
case BoxedMemberDescriptor::OBJECT: {
if (rewrite_args) {
......@@ -1502,7 +1529,7 @@ Box* dataDescriptorInstanceSpecialCases(GetattrRewriteArgs* rewrite_args, BoxedS
}
Box* rtn = *reinterpret_cast<Box**>((char*)obj + member_desc->offset);
return noneIfNull(rtn);
return incref(noneIfNull(rtn));
}
case BoxedMemberDescriptor::DOUBLE: {
......@@ -1593,6 +1620,7 @@ Box* dataDescriptorInstanceSpecialCases(GetattrRewriteArgs* rewrite_args, BoxedS
}
if (rewrite_args) {
assert(0 && "check refcounting");
r_descr->addAttrGuard(offsetof(BoxedProperty, prop_get), (intptr_t)prop->prop_get);
RewriterVar* r_prop_get = r_descr->getAttr(offsetof(BoxedProperty, prop_get));
......@@ -1632,6 +1660,7 @@ Box* dataDescriptorInstanceSpecialCases(GetattrRewriteArgs* rewrite_args, BoxedS
}
if (rewrite_args) {
assert(0 && "check refcounting");
// hmm, maybe we should write assembly which can look up the function address and call any function
r_descr->addAttrGuard(offsetof(BoxedGetsetDescriptor, get), (intptr_t)getset_descr->get);
......@@ -1919,7 +1948,6 @@ Box* getattrInternalGeneric(Box* obj, BoxedString* attr, GetattrRewriteArgs* rew
} else {
descr = typeLookup(obj->cls, attr);
}
RELEASE_ASSERT(!descr, "need to check the refcounting for this");
// Check if it's a data descriptor
descrgetfunc descr_get = NULL;
......@@ -1928,7 +1956,6 @@ Box* getattrInternalGeneric(Box* obj, BoxedString* attr, GetattrRewriteArgs* rew
Box* _get_ = NULL;
RewriterVar* r_get = NULL;
if (descr) {
RELEASE_ASSERT(0, "need to check the refcounting for this");
descr_get = descr->cls->tp_descr_get;
if (rewrite_args)
......@@ -1946,6 +1973,7 @@ Box* getattrInternalGeneric(Box* obj, BoxedString* attr, GetattrRewriteArgs* rew
// we can immediately know to skip this part if it's one of the
// special case nondata descriptors.
if (!isNondataDescriptorInstanceSpecialCase(descr)) {
assert(0 && "check refcounting");
if (rewrite_args) {
RewriterVar* r_descr_cls = r_descr->getAttr(offsetof(Box, cls), Location::any());
r_descr_cls->addAttrGuard(offsetof(BoxedClass, tp_descr_get), (intptr_t)descr_get);
......@@ -3494,10 +3522,19 @@ void rearrangeArgumentsInternal(ParamReceiveSpec paramspec, const ParamNames* pa
// Super fast path:
if (argspec.num_keywords == 0 && !argspec.has_starargs && !paramspec.takes_varargs && !argspec.has_kwargs
&& argspec.num_args == paramspec.num_args && !paramspec.takes_kwargs) {
assert(0 && "check refcounting");
rewrite_success = true;
if (num_output_args > 1)
Py_INCREF(oarg1);
if (num_output_args > 2)
Py_INCREF(oarg2);
if (num_output_args > 3)
Py_INCREF(oarg3);
if (num_output_args > 3) {
memcpy(oargs, args, sizeof(Box*) * (num_output_args - 3));
for (int i = 0; i < num_output_args - 3; i++) {
Py_INCREF(oargs[i]);
}
}
return;
}
......@@ -3965,6 +4002,7 @@ Box* callFunc(BoxedFunctionBase* func, CallRewriteArgs* rewrite_args, ArgPassSpe
}
if (rewrite_args && !rewrite_success) {
assert(0 && "check refcounting");
// These are the cases that we weren't able to rewrite.
// So instead, just rewrite them to be a call to callFunc, which helps a little bit.
// TODO we should extract the rest of this function from the end of this block,
......@@ -4033,6 +4071,7 @@ Box* callFunc(BoxedFunctionBase* func, CallRewriteArgs* rewrite_args, ArgPassSpe
// the call to function containing a yield should just create a new generator object.
Box* res;
if (md->isGenerator()) {
assert(0 && "check refcounting");
// TODO: we might not have a lot to gain by rewriting into createGenerator, but we could at least
// rewrite up to the call to it:
res = createGenerator(func, arg1, arg2, arg3, oargs);
......@@ -4051,6 +4090,12 @@ Box* callFunc(BoxedFunctionBase* func, CallRewriteArgs* rewrite_args, ArgPassSpe
res = callCLFunc<S, rewritable>(md, rewrite_args, num_output_args, closure, NULL, func->globals, arg1, arg2,
arg3, oargs);
}
Py_XDECREF(arg1);
Py_XDECREF(arg2);
Py_XDECREF(arg3);
for (int i = 0; i < num_output_args - 3; i++) {
Py_DECREF(oargs[i]);
}
return res;
}
......@@ -5882,6 +5927,9 @@ Box* _typeNew(BoxedClass* metatype, BoxedString* name, BoxedTuple* bases, BoxedD
int nbases = bases->size();
BoxedClass* winner = metatype;
RELEASE_ASSERT(nbases >= 0, "supposed to set bases to (object,)");
DecrefHandle<Box> _bases_handle(incref(bases));
for (auto tmp : *bases) {
auto tmptype = tmp->cls;
if (tmptype == classobj_cls)
......@@ -5900,7 +5948,7 @@ Box* _typeNew(BoxedClass* metatype, BoxedString* name, BoxedTuple* bases, BoxedD
static BoxedString* new_box = getStaticString(new_str.c_str());
if (winner != metatype) {
if (getattr(winner, new_box) != getattr(type_cls, new_box)) {
if (winner->tp_new != type_new) {
CallattrFlags callattr_flags
= {.cls_only = false, .null_on_nonexistent = false, .argspec = ArgPassSpec(4) };
Box* args[1] = { (Box*)attr_dict };
......@@ -6110,12 +6158,12 @@ Box* _typeNew(BoxedClass* metatype, BoxedString* name, BoxedTuple* bases, BoxedD
static BoxedString* name_str = getStaticString("__name__");
Box* attr = PyDict_GetItem(gl, name_str);
if (attr)
made->giveAttr(module_str, attr);
made->setattr(module_str, attr, NULL);
}
static BoxedString* doc_str = getStaticString("__doc__");
if (!made->hasattr(doc_str))
made->giveAttr(doc_str, None);
made->setattr(doc_str, None, NULL);
made->tp_new = base->tp_new;
......@@ -6224,9 +6272,7 @@ Box* typeNewGeneric(Box* _cls, Box* arg1, Box* arg2, Box** _args) {
if (arg2 == NULL) {
assert(arg3 == NULL);
BoxedClass* rtn = arg1->cls;
return rtn;
return incref(arg1->cls);
}
RELEASE_ASSERT(PyDict_Check(arg3), "%s", getTypeName(arg3));
......
src/runtime/types.cpp
View file @ dc4d003b
......@@ -2142,7 +2142,7 @@ public:
internStringMortalInplace(key);
self->b->setattr(key, value, NULL);
return None;
Py_RETURN_NONE;
}
static int ass_sub(PyDictObject* mp, PyObject* v, PyObject* w) noexcept {
......@@ -2154,6 +2154,7 @@ public:
res = AttrWrapper::setitem((Box*)mp, v, w);
}
assert(res == None);
Py_DECREF(res);
} catch (ExcInfo e) {
setCAPIException(e);
return -1;
......@@ -2259,7 +2260,7 @@ public:
self->b->delattr(key, NULL);
else
raiseExcHelper(KeyError, "'%s'", key->data());
return None;
Py_RETURN_NONE;
}
static Box* str(Box* _self) {
......
src/runtime/util.cpp
View file @ dc4d003b
......@@ -77,7 +77,7 @@ void boundSliceWithLength(i64* start_out, i64* stop_out, i64 start, i64 stop, i6
Box* boxStringOrNone(const char* s) {
if (s == NULL) {
return None;
return incref(None);
} else {
return boxString(s);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7