Skip to content

Remove JUMP_IF_NOT_EXC_MATCH, SET_EXC_INFO #6820

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

Jump to bottom
Merged
youknowone merged 1 commit into from
Jan 20, 2026
Merged

Remove JUMP_IF_NOT_EXC_MATCH, SET_EXC_INFO #6820

youknowone merged 1 commit into from
Jan 20, 2026

Conversation

@youknowone
Copy link
Member

@youknowone youknowone commented Jan 20, 2026 •
edited by coderabbitai bot
Loading

Summary by CodeRabbit

  • Refactor
    • Simplified exception handling bytecode by removing redundant operations and consolidating exception matching logic.
    • Streamlined exception handler control flow for improved runtime efficiency.
    • Enhanced exception type validation to ensure exceptions properly inherit from BaseException.

✏️ Tip: You can customize this high-level summary in your review settings.

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Jan 20, 2026 •
edited
Loading

📝 Walkthrough

Walkthrough

This PR refactors exception handling bytecode by removing JumpIfNotExcMatch and SetExcInfo opcodes. Exception matching logic is consolidated into CheckExcMatch, which now sets the matched exception as current, while PopJumpIfFalse replaces JumpIfNotExcMatch for conditional jumps. The bytecode instruction enum and related dispatch paths are simplified accordingly.

Changes

Cohort / File(s) Summary
Instruction variants removal
crates/compiler-core/src/bytecode/instruction.rs		 Removed public enum variants JumpIfNotExcMatch(Arg<Label>) and SetExcInfo from Instruction. Removed their handling from TryFrom<u8>, InstructionMetadata (label_arg, stack_effect, fmt_dis), and formatting/disassembly paths.
Code generation updates
crates/codegen/src/compile.rs		 Replaced duplicated exception-copy sequence with inline CheckExcMatch and PopJumpIfFalse for per-handler exception matching. Removed SetExcInfo emission since CheckExcMatch now sets the matched exception as current.
VM execution logic
crates/vm/src/frame.rs		 Removed implementations of Instruction::JumpIfNotExcMatch and Instruction::SetExcInfo. Enhanced CheckExcMatch with BaseException inheritance validation. Updated CHECK_EG_MATCH to set VM's current exception to matched exception after exception_group_match.
Opcode classification
crates/stdlib/src/opcode.rs		 Removed JumpIfNotExcMatch from has_jump() match arms, narrowing the set of jump-classified instructions.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~25 minutes

Possibly related PRs

Suggested reviewers

  • ShaharNaveh

Poem

🐰 With CheckExcMatch we hop more true,
SetExcInfo and JumpIfNot—adieu!
PopJumpIfFalse now bears the load,
Exception paths on cleaner road! ✨

🚥 Pre-merge checks | ✅ 2 | ❌ 1
❌ Failed checks (1 warning)
Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 66.67% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (2 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title directly and specifically describes the main change: removal of two instruction variants (JUMP_IF_NOT_EXC_MATCH and SET_EXC_INFO) from the codebase, which is clearly reflected across all modified files.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing touches
  • 📝 Generate docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@youknowone youknowone marked this pull request as ready for review January 20, 2026 16:15
@youknowone youknowone merged commit 274e8b4 into RustPython:main Jan 20, 2026
13 checks passed
@youknowone youknowone deleted the set-exc-info branch January 20, 2026 16:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@youknowone