Skip to content

Commit a902d92

Browse files
committed
Perl_op_convert_list: No unnecessary processing of unfolded CONSTs
When Perl_op_convert_list is called to stringify a CONST OP, but the `op_folded` flag has not been passed in, a fair amount of activity occurs before the function returns the original CONST OP unchanged. After this commit, the CONST OP is returned directly. For example, prior to this commit, given the statement 'print "2\n', the function is passed a simple CONST OP: 1 const SVOP(0x55c99432c0b8) ===> [SELF] PARENT ===> [0x0] FLAGS = (SCALAR,SLABBED) SV = PV("2\n"\0) List context is forced upon it to yield: 2 list LISTOP(0x55c99432c048) ===> [0x0] PARENT ===> [0x0] FLAGS = (UNKNOWN,KIDS,SLABBED) | 3 +--pushmark OP(0x55c99432c088) ===> [SELF] | FLAGS = (SCALAR,SLABBED,MORESIB) | 1 +--const SVOP(0x55c99432c0b8) ===> [SELF] FLAGS = (SCALAR,SLABBED) SV = PV("2\n"\0) The pushmark is nullified and the parent type set: 2 stringify LISTOP(0x55c99432c048) ===> [0x0] PARENT ===> [0x0] FLAGS = (UNKNOWN,KIDS,SLABBED) | 3 +--null (ex-pushmark) OP(0x55c99432c088) ===> [SELF] | FLAGS = (SCALAR,SLABBED,MORESIB) | 1 +--const SVOP(0x55c99432c0b8) ===> [SELF] FLAGS = (SCALAR,SLABBED) SV = PV("2\n"\0) CHECKOP sets the number of non-null KIDS for the stringify: 2 stringify LISTOP(0x55c99432c048) ===> [0x0] PARENT ===> [0x0] FLAGS = (UNKNOWN,KIDS,SLABBED) PRIVATE = (0x1) | 3 +--null (ex-pushmark) OP(0x55c99432c088) ===> [SELF] | FLAGS = (SCALAR,SLABBED,MORESIB) | 1 +--const SVOP(0x55c99432c0b8) ===> [SELF] FLAGS = (SCALAR,SLABBED) SV = PV("2\n"\0) Then it is constant folded back to: 1 const SVOP(0x55c99432c0b8) ===> [SELF] PARENT ===> [0x0] FLAGS = (SCALAR,SLABBED) SV = PV("2\n"\0)
1 parent 81c6106 commit a902d92

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

op.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5531,6 +5531,16 @@ Perl_op_convert_list(pTHX_ I32 type, I32 flags, OP *o)
55315531
if (FEATURE_MODULE_TRUE_IS_ENABLED)
55325532
flags |= OPf_SPECIAL;
55335533
}
5534+
if (type == OP_STRINGIFY && OP_TYPE_IS(o, OP_CONST) &&
5535+
!(flags & OPf_FOLDED) ) {
5536+
assert(!OpSIBLING(o));
5537+
/* Don't wrap a single CONST in a list, process that list,
5538+
* then constant fold the list back to the starting OP.
5539+
* Note: Folded CONSTs do not seem to occur frequently
5540+
* enough for it to be worth the code bloat of also
5541+
* providing a fast path for them. */
5542+
return o;
5543+
}
55345544
if (!o || o->op_type != OP_LIST)
55355545
o = force_list(o, FALSE);
55365546
else

0 commit comments

Comments
 (0)