More fixes

src/codegen/compvars.cpp

@@ -2337,9 +2337,10 @@ public:
         }
 
         ASSERT(other_type == UNKNOWN || other_type == BOXED_BOOL, "%s", other_type->debugName().c_str());
-        llvm::Value* boxed = emitter.getBuilder()->CreateSelect(i1FromBool(emitter, var),
-                                                                embedConstantPtr(True, g.llvm_value_type_ptr),
-                                                                embedConstantPtr(False, g.llvm_value_type_ptr));
+        llvm::Value* boxed = emitter.getBuilder()->CreateSelect(
+            i1FromBool(emitter, var), emitter.setType(embedConstantPtr(True, g.llvm_value_type_ptr), RefType::BORROWED),
+            emitter.setType(embedConstantPtr(False, g.llvm_value_type_ptr), RefType::BORROWED));
+        emitter.setType(boxed, RefType::BORROWED);
         return new ConcreteCompilerVariable(other_type, boxed);
     }
 

src/codegen/irgen/irgenerator.cpp

@@ -1191,6 +1191,7 @@ private:
             emitter.setType(attr, RefType::BORROWED);
             llvm::Value* module = irstate->getGlobals();
             llvm::Value* r = emitter.createCall3(unw_info, g.funcs.boxedLocalsGet, boxedLocals, attr, module);
