In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/754cffb022550c89c97e60092b1b9af137112f0f?hp=ab51175605b78c9a238cc325d044fc2b880c4dd6>

- Log -----------------------------------------------------------------
commit 754cffb022550c89c97e60092b1b9af137112f0f
Author: Tony Cook <[email protected]>
Date:   Tue Nov 18 17:11:58 2014 +1100

    fix PERL_OP_PARENT builds
    
    This was broken in two commits:
    
    - b46e009d9 - introduced newMETHOP(), which didn't add the parent link
     as newUNOP() was doing
    
    - 2872f9187 - updated ck_sort() to handle lexical subs named as a
      bareword parameter to sort, but didn't update the parent link in the
      new PADCV op created.
-----------------------------------------------------------------------

Summary of changes:
 op.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/op.c b/op.c
index 00c1255..728b927 100644
--- a/op.c
+++ b/op.c
@@ -4657,6 +4657,11 @@ S_newMETHOP_internal(pTHX_ I32 type, I32 flags, OP* 
dynamic_meth, SV* const_meth
         methop->op_flags = (U8)(flags | OPf_KIDS);
         methop->op_u.op_first = dynamic_meth;
         methop->op_private = (U8)(1 | (flags >> 8));
+
+#ifdef PERL_OP_PARENT
+        if (!OP_HAS_SIBLING(dynamic_meth))
+            dynamic_meth->op_sibling = (OP*)methop;
+#endif
     }
     else {
         assert(const_meth);
@@ -10649,6 +10654,9 @@ Perl_ck_sort(pTHX_ OP *o)
                    OP * const padop = newOP(OP_PADCV, 0);
                    padop->op_targ = off;
                    cUNOPx(firstkid)->op_first = padop;
+#ifdef PERL_OP_PARENT
+                    padop->op_sibling = firstkid;
+#endif
                    op_free(kid);
                }
            }

--
Perl5 Master Repository

Reply via email to