can't optimize away scope entry if tr/// is present

p4raw-id: //depot/maint-5.6/perl@9605

2 files changed, 10 insertions, 1 deletions

diff --git a/op.c b/op.c
index 119489ccb7..5fe0a03980 100644
--- a/op.c
+++ b/op.c
@@ -2635,6 +2635,7 @@ Perl_pmtrans(pTHX_ OP *o, OP *expr, OP *repl)
     I32 grows = 0;
     register short *tbl;
 
+    PL_hints |= HINT_BLOCK_SCOPE;
     complement	= o->op_private & OPpTRANS_COMPLEMENT;
     del		= o->op_private & OPpTRANS_DELETE;
     squash	= o->op_private & OPpTRANS_SQUASH;
diff --git a/t/op/tr.t b/t/op/tr.t
index 3a0da2d21c..c7ba0d8c55 100755
--- a/t/op/tr.t
+++ b/t/op/tr.t
@@ -5,7 +5,7 @@ BEGIN {
     @INC = '../lib';
 }
 
-print "1..52\n";
+print "1..54\n";
 
 $_ = "abcdefghijklmnopqrstuvwxyz";
 
@@ -301,3 +301,11 @@ print "ok 51\n";
 ($a = "R0_001") =~ tr/R_//d;
 print "not " if hex($a) != 1;
 print "ok 52\n";
+
+@a = (1,2); map { y/1/./ for $_ } @a;
+print "not " if "@a" ne ". 2";
+print "ok 53\n";
+
+@a = (1,2); map { y/1/./ for $_.'' } @a;
+print "not " if "@a" ne "1 2";
+print "ok 54\n";