[svn:parrot] r43039 - branches/context_unify3/src/ops

[bacek at svn.parrot.org]

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

Log:
Fix op tailcall to merge proper signatures.

Modified:
   branches/context_unify3/src/ops/core.ops

Modified: branches/context_unify3/src/ops/core.ops
==============================================================================
--- branches/context_unify3/src/ops/core.ops	Mon Dec 14 12:41:51 2009	(r43038)
+++ branches/context_unify3/src/ops/core.ops	Mon Dec 14 12:42:11 2009	(r43039)
@@ -471,9 +471,8 @@
     PMC * const p               = $1;
     opcode_t   *dest            = expr NEXT();
     PMC * const ctx             = CURRENT_CONTEXT(interp);
-    PMC * const parent_ctx      = Parrot_pcc_get_caller_ctx(interp, ctx);
     interp->current_cont        = Parrot_pcc_get_continuation(interp, ctx);
-    Parrot_pcc_merge_signature_for_tailcall(interp, parent_ctx, ctx);
+    Parrot_pcc_merge_signature_for_tailcall(interp, ctx, Parrot_pcc_get_signature(interp, ctx));
 
     SUB_FLAG_TAILCALL_SET(interp->current_cont);
     dest = VTABLE_invoke(interp, p, dest);