Skip to content

Newtype oparg align methods #7403

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 3 commits into from
Mar 12, 2026
Merged

Newtype oparg align methods #7403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51ba230
Align methods for newtype opargs
ShaharNaveh Mar 12, 2026
1d79c46
Remove redundent code
ShaharNaveh Mar 12, 2026
8acdc3e
fix jit
ShaharNaveh Mar 12, 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
8 changes: 4 additions & 4 deletions crates/codegen/src/ir.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ impl CodeInfo {
}
}

let mut block_to_offset = vec![Label(0); blocks.len()];
let mut block_to_offset = vec![Label::new(0); blocks.len()];
// block_to_index: maps block idx to instruction index (for exception table)
// This is the index into the final instructions array, including EXTENDED_ARG and CACHE
let mut block_to_index = vec![0u32; blocks.len()];
Expand All @@ -351,7 +351,7 @@ impl CodeInfo {
loop {
let mut num_instructions = 0;
for (idx, block) in iter_blocks(&blocks) {
block_to_offset[idx.idx()] = Label(num_instructions as u32);
block_to_offset[idx.idx()] = Label::new(num_instructions as u32);
// block_to_index uses the same value as block_to_offset but as u32
// because lasti in frame.rs is the index into instructions array
// and instructions array index == byte offset (each instruction is 1 CodeUnit)
Expand All @@ -369,7 +369,7 @@ impl CodeInfo {
while next_block != BlockIdx::NULL {
let block = &mut blocks[next_block];
// Track current instruction offset for jump direction resolution
let mut current_offset = block_to_offset[next_block.idx()].0;
let mut current_offset = block_to_offset[next_block.idx()].as_u32();
for info in &mut block.instructions {
let target = info.target;
let mut op = info.instr.expect_real();
Expand All @@ -380,7 +380,7 @@ impl CodeInfo {
let offset_after = current_offset + old_arg_size as u32 + old_cache_entries;

if target != BlockIdx::NULL {
let target_offset = block_to_offset[target.idx()].0;
let target_offset = block_to_offset[target.idx()].as_u32();
// Direction must be based on concrete instruction offsets.
// Empty blocks can share offsets, so block-order-based resolution
// may classify some jumps incorrectly.
Expand Down
2 changes: 1 addition & 1 deletion crates/compiler-core/src/bytecode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1024,7 +1024,7 @@ impl<C: Constant> CodeObject<C> {
}

// arrow and offset
let arrow = if label_targets.contains(&Label(offset as u32)) {
let arrow = if label_targets.contains(&Label::new(offset as u32)) {
">>"
} else {
" "
Expand Down
8 changes: 1 addition & 7 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 @@ -1105,13 +1105,7 @@ impl InstructionMetadata for Instruction {
};
($variant:ident, $map:ident = $arg_marker:expr) => {{
let arg = $arg_marker.get(arg);
write!(
f,
"{:pad$}({}, {})",
stringify!($variant),
u32::from(arg),
$map(arg)
)
write!(f, "{:pad$}({}, {})", stringify!($variant), arg, $map(arg))
}};
($variant:ident, $arg_marker:expr) => {
write!(f, "{:pad$}({})", stringify!($variant), $arg_marker.get(arg))
Expand Down
Loading
Loading