Skip to content

Apply HINT_BLOCK_SCOPE to lexical variable declarations #23867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: blead
Choose a base branch
from
Open

Apply HINT_BLOCK_SCOPE to lexical variable declarations #23867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bbb135
Apply HINT_BLOCK_SCOPE to lexical variable declarations
richardleach Oct 16, 2025
206fbff
Adjust B tests to match new scoping arrangements
richardleach Oct 16, 2025
5cf7e60
Fix empty else {} optimization
richardleach Oct 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ext/B/t/optree_check.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,11 @@ checkOptree ( name => 'fixup nextstate (in reftext)',
code => sub {my $a},
strip_open_hints => 1,
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
# 1 <;> nextstate( NOTE THAT THIS CAN BE ANYTHING ) v:>,<,%
# 1 <;> nextstate( NOTE THAT THIS CAN BE ANYTHING ) v:>,<,%,{
# 2 <0> padsv[$a:54,55] sM/LVINTRO
# 3 <1> leavesub[1 ref] K/REFC,1
EOT_EOT
# 1 <;> nextstate(main 54 optree_concise.t:84) v:>,<,%
# 1 <;> nextstate(main 54 optree_concise.t:84) v:>,<,%,{
# 2 <0> padsv[$a:54,55] sM/LVINTRO
# 3 <1> leavesub[1 ref] K/REFC,1
EONT_EONT
Expand All @@ -159,11 +159,11 @@ checkOptree ( name => 'fixup opcode args',
code => sub {my $a},
strip_open_hints => 1,
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
# 1 <;> nextstate(main 56 optree_concise.t:96) v:>,<,%
# 1 <;> nextstate(main 56 optree_concise.t:96) v:>,<,%,{
# 2 <0> padsv[$a:56,57] sM/LVINTRO
# 3 <1> leavesub[1 ref] K/REFC,1
EOT_EOT
# 1 <;> nextstate(main 56 optree_concise.t:96) v:>,<,%
# 1 <;> nextstate(main 56 optree_concise.t:96) v:>,<,%,{
# 2 <0> padsv[$a:56,57] sM/LVINTRO
# 3 <1> leavesub[1 ref] K/REFC,1
EONT_EONT
Expand Down
24 changes: 12 additions & 12 deletions ext/B/t/optree_for.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ checkOptree ( name => 'for my $var (@a)',
bcopts => '-exec',
strip_open_hints => 1,
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
1 <;> nextstate(main 1459 optree_for.t:90) v
1 <;> nextstate(main 1459 optree_for.t:90) v:{
2 <0> pushmark sM
3 <#> gv[*a] s
4 <1> rv2av[t3] sKRM/1
Expand All @@ -128,7 +128,7 @@ checkOptree ( name => 'for my $var (@a)',
9 <2> leaveloop K/2
a <1> leavesub[1 ref] K/REFC,1
EOT_EOT
1 <;> nextstate(main 424 optree_for.t:14) v:>,<,%
1 <;> nextstate(main 424 optree_for.t:14) v:>,<,%,{
2 <0> pushmark sM
3 <$> gv(*a) s
4 <1> rv2av[t2] sKRM/1
Expand All @@ -146,7 +146,7 @@ checkOptree ( name => 'for our $var (@a)',
bcopts => '-exec',
strip_open_hints => 1,
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
1 <;> nextstate(main 1466 optree_for.t:100) v
1 <;> nextstate(main 1466 optree_for.t:100) v:{
2 <0> pushmark sM
3 <#> gv[*a] s
4 <1> rv2av[t4] sKRM/1
Expand All @@ -160,7 +160,7 @@ a <|> and(other->8) K/1
b <2> leaveloop K/2
c <1> leavesub[1 ref] K/REFC,1
EOT_EOT
1 <;> nextstate(main 424 optree_for.t:111) v:>,<,%
1 <;> nextstate(main 424 optree_for.t:111) v:>,<,%,{
2 <0> pushmark sM
3 <$> gv(*a) s
4 <1> rv2av[t2] sKRM/1
Expand All @@ -180,7 +180,7 @@ checkOptree ( name => 'for my ($var) (@a)',
bcopts => '-exec',
strip_open_hints => 1,
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
1 <;> nextstate(main 1466 optree_for.t:100) v
1 <;> nextstate(main 1466 optree_for.t:100) v:{
2 <0> pushmark sM
3 <#> gv[*a] s
4 <1> rv2av[t3] sKRM/1
Expand All @@ -192,7 +192,7 @@ checkOptree ( name => 'for my ($var) (@a)',
9 <2> leaveloop K/2
a <1> leavesub[1 ref] K/REFC,1
EOT_EOT
1 <;> nextstate(main 424 optree_for.t:111) v:>,<,%
1 <;> nextstate(main 424 optree_for.t:111) v:>,<,%,{
2 <0> pushmark sM
3 <$> gv(*a) s
4 <1> rv2av[t2] sKRM/1
Expand All @@ -210,7 +210,7 @@ checkOptree ( name => 'for my ($var) (@lexical)',
bcopts => '-exec',
strip_open_hints => 1,
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
1 <;> nextstate(main 1466 optree_for.t:100) v
1 <;> nextstate(main 1466 optree_for.t:100) v:{
2 <0> pushmark sM
3 <0> padav[@lexical:FAKE::7] sRM
4 <{> enteriter(next->5 last->8 redo->5)[$var:1481,1484] KPS/LVINTRO
Expand All @@ -221,7 +221,7 @@ checkOptree ( name => 'for my ($var) (@lexical)',
8 <2> leaveloop K/2
9 <1> leavesub[2 refs] K/REFC,1
EOT_EOT
1 <;> nextstate(main 424 optree_for.t:111) v:>,<,%
1 <;> nextstate(main 424 optree_for.t:111) v:>,<,%,{
2 <0> pushmark sM
3 <0> padav[@lexical:FAKE::2] sRM
4 <{> enteriter(next->5 last->8 redo->5)[$var:1481,1484] KPS/LVINTRO
Expand All @@ -238,7 +238,7 @@ checkOptree ( name => 'for my ($key, $value) (%h)',
bcopts => '-exec',
strip_open_hints => 1,
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
1 <;> nextstate(main 1466 optree_for.t:100) v
1 <;> nextstate(main 1466 optree_for.t:100) v:{
2 <0> pushmark sM
3 <#> gv[*h] s
4 <1> rv2hv[t4] lKM
Expand All @@ -250,7 +250,7 @@ checkOptree ( name => 'for my ($key, $value) (%h)',
9 <2> leaveloop K/2
a <1> leavesub[1 ref] K/REFC,1
EOT_EOT
1 <;> nextstate(main 424 optree_for.t:111) v:>,<,%
1 <;> nextstate(main 424 optree_for.t:111) v:>,<,%,{
2 <0> pushmark sM
3 <$> gv(*h) s
4 <1> rv2hv[t3] lKM
Expand All @@ -268,7 +268,7 @@ checkOptree ( name => 'for my ($foo, $bar, $baz) (@a)',
bcopts => '-exec',
strip_open_hints => 1,
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
1 <;> nextstate(main 1466 optree_for.t:100) v
1 <;> nextstate(main 1466 optree_for.t:100) v:{
2 <0> pushmark sM
3 <#> gv[*a] s
4 <1> rv2av[t5] sKRM/1
Expand All @@ -280,7 +280,7 @@ checkOptree ( name => 'for my ($foo, $bar, $baz) (@a)',
9 <2> leaveloop K/2
a <1> leavesub[1 ref] K/REFC,1
EOT_EOT
1 <;> nextstate(main 424 optree_for.t:111) v:>,<,%
1 <;> nextstate(main 424 optree_for.t:111) v:>,<,%,{
2 <0> pushmark sM
3 <$> gv(*a) s
4 <1> rv2av[t4] sKRM/1
Expand Down
40 changes: 20 additions & 20 deletions ext/B/t/optree_misc.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ checkOptree ( name => 'OP_AELEMFAST opclass',
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
# 7 <1> leavesub[1 ref] K/REFC,1 ->(end)
# - <@> lineseq KP ->7
# 1 <;> nextstate(main 634 optree_misc.t:25) v:>,<,% ->2
# 1 <;> nextstate(main 634 optree_misc.t:25) v:>,<,%,{ ->2
# 2 <0> padav[@x:634,636] vM/LVINTRO ->3
# - <;> ex-nextstate(main 1594 optree_misc.t:27) v:>,<,% ->3
# - <;> ex-nextstate(main 1594 optree_misc.t:27) v:>,<,%,{ ->3
# - <1> rv2av[t4] vK/OURINTR,1 ->3
# - <#> gv[*y] s ->-
# 3 <;> nextstate(main 636 optree_misc.t:25) v:>,<,%,{ ->4
Expand All @@ -42,9 +42,9 @@ checkOptree ( name => 'OP_AELEMFAST opclass',
EOT_EOT
# 7 <1> leavesub[1 ref] K/REFC,1 ->(end)
# - <@> lineseq KP ->7
# 1 <;> nextstate(main 634 optree_misc.t:27) v:>,<,% ->2
# 1 <;> nextstate(main 634 optree_misc.t:27) v:>,<,%,{ ->2
# 2 <0> padav[@x:634,636] vM/LVINTRO ->3
# - <;> ex-nextstate(main 1594 optree_misc.t:27) v:>,<,% ->3
# - <;> ex-nextstate(main 1594 optree_misc.t:27) v:>,<,%,{ ->3
# - <1> rv2av[t3] vK/OURINTR,1 ->3
# - <$> gv(*y) s ->-
# 3 <;> nextstate(main 636 optree_misc.t:27) v:>,<,%,{ ->4
Expand Down Expand Up @@ -168,12 +168,12 @@ checkOptree ( name => 'padrange',
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
# f <1> leavesub[1 ref] K/REFC,1 ->(end)
# - <@> lineseq KP ->f
# 1 <;> nextstate(main 1 -e:1) v:>,<,% ->2
# 1 <;> nextstate(main 1 -e:1) v:>,<,%,{ ->2
# - <@> list vKP ->3
# 2 <0> padrange[$x:1,2; $y:1,2] vM/LVINTRO,range=2 ->3
# - <0> padsv[$x:1,2] vM/LVINTRO ->-
# - <0> padsv[$y:1,2] vM/LVINTRO ->-
# 3 <;> nextstate(main 2 -e:1) v:>,<,% ->4
# 3 <;> nextstate(main 2 -e:1) v:>,<,%,{ ->4
# 8 <2> aassign[t4] vKS/COM_AGG ->9
# - <1> ex-list lKP ->5
# 4 <0> padrange[$x:1,2; $y:1,2] /range=2 ->5
Expand All @@ -196,12 +196,12 @@ checkOptree ( name => 'padrange',
EOT_EOT
# f <1> leavesub[1 ref] K/REFC,1 ->(end)
# - <@> lineseq KP ->f
# 1 <;> nextstate(main 1 -e:1) v:>,<,% ->2
# 1 <;> nextstate(main 1 -e:1) v:>,<,%,{ ->2
# - <@> list vKP ->3
# 2 <0> padrange[$x:1,2; $y:1,2] vM/LVINTRO,range=2 ->3
# - <0> padsv[$x:1,2] vM/LVINTRO ->-
# - <0> padsv[$y:1,2] vM/LVINTRO ->-
# 3 <;> nextstate(main 2 -e:1) v:>,<,% ->4
# 3 <;> nextstate(main 2 -e:1) v:>,<,%,{ ->4
# 8 <2> aassign[t4] vKS/COM_AGG ->9
# - <1> ex-list lKP ->5
# 4 <0> padrange[$x:1,2; $y:1,2] /range=2 ->5
Expand Down Expand Up @@ -233,7 +233,7 @@ checkOptree ( name => 'padrange and @_',
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
# d <1> leavesub[1 ref] K/REFC,1 ->(end)
# - <@> lineseq KP ->d
# 1 <;> nextstate(main 1 p3:1) v:>,<,% ->2
# 1 <;> nextstate(main 1 p3:1) v:>,<,%,{ ->2
# 3 <2> aassign[t5] vKS ->4
# - <1> ex-list lK ->-
# 2 <0> padrange[$a:1,4; $b:1,4] */LVINTRO,range=2 ->3
Expand All @@ -243,7 +243,7 @@ checkOptree ( name => 'padrange and @_',
# - <0> pushmark sRM*/LVINTRO ->-
# - <0> padsv[$a:1,4] sRM*/LVINTRO ->-
# - <0> padsv[$b:1,4] sRM*/LVINTRO ->-
# 4 <;> nextstate(main 2 p3:2) v:>,<,% ->5
# 4 <;> nextstate(main 2 p3:2) v:>,<,%,{ ->5
# 9 <2> aassign[t10] vKS/COM_RC1 ->a
# - <1> ex-list lK ->8
# 5 <0> pushmark s ->6
Expand All @@ -266,7 +266,7 @@ checkOptree ( name => 'padrange and @_',
EOT_EOT
# d <1> leavesub[1 ref] K/REFC,1 ->(end)
# - <@> lineseq KP ->d
# 1 <;> nextstate(main 1 p3:1) v:>,<,% ->2
# 1 <;> nextstate(main 1 p3:1) v:>,<,%,{ ->2
# 3 <2> aassign[t5] vKS ->4
# - <1> ex-list lK ->-
# 2 <0> padrange[$a:1,4; $b:1,4] */LVINTRO,range=2 ->3
Expand All @@ -276,7 +276,7 @@ EOT_EOT
# - <0> pushmark sRM*/LVINTRO ->-
# - <0> padsv[$a:1,4] sRM*/LVINTRO ->-
# - <0> padsv[$b:1,4] sRM*/LVINTRO ->-
# 4 <;> nextstate(main 2 p3:2) v:>,<,% ->5
# 4 <;> nextstate(main 2 p3:2) v:>,<,%,{ ->5
# 9 <2> aassign[t10] vKS/COM_RC1 ->a
# - <1> ex-list lK ->8
# 5 <0> pushmark s ->6
Expand Down Expand Up @@ -304,12 +304,12 @@ checkOptree ( name => 'consolidate padranges',
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
# 5 <1> leavesub[1 ref] K/REFC,1 ->(end)
# - <@> lineseq KP ->5
# 1 <;> nextstate(main 900 optree_misc.t:334) v:>,<,% ->2
# 1 <;> nextstate(main 900 optree_misc.t:334) v:>,<,%,{ ->2
# - <@> list vKP ->-
# 2 <0> padrange[$a:900,902; $b:900,902; $c:901,902; $d:901,902] vM/LVINTRO,range=4 ->3
# - <0> padsv[$a:900,902] vM/LVINTRO ->-
# - <0> padsv[$b:900,902] vM/LVINTRO ->-
# - <;> nextstate(main 901 optree_misc.t:334) v:>,<,% ->-
# - <;> nextstate(main 901 optree_misc.t:334) v:>,<,%,{ ->-
# - <@> list vKP ->3
# - <0> pushmark vM/LVINTRO ->-
# - <0> padsv[$c:901,902] vM/LVINTRO ->-
Expand All @@ -319,12 +319,12 @@ checkOptree ( name => 'consolidate padranges',
EOT_EOT
# 5 <1> leavesub[1 ref] K/REFC,1 ->(end)
# - <@> lineseq KP ->5
# 1 <;> nextstate(main 900 optree_misc.t:334) v:>,<,% ->2
# 1 <;> nextstate(main 900 optree_misc.t:334) v:>,<,%,{ ->2
# - <@> list vKP ->-
# 2 <0> padrange[$a:900,902; $b:900,902; $c:901,902; $d:901,902] vM/LVINTRO,range=4 ->3
# - <0> padsv[$a:900,902] vM/LVINTRO ->-
# - <0> padsv[$b:900,902] vM/LVINTRO ->-
# - <;> nextstate(main 901 optree_misc.t:334) v:>,<,% ->-
# - <;> nextstate(main 901 optree_misc.t:334) v:>,<,%,{ ->-
# - <@> list vKP ->3
# - <0> pushmark vM/LVINTRO ->-
# - <0> padsv[$c:901,902] vM/LVINTRO ->-
Expand All @@ -341,12 +341,12 @@ checkOptree ( name => 'consolidate padranges and singletons',
expect => <<'EOT_EOT', expect_nt => <<'EONT_EONT');
# 5 <1> leavesub[1 ref] K/REFC,1 ->(end)
# - <@> lineseq KP ->5
# 1 <;> nextstate(main 903 optree_misc.t:371) v:>,<,% ->2
# 1 <;> nextstate(main 903 optree_misc.t:371) v:>,<,%,{ ->2
# - <@> list vKP ->-
# 2 <0> padrange[$a:903,910; $b:903,910; $c:904,910; $d:905,910; $e:905,910; @f:906,910; $g:907,910; $h:908,910; $i:908,910; %j:909,910] vM/LVINTRO,range=10 ->3
# - <0> padsv[$a:903,910] vM/LVINTRO ->-
# - <0> padsv[$b:903,910] vM/LVINTRO ->-
# - <;> nextstate(main 904 optree_misc.t:371) v:>,<,% ->-
# - <;> nextstate(main 904 optree_misc.t:371) v:>,<,%,{ ->-
# - <0> padsv[$c:904,910] vM/LVINTRO ->-
# - <;> nextstate(main 905 optree_misc.t:371) v:>,<,%,{ ->-
# - <@> list vKP ->-
Expand All @@ -369,12 +369,12 @@ checkOptree ( name => 'consolidate padranges and singletons',
EOT_EOT
# 5 <1> leavesub[1 ref] K/REFC,1 ->(end)
# - <@> lineseq KP ->5
# 1 <;> nextstate(main 903 optree_misc.t:371) v:>,<,% ->2
# 1 <;> nextstate(main 903 optree_misc.t:371) v:>,<,%,{ ->2
# - <@> list vKP ->-
# 2 <0> padrange[$a:903,910; $b:903,910; $c:904,910; $d:905,910; $e:905,910; @f:906,910; $g:907,910; $h:908,910; $i:908,910; %j:909,910] vM/LVINTRO,range=10 ->3
# - <0> padsv[$a:903,910] vM/LVINTRO ->-
# - <0> padsv[$b:903,910] vM/LVINTRO ->-
# - <;> nextstate(main 904 optree_misc.t:371) v:>,<,% ->-
# - <;> nextstate(main 904 optree_misc.t:371) v:>,<,%,{ ->-
# - <0> padsv[$c:904,910] vM/LVINTRO ->-
# - <;> nextstate(main 905 optree_misc.t:371) v:>,<,%,{ ->-
# - <@> list vKP ->-
Expand Down
Loading
Loading