Skip to content

Conversation

@fglock
Copy link
Owner

@fglock fglock commented Jan 6, 2026

Extends the control flow fix from PR #121 to work with all labeled blocks, not just SKIP.

Changes

  • EmitBlock.java: Registry check now applies to all labeled blocks (not restricted to SKIP only)
  • skip_control_flow.t: Added 6 new test cases for TODO and CLEANUP labels

Why This Change

PR #121 implemented control flow support for SKIP blocks, but the mechanism should work for any labeled block (TODO, CLEANUP, or any custom label). There's nothing special about the SKIP label name.

Test Results

All 9 tests pass:

  • ✅ Tests 1-3: SKIP labeled blocks (single frame, scalar context, void context)
  • ✅ Tests 4-6: TODO labeled blocks (single frame, scalar context, void context)
  • ✅ Tests 7-9: CLEANUP labeled blocks (single frame, scalar context, void context)

Example

sub inner { last TODO }
sub outer { my $x = inner(); return $x; }
TODO: {
    print "A";
    my $r = outer();  # Control flow propagates through function call
    print "B";       # This is skipped
}
print "C";           # Execution continues here
# Output: AC

This works for any label name: SKIP, TODO, CLEANUP, or custom labels.

fglock added 4 commits January 6, 2026 09:44
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 ✓
Fix last SKIP control flow in scalar context
Now that the control flow fix is merged, 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 ✓
The registry check in EmitBlock.java now applies to all labeled blocks,
not just SKIP. This allows 'last LABEL' to work correctly through
function calls for any label name.

Changes:
- EmitBlock.java: Registry check applies to all labeled blocks
- skip_control_flow.t: Added tests for TODO and CLEANUP labels

Results:
- All 9 tests pass (SKIP, TODO, CLEANUP in 3 contexts each) ✓
- Control flow works for any label name ✓
@fglock fglock force-pushed the master branch 2 times, most recently from 97346c2 to 469f6cc Compare January 6, 2026 10:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants