Fix last SKIP control flow in scalar context#121
Merged
Conversation
Add registry check after each statement in simple labeled blocks (≤3 statements) to handle non-local control flow like 'last SKIP' through function calls. The check: - Only applies to labeled blocks without loop constructs - Checks RuntimeControlFlowRegistry after each statement - Jumps to nextLabel if matching control flow detected - Limited to simple blocks to avoid ASM VerifyError Results: - skip_control_flow.t: all 3 tests pass ✓ - make: BUILD SUCCESSFUL ✓ - Baseline maintained: 66683/66880 tests passing in perl5_t/t/uni/variables.t ✓
d8dbee8 to
5a3baef
Compare
fglock
added a commit
that referenced
this pull request
Jan 6, 2026
Now that the control flow fix is merged (PR #121), we can remove the TestMoreHelper workaround that was transforming skip() calls at parse time. Changes: - Removed TestMoreHelper.java - Removed TestMoreHelper calls from StatementParser and StatementResolver - Updated Test::More.pm skip() to use 'last SKIP' directly - Removed skip_internal() from Test::More.pm exports - Cleaned up test.pl.patch to remove skip_internal workaround Results: - skip_control_flow.t: all 3 tests pass ✓ - Baseline maintained: 66683/66880 ✓
fglock
added a commit
that referenced
this pull request
Jan 6, 2026
Now that the control flow fix is merged (PR #121), we can remove the TestMoreHelper workaround that was transforming skip() calls at parse time. Changes: - Removed TestMoreHelper.java - Removed TestMoreHelper calls from StatementParser and StatementResolver - Updated Test::More.pm skip() to use 'last SKIP' directly - Removed skip_internal() from Test::More.pm exports - Cleaned up test.pl.patch to remove skip_internal workaround Results: - skip_control_flow.t: all 3 tests pass ✓ - Baseline maintained: 66683/66880 ✓
fglock
added a commit
that referenced
this pull request
Jan 6, 2026
Now that the control flow fix is merged (PR #121), we can remove the TestMoreHelper workaround that was transforming skip() calls at parse time. Changes: - Removed TestMoreHelper.java - Removed TestMoreHelper calls from StatementParser and StatementResolver - Updated Test::More.pm skip() to use 'last SKIP' directly - Removed skip_internal() from Test::More.pm exports - Cleaned up test.pl.patch to remove skip_internal workaround Results: - skip_control_flow.t: all 3 tests pass ✓ - Baseline maintained: 66683/66880 ✓
fglock
added a commit
that referenced
this pull request
Jan 6, 2026
Now that the control flow fix is merged (PR #121), we can remove the TestMoreHelper workaround that was transforming skip() calls at parse time. Changes: - Removed TestMoreHelper.java - Removed TestMoreHelper calls from StatementParser and StatementResolver - Updated Test::More.pm skip() to use 'last SKIP' directly - Removed skip_internal() from Test::More.pm exports - Cleaned up test.pl.patch to remove skip_internal workaround Results: - skip_control_flow.t: all 3 tests pass ✓ - Baseline maintained: 66683/66880 ✓
fglock
added a commit
that referenced
this pull request
Jan 6, 2026
Now that the control flow fix is merged (PR #121), we can remove the TestMoreHelper workaround that was transforming skip() calls at parse time. Changes: - Removed TestMoreHelper.java - Removed TestMoreHelper calls from StatementParser and StatementResolver - Updated Test::More.pm skip() to use 'last SKIP' directly - Removed skip_internal() from Test::More.pm exports - Cleaned up test.pl.patch to remove skip_internal workaround Results: - skip_control_flow.t: all 3 tests pass ✓ - Baseline maintained: 66683/66880 ✓
fglock
added a commit
that referenced
this pull request
Jan 21, 2026
Now that the control flow fix is merged (PR #121), we can remove the TestMoreHelper workaround that was transforming skip() calls at parse time. Changes: - Removed TestMoreHelper.java - Removed TestMoreHelper calls from StatementParser and StatementResolver - Updated Test::More.pm skip() to use 'last SKIP' directly - Removed skip_internal() from Test::More.pm exports - Cleaned up test.pl.patch to remove skip_internal workaround Results: - skip_control_flow.t: all 3 tests pass ✓ - Baseline maintained: 66683/66880 ✓
fglock
added a commit
that referenced
this pull request
Mar 3, 2026
Fix last SKIP control flow in scalar context
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes control flow propagation for
last SKIPthrough function calls in scalar context.Problem
Test #2 in skip_control_flow.t was failing:
The
last SKIPin inner2() wasn't exiting the SKIP block because the control flow marker wasn't being checked after outer2() returned.Solution
Added registry check in EmitBlock.java after each statement in simple labeled blocks (≤3 statements without loop constructs). The check:
Limited to simple blocks to avoid ASM VerifyError in complex code.
Results