[perl.git] branch blead, updated. v5.27.2-87-gdf84d7b01a

[Dave Mitchell]

In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/df84d7b01a41160c95881fe426bcb159d57d0ad6?hp=1fb2d101eac30e2ec4b826a4c493bb6f1232dc16>

- Log -----------------------------------------------------------------
commit df84d7b01a41160c95881fe426bcb159d57d0ad6
Author: David Mitchell <da...@iabyn.com>
Date:   Tue Aug 1 08:19:42 2017 +0100

    fix ($lex = index(....)) == -1
    
    RT #131823
    
    My recent commit v5.27.2-56-g7e8d786 optimised index() == -1 and similar.
    It asserted that in such an expression, the index op's OPpTARGET_MY
    flag couldn't be set. This was an incorrect assumption, obvious in
    hindsight:
    
        ($lex = index(....)) == -1
    
    gets compiled as
    
        <@> index[$r:2,3] sKP/TARGMY,2 ->c
           <0> ex-pushmark s ->9
           <0> padsv[$s:1,3] s ->a
           <$> const[PVMG "a"] s ->b
        <$> const[IV -1] s/FOLD ->d
    
    The fix is simple: skip the optimisation if OPpTARGET_MY is present,
    rather than assert failing.
-----------------------------------------------------------------------

Summary of changes:
 op.c         |  5 ++++-
 t/op/index.t | 12 ++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/op.c b/op.c
index ff78e95fc0..a72dd13b3c 100644
--- a/op.c
+++ b/op.c
@@ -9848,7 +9848,10 @@ Perl_ck_eq(pTHX_ OP *o)
     if (!(sv && SvIOK_notUV(sv) && SvIVX(sv) == -1))
         return o;
 
-    assert(!(indexop->op_private & OPpTARGET_MY));
+    /* ($lex = index(....)) == -1 */
+    if (indexop->op_private & OPpTARGET_MY)
+        return o;
+
     indexop->op_flags &= ~OPf_PARENS;
     indexop->op_flags |= (o->op_flags & OPf_PARENS);
     indexop->op_private |= OPpTRUEBOOL;
diff --git a/t/op/index.t b/t/op/index.t
index a28ca654c4..cf165de600 100644
--- a/t/op/index.t
+++ b/t/op/index.t
@@ -8,7 +8,7 @@ BEGIN {
 }
 
 use strict;
-plan( tests => 170 );
+plan( tests => 172 );
 
 run_tests() unless caller;
 
@@ -260,7 +260,7 @@ is index($substr, 'a'), 1, 'index reply reflects characters 
not octets';
 # op_eq, op_const optimised away in (index() == -1) and variants
 
 {
-    my $s = "ab";
+    my $s = "abxyz";
     ok(!(index($s,"a") == -1),  "index(a) == -1");
     ok( (index($s,"a") != -1),  "index(a) != -1");
     ok( (index($s,"c") == -1),  "index(c) == -1");
@@ -320,4 +320,12 @@ is index($substr, 'a'), 1, 'index reply reflects 
characters not octets';
     ok( $r,                         "r = -1 == rindex(c) - r value");
     ok(!($r = -1 != rindex($s,"c")), "r = -1 != rindex(c)");
     ok(!$r,                         "r = -1 != rindex(c) - r value");
+
+    # RT #131823
+    # index with OPpTARGET_MY shouldn't do the '== -1' optimisation
+
+    ok(!(($r = index($s,"z")) == -1),  "(r = index(a)) == -1");
+    is($r, 4,                          "(r = index(a)) == -1 - r value");
+
+
 }

--
Perl5 Master Repository