[svn:parrot] r43041 - in branches/context_unify3/src: call pmc

[bacek at svn.parrot.org]

Author: bacek
Date: Mon Dec 14 12:42:55 2009
New Revision: 43041
URL: https://trac.parrot.org/parrot/changeset/43041

Log:
Pop context in NCI.invoke, not invoke_from_sigobject

Modified:
   branches/context_unify3/src/call/pcc.c
   branches/context_unify3/src/pmc/nci.pmc

Modified: branches/context_unify3/src/call/pcc.c
==============================================================================
--- branches/context_unify3/src/call/pcc.c	Mon Dec 14 12:42:32 2009	(r43040)
+++ branches/context_unify3/src/call/pcc.c	Mon Dec 14 12:42:55 2009	(r43041)
@@ -297,8 +297,6 @@
         runops(interp, offset);
         Interp_core_SET(interp, old_core);
     }
-    //Parrot_pcc_set_signature(interp, ctx, NULL);
-    Parrot_pop_context(interp);
 }
 
 /*

Modified: branches/context_unify3/src/pmc/nci.pmc
==============================================================================
--- branches/context_unify3/src/pmc/nci.pmc	Mon Dec 14 12:42:32 2009	(r43040)
+++ branches/context_unify3/src/pmc/nci.pmc	Mon Dec 14 12:42:55 2009	(r43041)
@@ -351,6 +351,10 @@
             cont = Parrot_pcc_get_continuation(interp, CURRENT_CONTEXT(interp));
             next = VTABLE_invoke(INTERP, cont, next);
         }
+        else {
+            /* otherwise pop used context */
+            Parrot_pop_context(INTERP);
+        }
 
         return (opcode_t *)next;
     }