+            emitter.setType(r, RefType::OWNED);
             return new ConcreteCompilerVariable(UNKNOWN, r);
         } else {
             // vst is one of {FAST, CLOSURE}

src/runtime/capi.cpp

@@ -1855,11 +1855,6 @@ Box* BoxedCApiFunction::tppCall(Box* _self, CallRewriteArgs* rewrite_args, ArgPa
     if (!rewrite_success)
         rewrite_args = NULL;
 
-    assert(!oargs);
-    AUTO_XDECREF(arg1);
-    AUTO_XDECREF(arg2);
-    AUTO_XDECREF(arg3);
-
     RewriterVar* r_passthrough = NULL;
     if (rewrite_args)
         r_passthrough = rewrite_args->rewriter->loadConst((intptr_t)self->passthrough, Location::forArg(0));
@@ -1921,11 +1916,25 @@ Box* BoxedCApiFunction::tppCall(Box* _self, CallRewriteArgs* rewrite_args, ArgPa
         RELEASE_ASSERT(0, "0x%x", flags);
     }
 
+    assert(paramspec.totalReceived() < 3);
+    assert(!oargs);
+
     if (rewrite_args) {
         rewrite_args->rewriter->checkAndThrowCAPIException(rewrite_args->out_rtn);
         rewrite_args->out_success = true;
     }
 
+    switch (paramspec.totalReceived()) {
+        case 3:
+            Py_XDECREF(arg3);
+        case 2:
+            Py_XDECREF(arg2);
+        case 1:
+            Py_XDECREF(arg1);
+        default:
+            break;
+    }
+
     checkAndThrowCAPIException();
     assert(rtn && "should have set + thrown an exception!");
     return rtn;

src/runtime/descr.cpp

@@ -610,19 +610,12 @@ Box* BoxedWrapperDescriptor::tppCall(Box* _self, CallRewriteArgs* rewrite_args,
     rearrangeArguments(paramspec, NULL, self->wrapper->name.data(), NULL, rewrite_args, rewrite_success, argspec, arg1,
                        arg2, arg3, args, oargs, keyword_names);
 
-    AUTO_XDECREF(arg1);
-    AUTO_XDECREF(arg2);
-    AUTO_XDECREF(arg3);
-    assert(!oargs);
-
     if (paramspec.takes_varargs)
         assert(arg2 && arg2->cls == tuple_cls);
 
     if (!rewrite_success)
         rewrite_args = NULL;
 
-    assert(!rewrite_args && "check refcounting");
-
     Box* rtn;
     if (flags == PyWrapperFlag_KEYWORDS) {
         wrapperfunc_kwds wk = (wrapperfunc_kwds)wrapper;
@@ -630,9 +623,9 @@ Box* BoxedWrapperDescriptor::tppCall(Box* _self, CallRewriteArgs* rewrite_args,
 
         if (rewrite_args) {
             auto rewriter = rewrite_args->rewriter;
-            rewrite_args->out_rtn
-                = rewriter->call(true, (void*)wk, rewrite_args->arg1, rewrite_args->arg2,
-                                 rewriter->loadConst((intptr_t)self->wrapped, Location::forArg(2)), rewrite_args->arg3);
+            rewrite_args->out_rtn = rewriter->call(true, (void*)wk, rewrite_args->arg1, rewrite_args->arg2,
+                                                   rewriter->loadConst((intptr_t)self->wrapped, Location::forArg(2)),
+                                                   rewrite_args->arg3)->setType(RefType::OWNED);
             rewrite_args->rewriter->checkAndThrowCAPIException(rewrite_args->out_rtn);
             rewrite_args->out_success = true;
         }
@@ -642,7 +635,8 @@ Box* BoxedWrapperDescriptor::tppCall(Box* _self, CallRewriteArgs* rewrite_args,
         if (rewrite_args) {
             auto rewriter = rewrite_args->rewriter;
             rewrite_args->out_rtn = rewriter->call(true, (void*)wrapper, rewrite_args->arg1, rewrite_args->arg2,
-                                                   rewriter->loadConst((intptr_t)self->wrapped, Location::forArg(2)));
+                                                   rewriter->loadConst((intptr_t)self->wrapped, Location::forArg(2)))
+                                        ->setType(RefType::OWNED);
             rewrite_args->rewriter->checkAndThrowCAPIException(rewrite_args->out_rtn);
             rewrite_args->out_success = true;
         }
@@ -653,7 +647,8 @@ Box* BoxedWrapperDescriptor::tppCall(Box* _self, CallRewriteArgs* rewrite_args,
         if (rewrite_args) {
             auto rewriter = rewrite_args->rewriter;
             rewrite_args->out_rtn = rewriter->call(true, (void*)wrapper, rewrite_args->arg1,
-                                                   rewriter->loadConst((intptr_t)self->wrapped, Location::forArg(1)));
+                                                   rewriter->loadConst((intptr_t)self->wrapped, Location::forArg(1)))
+                                        ->setType(RefType::OWNED);
             rewrite_args->rewriter->checkAndThrowCAPIException(rewrite_args->out_rtn);
             rewrite_args->out_success = true;
         }
@@ -663,7 +658,8 @@ Box* BoxedWrapperDescriptor::tppCall(Box* _self, CallRewriteArgs* rewrite_args,
         if (rewrite_args) {
             auto rewriter = rewrite_args->rewriter;
             rewrite_args->out_rtn = rewriter->call(true, (void*)wrapper, rewrite_args->arg1, rewrite_args->arg2,
-                                                   rewriter->loadConst((intptr_t)self->wrapped, Location::forArg(2)));
+                                                   rewriter->loadConst((intptr_t)self->wrapped, Location::forArg(2)))
+                                        ->setType(RefType::OWNED);
             rewrite_args->rewriter->checkAndThrowCAPIException(rewrite_args->out_rtn);
             rewrite_args->out_success = true;
         }
@@ -671,6 +667,20 @@ Box* BoxedWrapperDescriptor::tppCall(Box* _self, CallRewriteArgs* rewrite_args,
         RELEASE_ASSERT(0, "%d", flags);
     }
 
+    assert(paramspec.totalReceived() < 3);
+    assert(!oargs);
+
+    switch (paramspec.totalReceived()) {
+        case 3:
+            Py_XDECREF(arg3);
+        case 2:
+            Py_XDECREF(arg2);
+        case 1:
+            Py_XDECREF(arg1);
+        default:
+            break;
+    }
+
     checkAndThrowCAPIException();
     assert(rtn && "should have set + thrown an exception!");
     return rtn;

src/runtime/objmodel.cpp

@@ -1892,19 +1892,14 @@ Box* dataDescriptorInstanceSpecialCases(GetattrRewriteArgs* rewrite_args, BoxedS
                            getTypeName(getset_descr));
         }
 
-        // Abort because right now we can't call twice in a rewrite
-        if (for_call) {
-            rewrite_args = NULL;
-        }
-
         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);
 
             RewriterVar* r_closure = r_descr->getAttr(offsetof(BoxedGetsetDescriptor, closure));
             RewriterVar* r_rtn = rewrite_args->rewriter->call(
-                /* has_side_effects */ true, (void*)getset_descr->get, rewrite_args->obj, r_closure);
+                                                             /* has_side_effects */ true, (void*)getset_descr->get,
+                                                             rewrite_args->obj, r_closure)->setType(RefType::OWNED);
 
             rewrite_args->setReturn(r_rtn, descr->cls == capi_getset_cls ? ReturnConvention::CAPI_RETURN
                                                                          : ReturnConvention::HAS_RETURN);
@@ -6869,7 +6864,7 @@ extern "C" Box* boxedLocalsGet(Box* boxedLocals, BoxedString* attr, Box* globals
         auto it = d.find(attr);
         if (it != d.end()) {
             Box* value = it->second;
-            return value;
+            return incref(value);
         }
     } else {
         try {

src/runtime/types.cpp

@@ -1023,7 +1023,7 @@ static Box* typeCallInner(CallRewriteArgs* rewrite_args, ArgPassSpec argspec, Bo
             // Another option is to rely on rewriting to make this fast, which would probably require adding
             // a custom internal callable to object.__new__
             made = objectNewNoArgs(cls);
-            r_made = rewrite_args->rewriter->call(true, (void*)objectNewNoArgs, r_ccls);
+            r_made = rewrite_args->rewriter->call(true, (void*)objectNewNoArgs, r_ccls)->setType(RefType::OWNED);
             assert(made);
         } else {
             CallRewriteArgs srewrite_args(rewrite_args->rewriter, r_new, rewrite_args->destination);
@@ -1174,7 +1174,6 @@ static Box* typeCallInner(CallRewriteArgs* rewrite_args, ArgPassSpec argspec, Bo
 
             // Note: this code path includes the descriptor logic
             if (rewrite_args) {
-                assert(0 && "check refcounting");
                 CallRewriteArgs srewrite_args(rewrite_args->rewriter, r_init, rewrite_args->destination);
                 srewrite_args.arg1 = r_made;
                 if (npassed_args >= 2)