enable build on parrot after pcc_hackathon_6Mar10 merge

rakudo · Mar 22, 2010 · 5886ef7 · 5886ef7
1 parent db0f857
commit 5886ef7
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 20 deletions.
diff --git a/build/PARROT_REVISION b/build/PARROT_REVISION
@@ -1 +1 @@
-44954  2.2.0
+45108
diff --git a/src/ops/perl6.ops b/src/ops/perl6.ops
@@ -616,7 +616,6 @@ inline op bind_signature(in PMC) :base_core {
         PMC      * ctx               = CURRENT_CONTEXT(interp);
         PMC      * const saved_ccont = interp->current_cont;
         PMC      * const saved_sig   = Parrot_pcc_get_signature(interp, ctx);
-        PMC      * const saved_rs    = Parrot_pcc_get_results_signature(interp, ctx);
         opcode_t * const current_pc  = Parrot_pcc_get_pc(interp, ctx);
 
         /* Ensure we actually have a signature; if not, try to lazily generate
@@ -638,7 +637,6 @@ inline op bind_signature(in PMC) :base_core {
             CURRENT_CONTEXT(interp) = ctx;
             interp->current_cont = saved_ccont;
             Parrot_pcc_set_signature(interp, ctx, saved_sig);
-            Parrot_pcc_set_results_signature(interp, ctx, saved_rs);
             Parrot_pcc_set_pc(interp, ctx, current_pc);
             goto NEXT();
         }
@@ -652,17 +650,6 @@ inline op bind_signature(in PMC) :base_core {
                 PMC *junc_result, *caller_sig;
                 Parrot_ext_call(interp, dispatcher, "PP->P", sub, $1, &junc_result);
 
-                /* Re-instate anything we may have damaged. */
-                CURRENT_CONTEXT(interp) = ctx;
-                interp->current_cont = saved_ccont;
-                Parrot_pcc_set_signature(interp, ctx, saved_sig);
-                Parrot_pcc_set_results_signature(interp, ctx, saved_rs);
-                Parrot_pcc_set_pc(interp, ctx, current_pc);
-
-                /* Save the Junctional result as the return value. */
-                caller_sig = Parrot_pcc_get_signature(interp, Parrot_pcc_get_caller_ctx(interp, ctx));
-                if (!PMC_IS_NULL(caller_sig))
-                    Parrot_pcc_fill_returns_from_c_args(interp, caller_sig, "P", junc_result);
 
                 /* Invoke the current return continuation, to return said value. */
                 next = VTABLE_invoke(interp, Parrot_pcc_get_continuation(interp,

diff --git a/src/pmc/p6opaque.pmc b/src/pmc/p6opaque.pmc
@@ -86,7 +86,6 @@ static PMC *do_handles(PARROT_INTERP, PMC *cur_class, PMC *handlers, STRING *nam
     PMC      * ctx               = CURRENT_CONTEXT(interp);
     PMC      * const saved_ccont = interp->current_cont;
     PMC      * const saved_sig   = Parrot_pcc_get_signature(interp, ctx);
-    PMC      * const saved_rs    = Parrot_pcc_get_results_signature(interp, ctx);
 
     /* Iterate over the handlers. */
     PMC    *iter       = VTABLE_get_iter(interp, handlers);
@@ -140,7 +139,6 @@ static PMC *do_handles(PARROT_INTERP, PMC *cur_class, PMC *handlers, STRING *nam
     CURRENT_CONTEXT(interp) = ctx;
     interp->current_cont = saved_ccont;
     Parrot_pcc_set_signature(interp, ctx, saved_sig);
-    Parrot_pcc_set_results_signature(interp, ctx, saved_rs);
 
     /* Did we find anything? */
     if (attr) {

diff --git a/src/pmc/perl6multisub.pmc b/src/pmc/perl6multisub.pmc
@@ -752,7 +752,6 @@ static PMC *find_many_candidates_with_arg_list(PARROT_INTERP, PMC *SELF, PMC *ca
     PMC      * ctx               = CURRENT_CONTEXT(interp);
     PMC      * const saved_ccont = interp->current_cont;
     PMC      * const saved_sig   = Parrot_pcc_get_signature(interp, ctx);
-    PMC      * const saved_rs    = Parrot_pcc_get_results_signature(interp, ctx);
 
     /* See if we have a cache entry. */
     GETATTR_Perl6MultiSub_cache_many(interp, SELF, cache);
@@ -785,7 +784,6 @@ static PMC *find_many_candidates_with_arg_list(PARROT_INTERP, PMC *SELF, PMC *ca
     CURRENT_CONTEXT(interp) = ctx;
     interp->current_cont = saved_ccont;
     Parrot_pcc_set_signature(interp, ctx, saved_sig);
-    Parrot_pcc_set_results_signature(interp, ctx, saved_rs);
 
     return results;
 }
@@ -962,7 +960,6 @@ the Perl 6 MMD algorithm.
         PMC      * ctx               = CURRENT_CONTEXT(interp);
         PMC      * const saved_ccont = interp->current_cont;
         PMC      * const saved_sig   = Parrot_pcc_get_signature(interp, ctx);
-        PMC      * const saved_rs    = Parrot_pcc_get_results_signature(interp, ctx);
         opcode_t * const current_pc  = Parrot_pcc_get_pc(interp, ctx);
 
         /* Get arguments. */
@@ -1001,7 +998,6 @@ the Perl 6 MMD algorithm.
         CURRENT_CONTEXT(interp) = ctx;
         interp->current_cont = saved_ccont;
         Parrot_pcc_set_signature(interp, ctx, saved_sig);
-        Parrot_pcc_set_results_signature(interp, ctx, saved_rs);
         Parrot_pcc_set_pc(interp, ctx, current_pc);
 
         /* Invoke the winner, and mark the context so we know not to re-do a