don't abort the rewrite before typeCallInner just because starargs is passed

Author: tjhance

src/runtime/objmodel.cpp

@@ -2745,6 +2745,7 @@ extern "C" Box* callattr(Box* obj, BoxedString* attr, CallattrFlags flags, Box*
                          const std::vector<BoxedString*>* keyword_names) {
     STAT_TIMER(t0, "us_timer_slowpath_callattr", 10);
 
+
 #if 0 && STAT_TIMERS
     static uint64_t* st_id = Stats::getStatCounter("us_timer_slowpath_callattr_patchable");
     static uint64_t* st_id_nopatch = Stats::getStatCounter("us_timer_slowpath_callattr_nopatch");
@@ -2756,7 +2757,7 @@ extern "C" Box* callattr(Box* obj, BoxedString* attr, CallattrFlags flags, Box*
     else if (icinfo->isMegamorphic())
         counter = st_id_megamorphic;
     else {
-        //counter = Stats::getStatCounter("us_timer_slowpath_callattr_patchable_" + std::string(obj->cls->tp_name));
+        // counter = Stats::getStatCounter("us_timer_slowpath_callattr_patchable_" + std::string(obj->cls->tp_name));
         counter = Stats::getStatCounter("us_timer_slowpath_callattr_patchable_" + std::string(attr->s()));
     }
     ScopedStatTimer st(counter, 10);

src/runtime/rearrange_arguments.cpp

@@ -150,7 +150,6 @@ void rearrangeArguments(ParamReceiveSpec paramspec, const ParamNames* param_name
                         Box** defaults, CallRewriteArgs* rewrite_args, bool& rewrite_success, ArgPassSpec argspec,
                         Box* arg1, Box* arg2, Box* arg3, Box** args, const std::vector<BoxedString*>* keyword_names,
                         Box*& oarg1, Box*& oarg2, Box*& oarg3, Box** oargs) {
-
     /*
      * Procedure:
      * - First match up positional arguments; any extra go to varargs.  error if too many.
@@ -398,7 +397,8 @@ void rearrangeArguments(ParamReceiveSpec paramspec, const ParamNames* param_name
         } else {
             if (argspec.num_args <= 3) {
                 assert(paramspec.num_args >= argspec.num_args);
-                int bufSize = paramspec.num_args - argspec.num_args + (paramspec.takes_varargs ? 1 : 0) + (paramspec.takes_kwargs ? 1 : 0);
+                int bufSize = paramspec.num_args - argspec.num_args + (paramspec.takes_varargs ? 1 : 0)
+                              + (paramspec.takes_kwargs ? 1 : 0);
                 RewriterVar* r_buf_ptr = bufSize > 0 ? rewrite_args->rewriter->allocate(bufSize)
                                                      : rewrite_args->rewriter->loadConst(0);
                 rewrite_args->rewriter->call(true /* has side effects */,
@@ -408,7 +408,9 @@ void rearrangeArguments(ParamReceiveSpec paramspec, const ParamNames* param_name
                                              rewrite_args->rewriter->loadConst(argspec.asInt()),
                                              rewrite_args->rewriter->loadConst(paramspec.asInt()),
                                              rewrite_args->rewriter->loadConst((int64_t)func_name));
-                for (int i = argspec.num_args; i < (paramspec.num_args + (paramspec.takes_varargs ? 1 : 0) + (paramspec.takes_kwargs ? 1 : 0)); i++) {
+                for (int i = argspec.num_args;
+                     i < (paramspec.num_args + (paramspec.takes_varargs ? 1 : 0) + (paramspec.takes_kwargs ? 1 : 0));
+                     i++) {
                     int buf_offset = sizeof(Box*) * (i - argspec.num_args);
                     if (i == 0)
                         rewrite_args->arg1 = r_buf_ptr->getAttr(buf_offset);

src/runtime/types.cpp

@@ -565,11 +565,6 @@ static Box* typeTppCall(Box* self, CallRewriteArgs* rewrite_args, ArgPassSpec ar
                         Box** args, const std::vector<BoxedString*>* keyword_names) {
     int npassed_args = argspec.totalPassed();
 
-    if (argspec.has_starargs) {
-        // This would fail in typeCallInner
-        rewrite_args = NULL;
-    }
-
     Box** new_args = NULL;
     if (npassed_args >= 3) {
         new_args = (Box**)alloca(sizeof(Box*) * (npassed_args + 1 - 3));
@@ -681,6 +676,10 @@ static Box* typeCallInner(CallRewriteArgs* rewrite_args, ArgPassSpec argspec, Bo
         return cpythonTypeCall(cls, oarg2, oarg3);
     }
 
+    if (argspec.has_starargs) {
+        rewrite_args = NULL;
+    }
+
     RewriterVar* r_ccls = NULL;
     RewriterVar* r_new = NULL;
     RewriterVar* r_init = NULL;
@@ -694,7 +693,6 @@ static Box* typeCallInner(CallRewriteArgs* rewrite_args, ArgPassSpec argspec, Bo
         // Need to create a clear contract of who guards on what
         r_ccls->addGuard((intptr_t)arg1 /* = _cls */);
 
-
         if (!rewrite_args->args_guarded) {
             // TODO should know which args don't need to be guarded, ex if we're guaranteed that they
             // already fit, either since the type inferencer could determine that,