Skip to content

AnyInstruction helpers + doc imrovments #7757

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

Merged
youknowone merged 9 commits into from
May 2, 2026
Merged

AnyInstruction helpers + doc imrovments #7757

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c5ebd90
Add some helper methods
ShaharNaveh May 1, 2026
b20ad3d
Fix
ShaharNaveh May 1, 2026
5cecfc4
Use in more places
ShaharNaveh May 1, 2026
9f1593c
more places
ShaharNaveh May 1, 2026
d0b52d0
more
ShaharNaveh May 1, 2026
b509a79
more
ShaharNaveh May 1, 2026
bbb5d8c
more
ShaharNaveh May 1, 2026
8c47b21
Merge remote-tracking branch 'upstream/main' into any-instr-helpers
ShaharNaveh May 2, 2026
9870b49
clippy
ShaharNaveh May 2, 2026
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
Next Next commit
Add some helper methods
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed May 1, 2026
commit c5ebd9087c85478508aace4def1f1a1d777c2d88
45 changes: 31 additions & 14 deletions crates/compiler-core/src/bytecode/instruction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1344,12 +1344,14 @@ define_opcodes!(
);

impl PseudoInstruction {
/// Returns true if this is a block push pseudo instruction
/// (SETUP_FINALLY, SETUP_CLEANUP, or SETUP_WITH).
pub fn is_block_push(&self) -> bool {
/// Returns true if self is one of:
/// - [`PseudoInstruction::SetupCleanup`]
/// - [`PseudoInstruction::SetupFinally`]
/// - [`PseudoInstruction::SetupWith`]
pub const fn is_block_push(&self) -> bool {
matches!(
self,
Self::SetupCleanup { .. } | Self::SetupFinally { .. } | Self::SetupWith { .. }
self.opcode(),
PseudoOpcode::SetupCleanup | PseudoOpcode::SetupFinally | PseudoOpcode::SetupWith
)
}
}
Expand Down Expand Up @@ -1527,22 +1529,38 @@ impl InstructionMetadata for AnyInstruction {
}

impl AnyInstruction {
/// Gets the inner value of [`Self::Real`].
/// Inner value of [`Self::Real`].
pub const fn real(self) -> Option<Instruction> {
match self {
Self::Real(ins) => Some(ins),
_ => None,
}
}

/// Gets the inner value of [`Self::Pseudo`].
/// Inner value of [`Self::Pseudo`].
pub const fn pseudo(self) -> Option<PseudoInstruction> {
match self {
Self::Pseudo(ins) => Some(ins),
_ => None,
}
}

/// Get [`Self::Real`] as [`Opcode`].
pub const fn real_opcode(self) -> Option<Opcode> {
match self.real() {
Some(ins) => Some(ins.opcode()),
_ => None,
}
}

/// Get [`Self::Pseudo`] as [`PseudoOpcode`].
pub const fn pseudo_opcode(self) -> Option<PseudoOpcode> {
match self.pseudo() {
Some(ins) => Some(ins.opcode()),
_ => None,
}
}

/// Same as [`Self::real`] but panics if wasn't called on [`Self::Real`].
///
/// # Panics
Expand All @@ -1563,15 +1581,14 @@ impl AnyInstruction {
.expect("Expected AnyInstruction::Pseudo, found AnyInstruction::Real")
}

/// Returns true if this is a block push pseudo instruction
/// (SETUP_FINALLY, SETUP_CLEANUP, or SETUP_WITH).
pub fn is_block_push(&self) -> bool {
matches!(self, Self::Pseudo(p) if p.is_block_push())
/// Returns true if this is a [`PseudoInstruction::PopBlock`].
pub const fn is_pop_block(&self) -> bool {
matches!(self, Self::Pseudo(PseudoInstruction::PopBlock))
}

/// Returns true if this is a POP_BLOCK pseudo instruction.
pub fn is_pop_block(&self) -> bool {
matches!(self, Self::Pseudo(PseudoInstruction::PopBlock))
/// See [`PseudoInstruction::is_block_push`].
pub const fn is_block_push(&self) -> bool {
matches!(self, Self::Pseudo(p) if p.is_block_push())
}
}

Expand Down