only set a context *after* it has its registers allocated

parrot · Aug 20, 2011 · 2ef966f · 2ef966f
1 parent 64438ce
commit 2ef966f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/pmc/coroutine.pmc b/src/pmc/coroutine.pmc
@@ -186,13 +186,14 @@ Swaps the "context".
                         "tail call to coroutine not allowed");
 
             /* first time set current sub, cont, object */
-            if (PMC_IS_NULL(ctx))
+            if (PMC_IS_NULL(ctx)) {
                 ctx = Parrot_pmc_new(INTERP, enum_class_CallContext);
+            }
+            GET_ATTR_n_regs_used(INTERP, SELF, n_regs_used);
+            Parrot_pcc_allocate_registers(INTERP, ctx, n_regs_used);
 
             Parrot_pcc_set_context(INTERP, ctx);
 
-            GET_ATTR_n_regs_used(INTERP, SELF, n_regs_used);
-            Parrot_pcc_allocate_registers(INTERP, ctx, n_regs_used);
             Parrot_pcc_set_caller_ctx(INTERP, ctx, caller_ctx);
             Parrot_pcc_init_context(INTERP, ctx, caller_ctx);
 

diff --git a/src/pmc/sub.pmc b/src/pmc/sub.pmc
@@ -423,12 +423,13 @@ Invokes the subroutine.
 
         PARROT_ASSERT(!PMC_IS_NULL(ccont));
 
-        if (PMC_IS_NULL(context))
+        if (PMC_IS_NULL(context)) {
             context = Parrot_pmc_new(INTERP, enum_class_CallContext);
+        }
+        Parrot_pcc_allocate_registers(INTERP, context, sub->n_regs_used);
 
         Parrot_pcc_set_context(INTERP, context);
         Parrot_pcc_set_caller_ctx(INTERP, context, caller_ctx);
-        Parrot_pcc_allocate_registers(INTERP, context, sub->n_regs_used);
         /* Preserve object */
         object = Parrot_pcc_get_object(INTERP, context);
         Parrot_pcc_init_context(INTERP, context, caller_ctx);