In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/7601007bbbe673d3791a2d77c692a0c377835430?hp=da2480689f7c62990cb3d865f1124dc5c8233570>
- Log ----------------------------------------------------------------- commit 7601007bbbe673d3791a2d77c692a0c377835430 Author: Father Chrysostomos <[email protected]> Date: Mon Sep 2 08:29:50 2013 -0700 Donât assume targs are contiguous for âmy $x; my $yâ In commit 18c931a3, the padrange optimisation was prevented from mak- ing this assumption for âmy ($x,$y)â, but the assumption was still there in the code that combines multiple statements into one. This would lead to assertion failures (or, as of ce0d59f, crashes under non-debugging builds) if a keyword plugin declined to handle the second âmyâ, but only after creating a padop. This fixes a regression from 5.16 affecting Devel::CallParser under threaded builds. ----------------------------------------------------------------------- Summary of changes: op.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op.c b/op.c index 23eeaaa..a41afd7 100644 --- a/op.c +++ b/op.c @@ -11153,8 +11153,8 @@ Perl_rpeep(pTHX_ OP *o) && ( p->op_next->op_type == OP_NEXTSTATE || p->op_next->op_type == OP_DBSTATE) && count < OPpPADRANGE_COUNTMASK + && base + count == p->op_targ ) { - assert(base + count == p->op_targ); count++; followop = p->op_next; } -- Perl5 Master Repository
