From: Father Chrysostomos Date: Mon, 10 Nov 2014 07:53:42 +0000 (-0800) Subject: Don’t allow OPpTARGET_MY with integer negation X-Git-Tag: v5.21.6~174 X-Git-Url: https://perl5.git.perl.org/perl5.git/commitdiff_plain/a9dec3fe491e66dff58a95299a532ad9c6d08439 Don’t allow OPpTARGET_MY with integer negation $ ./perl -Ilib -le 'use integer; my $a = "fake"; $a = -$a; print "[$a]"' [--] As of 1c2b3fd6f1, negation under ‘use integer’ can do string negation, which modifies the return value before reading the argument. So, like regular non-integer negation, it must forego this optimisation. --- diff --git a/lib/B/Op_private.pm b/lib/B/Op_private.pm index cdc91dc..c72dffd 100644 --- a/lib/B/Op_private.pm +++ b/lib/B/Op_private.pm @@ -142,7 +142,7 @@ $bits{$_}{7} = 'OPpPV_IS_UTF8' for qw(dump goto last next redo); $bits{$_}{6} = 'OPpREFCOUNTED' for qw(leave leaveeval leavesub leavesublv leavewrite); $bits{$_}{6} = 'OPpRUNTIME' for qw(match pushre qr subst substcont); $bits{$_}{2} = 'OPpSLICEWARNING' for qw(aslice hslice padav padhv rv2av rv2hv); -$bits{$_}{4} = 'OPpTARGET_MY' for qw(abs add atan2 chdir chmod chomp chown chr chroot concat cos crypt divide exec exp flock getpgrp getppid getpriority hex i_add i_divide i_modulo i_multiply i_negate i_subtract index int kill left_shift length link log match mkdir modulo multiply oct ord pow push rand rename repeat right_shift rindex rmdir schomp setpgrp setpriority sin sleep split sqrt srand stringify subst subtract symlink system time trans transr unlink unshift utime vec wait waitpid); +$bits{$_}{4} = 'OPpTARGET_MY' for qw(abs add atan2 chdir chmod chomp chown chr chroot concat cos crypt divide exec exp flock getpgrp getppid getpriority hex i_add i_divide i_modulo i_multiply i_subtract index int kill left_shift length link log match mkdir modulo multiply oct ord pow push rand rename repeat right_shift rindex rmdir schomp setpgrp setpriority sin sleep split sqrt srand stringify subst subtract symlink system time trans transr unlink unshift utime vec wait waitpid); $bits{$_}{5} = 'OPpTRANS_COMPLEMENT' for qw(trans transr); $bits{$_}{7} = 'OPpTRANS_DELETE' for qw(trans transr); $bits{$_}{0} = 'OPpTRANS_FROM_UTF' for qw(trans transr); diff --git a/opcode.h b/opcode.h index 8260e2b..51fbf28 100644 --- a/opcode.h +++ b/opcode.h @@ -1836,7 +1836,7 @@ EXTCONST U32 PL_opargs[] = { 0x0001120e, /* bit_xor */ 0x0001120e, /* bit_or */ 0x0000112e, /* negate */ - 0x0000111e, /* i_negate */ + 0x0000110e, /* i_negate */ 0x00001106, /* not */ 0x0000110e, /* complement */ 0x00000204, /* smartmatch */ @@ -2457,7 +2457,7 @@ EXTCONST I16 PL_op_private_bitdef_ix[] = { 12, /* bit_xor */ 12, /* bit_or */ 0, /* negate */ - 72, /* i_negate */ + 0, /* i_negate */ 0, /* not */ 0, /* complement */ 12, /* smartmatch */ @@ -2762,7 +2762,7 @@ EXTCONST I16 PL_op_private_bitdef_ix[] = { */ EXTCONST U16 PL_op_private_bitdefs[] = { - 0x0003, /* scalar, prototype, refgen, srefgen, ref, readline, regcmaybe, regcreset, regcomp, chop, schop, defined, undef, study, preinc, i_preinc, predec, i_predec, postinc, i_postinc, postdec, i_postdec, negate, not, complement, ucfirst, lcfirst, uc, lc, quotemeta, aeach, akeys, avalues, each, values, pop, shift, range, and, or, dor, andassign, orassign, dorassign, method, method_named, entergiven, leavegiven, enterwhen, leavewhen, untie, tied, dbmclose, getsockname, getpeername, lstat, stat, readlink, readdir, telldir, rewinddir, closedir, localtime, alarm, require, dofile, entertry, ghbyname, gnbyname, gpbyname, shostent, snetent, sprotoent, sservent, gpwnam, gpwuid, ggrnam, ggrgid, lock, once, reach, rvalues, fc */ + 0x0003, /* scalar, prototype, refgen, srefgen, ref, readline, regcmaybe, regcreset, regcomp, chop, schop, defined, undef, study, preinc, i_preinc, predec, i_predec, postinc, i_postinc, postdec, i_postdec, negate, i_negate, not, complement, ucfirst, lcfirst, uc, lc, quotemeta, aeach, akeys, avalues, each, values, pop, shift, range, and, or, dor, andassign, orassign, dorassign, method, method_named, entergiven, leavegiven, enterwhen, leavewhen, untie, tied, dbmclose, getsockname, getpeername, lstat, stat, readlink, readdir, telldir, rewinddir, closedir, localtime, alarm, require, dofile, entertry, ghbyname, gnbyname, gpbyname, shostent, snetent, sprotoent, sservent, gpwnam, gpwuid, ggrnam, ggrgid, lock, once, reach, rvalues, fc */ 0x281c, 0x3a19, /* pushmark */ 0x00bd, /* wantarray, runcv */ 0x03b8, 0x1490, 0x3acc, 0x3588, 0x2be5, /* const */ @@ -2784,7 +2784,7 @@ EXTCONST U16 PL_op_private_bitdefs[] = { 0x0c9c, 0x1c18, 0x0834, 0x3d30, 0x384c, 0x1fa8, 0x01e4, 0x0141, /* trans, transr */ 0x0adc, 0x0458, 0x0067, /* sassign */ 0x0758, 0x290c, 0x0067, /* aassign */ - 0x3d30, 0x0003, /* chomp, schomp, i_negate, sin, cos, exp, log, sqrt, int, hex, oct, abs, length, ord, chr, chroot, rmdir */ + 0x3d30, 0x0003, /* chomp, schomp, sin, cos, exp, log, sqrt, int, hex, oct, abs, length, ord, chr, chroot, rmdir */ 0x3d30, 0x0067, /* pow, multiply, i_multiply, divide, i_divide, modulo, i_modulo, add, i_add, subtract, i_subtract, concat, left_shift, right_shift */ 0x0f78, 0x3d30, 0x0067, /* repeat */ 0x3d30, 0x012f, /* stringify, atan2, rand, srand, index, rindex, crypt, push, unshift, flock, chdir, chown, unlink, chmod, utime, rename, link, symlink, mkdir, waitpid, system, exec, kill, getpgrp, setpgrp, getpriority, setpriority, sleep */ @@ -2930,7 +2930,7 @@ EXTCONST U8 PL_op_private_valid[] = { /* BIT_XOR */ (OPpARG2_MASK), /* BIT_OR */ (OPpARG2_MASK), /* NEGATE */ (OPpARG1_MASK), - /* I_NEGATE */ (OPpARG1_MASK|OPpTARGET_MY), + /* I_NEGATE */ (OPpARG1_MASK), /* NOT */ (OPpARG1_MASK), /* COMPLEMENT */ (OPpARG1_MASK), /* SMARTMATCH */ (OPpARG2_MASK), diff --git a/regen/opcodes b/regen/opcodes index 2a0430d..d6063a4 100644 --- a/regen/opcodes +++ b/regen/opcodes @@ -166,7 +166,7 @@ bit_xor bitwise xor (^) ck_bitop fst2 S S bit_or bitwise or (|) ck_bitop fst2 S S negate negation (-) ck_null Ifst1 S -i_negate integer negation (-) ck_null ifsT1 S +i_negate integer negation (-) ck_null ifst1 S not not ck_null ifs1 S complement 1's complement (~) ck_bitop fst1 S diff --git a/t/op/lex_assign.t b/t/op/lex_assign.t index 864330e..b7d7b9e 100644 --- a/t/op/lex_assign.t +++ b/t/op/lex_assign.t @@ -220,6 +220,7 @@ $n ^ $n # bit_xor $n | $n # bit_or -$n # negate -$n # i_negate +-$a=="-fake" # i_negate with string ~$n # complement atan2 $n,$n # atan2 sin $n # sin