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
Prev Previous commit
Next Next commit
more
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed May 1, 2026
commit d0b52d08415e841750c8cfb2b60f0d7e1467b31d
68 changes: 33 additions & 35 deletions crates/codegen/src/ir.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4305,11 +4305,11 @@ impl CodeInfo {

let (_, next_info) = real_instrs.get(cursor)?;

match next_info.instr.real() {
Some(Instruction::GetIter) => Some(DeoptKind::ReturnIter {
match next_info.instr.real_opcode() {
Some(Opcode::GetIter) => Some(DeoptKind::ReturnIter {
tail_start_idx: cursor + 1,
}),
Some(Instruction::Call { .. } | Instruction::CallKw { .. }) => real_instrs
Some(Opcode::Call | Opcode::CallKw) => real_instrs
.get(cursor + 1)
.and_then(|(_, info)| info.instr.real())
.and_then(|instr| {
Expand Down Expand Up @@ -4354,18 +4354,21 @@ impl CodeInfo {
}
let block = &blocks[block_idx.idx()];
for info in block.instructions.iter().skip(current_start) {
match info.instr.real() {
Some(Instruction::ReturnValue) => return true,
Some(
Instruction::StoreFast { .. }
| Instruction::StoreFastLoadFast { .. }
| Instruction::StoreFastStoreFast { .. },
)
| Some(Instruction::DeleteFast { .. })
| Some(Instruction::LoadFastAndClear { .. }) => return false,
let Some(opcode) = info.instr.real_opcode() else {
continue;
};

match opcode {
Opcode::ReturnValue => return true,
Opcode::StoreFast
| Opcode::StoreFastLoadFast
| Opcode::StoreFastStoreFast
| Opcode::DeleteFast
| Opcode::LoadFastAndClear => return false,
_ => {}
}
}

block_idx = block.next;
current_start = 0;
}
Expand Down Expand Up @@ -4486,36 +4489,34 @@ impl CodeInfo {
{
continue;
}
if matches!(info.instr.real(), Some(Instruction::LoadFastBorrow { .. })) {

if matches!(info.instr.real_opcode(), Some(Opcode::LoadFastBorrow)) {
to_deopt.push(*instr_idx);
}

if let DeoptKind::Subscript { binary_op_idx } = deopt_kind {
for (extra_instr_idx, extra_info) in real_instrs
.iter()
.skip(real_idx + 1)
.take(binary_op_idx.saturating_sub(real_idx + 1))
.map(|(idx, info)| (*idx, *info))
{
if matches!(
extra_info.instr.real(),
Some(Instruction::LoadFastBorrow { .. })
) {
if matches!(extra_info.instr.real_opcode(), Some(Opcode::LoadFastBorrow)) {
to_deopt.push(extra_instr_idx);
}
}
if matches!(
real_instrs
.get(binary_op_idx + 1)
.and_then(|(_, info)| info.instr.real()),
Some(Instruction::StoreFast { .. })
.and_then(|(_, info)| info.instr.real_opcode()),
Some(Opcode::StoreFast)
) {
for (extra_instr_idx, extra_info) in
real_instrs.iter().skip(binary_op_idx + 2)
{
if matches!(
extra_info.instr.real(),
Some(Instruction::LoadFastBorrow { .. })
| Some(Instruction::LoadFastBorrowLoadFastBorrow { .. })
extra_info.instr.real_opcode(),
Some(Opcode::LoadFastBorrow | Opcode::LoadFastBorrowLoadFastBorrow)
) {
to_deopt.push(*extra_instr_idx);
}
Expand All @@ -4542,9 +4543,11 @@ impl CodeInfo {
.enumerate()
{
if matches!(
tail_info.instr.real(),
Some(Instruction::LoadFastBorrow { .. })
| Some(Instruction::LoadFastBorrowLoadFastBorrow { .. })
tail_info.instr.real_opcode(),
Some(
Opcode::LoadFastBorrow
| Opcode::LoadFastBorrowLoadFastBorrow
)
) {
cross_block_deopts.push((tail_block_idx, tail_instr_idx));
}
Expand All @@ -4566,17 +4569,12 @@ impl CodeInfo {
continue;
};

match opcode {
Opcode::LoadFastBorrow => {
self.blocks[block_idx.idx()].instructions[instr_idx].instr =
Opcode::LoadFast.into();
}
Opcode::LoadFastBorrowLoadFastBorrow => {
self.blocks[block_idx.idx()].instructions[instr_idx].instr =
Opcode::LoadFastLoadFast.into();
}
_ => {}
self.blocks[block_idx.idx()].instructions[instr_idx].instr = match opcode {
Opcode::LoadFastBorrow => Opcode::LoadFast,
Opcode::LoadFastBorrowLoadFastBorrow => Opcode::LoadFastLoadFast,
_ => continue,
}
.into();
}
}

Expand Down
Loading