Merge pull request #963 from kmod/callattr_rewrites

Try to fix "enforce return conventions" perf regression

Makefile

@@ -1042,6 +1042,7 @@ $(FROM_CPYTHON_SRCS:.c=.prof.o): %.prof.o: %.c $(BUILD_SYSTEM_DEPS)
 
 .PHONY: update_section_ordering
 update_section_ordering: pyston_release
+	perf record -o perf_section_ordering.data -- ./pyston_release -q minibenchmarks/combined.py
 	perf record -o perf_section_ordering.data -- ./pyston_release -q minibenchmarks/combined.py
 	$(MAKE) pyston_pgo
 	python tools/generate_section_ordering_from_pgo_build.py pyston_pgo perf_section_ordering.data > section_ordering.txt

src/runtime/objmodel.cpp

@@ -2931,7 +2931,6 @@ Box* callattrInternal(Box* obj, BoxedString* attr, LookupScope scope, CallattrRe
         GetattrRewriteArgs grewrite_args(rewrite_args->rewriter, rewrite_args->obj, Location::any());
         val = getattrInternalEx<S, REWRITABLE>(obj, attr, &grewrite_args, scope == CLASS_ONLY, true, &bind_obj,
                                                &r_bind_obj);
-        // TODO: maybe callattrs should have return conventions as well.
 
         if (!grewrite_args.isSuccessful())
             rewrite_args = NULL;
@@ -2939,6 +2938,12 @@ Box* callattrInternal(Box* obj, BoxedString* attr, LookupScope scope, CallattrRe
             RewriterVar* rtn;
             ReturnConvention return_convention;
             std::tie(rtn, return_convention) = grewrite_args.getReturn();
+
+            if (S == CXX && return_convention == ReturnConvention::CAPI_RETURN) {
+                rewrite_args->rewriter->checkAndThrowCAPIException(rtn);
+                return_convention = ReturnConvention::HAS_RETURN;
+            }
+
             if (return_convention != ReturnConvention::HAS_RETURN && return_convention != ReturnConvention::NO_RETURN)
                 rewrite_args = NULL;
             else

src/runtime/rewrite_args.h

@@ -55,14 +55,21 @@ private:
     bool out_success;
     RewriterVar* out_rtn;
     ReturnConvention out_return_convention;
+#ifndef NDEBUG
     bool return_convention_checked;
+#endif
 
 public:
     _ReturnConventionBase()
         : out_success(false),
           out_rtn(NULL),
-          out_return_convention(ReturnConvention::UNSPECIFIED),
-          return_convention_checked(false) {}
+          out_return_convention(ReturnConvention::UNSPECIFIED)
+#ifndef NDEBUG
+          ,
+          return_convention_checked(false)
+#endif
+    {
+    }
 
 #ifndef NDEBUG
     ~_ReturnConventionBase() {
@@ -112,13 +119,17 @@ public:
         out_success = false;
         out_rtn = NULL;
         out_return_convention = ReturnConvention::UNSPECIFIED;
+#ifndef NDEBUG
         return_convention_checked = false;
+#endif
     }
 
     RewriterVar* getReturn(ReturnConvention required_convention) {
         assert(isSuccessful());
         assert(this->out_return_convention == required_convention);
+#ifndef NDEBUG
         return_convention_checked = true;
+#endif
         return this->out_rtn;
     }
 
@@ -126,12 +137,16 @@ public:
         assert(isSuccessful());
         ASSERT(this->out_return_convention == required_convention, "user asked for convention %d but got %d",
                required_convention, this->out_return_convention);
+#ifndef NDEBUG
         return_convention_checked = true;
+#endif
     }
 
     std::pair<RewriterVar*, ReturnConvention> getReturn() {
         assert(isSuccessful());
+#ifndef NDEBUG
         return_convention_checked = true;
+#endif
         return std::make_pair(this->out_rtn, this->out_return_convention);
     }