Skip to content

Align f-string related bytecodes with 3.13 #6321

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 7 commits into from
Dec 2, 2025
Merged

Align f-string related bytecodes with 3.13 #6321

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e04b88d
Align `f-string` related bytecodes with 3.13
ShaharNaveh Dec 2, 2025
8045884
Resolve name collision
ShaharNaveh Dec 2, 2025
e6d999d
Adjust for ruff return value
ShaharNaveh Dec 2, 2025
eefeb24
Trigger CI
ShaharNaveh Dec 2, 2025
85f7a7f
Merge remote-tracking branch 'upstream/main' into bytecode-fmt-simple…
ShaharNaveh Dec 2, 2025
32d4eaf
Fix sorting
ShaharNaveh Dec 2, 2025
c7c1c0b
Fix bad merge
ShaharNaveh Dec 2, 2025
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
Adjust for ruff return value
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed Dec 2, 2025
commit e6d999d4647bc0bd06bbd52795d1ae83557179d0
38 changes: 20 additions & 18 deletions crates/compiler-core/src/bytecode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,26 @@ impl fmt::Display for ConvertValueOparg {
}
}

impl OpArgType for ConvertValueOparg {
#[inline]
fn from_op_arg(x: u32) -> Option<Self> {
Some(match x {
// Ruff `ConversionFlag::None` is `-1i8`,
// when its converted to `u8` its value is `u8::MAX`
0 | 255 => Self::None,
1 => Self::Str,
2 => Self::Repr,
3 => Self::Ascii,
_ => return None,
})
}

#[inline]
fn to_op_arg(self) -> u32 {
self as u32
}
}

/// Resume type for the RESUME instruction
#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq)]
#[repr(u32)]
Expand Down Expand Up @@ -514,24 +534,6 @@ impl fmt::Display for Label {
}
}

impl OpArgType for ConvertValueOparg {
#[inline]
fn from_op_arg(x: u32) -> Option<Self> {
Some(match x {
0 => Self::None,
1 => Self::Str,
2 => Self::Repr,
3 => Self::Ascii,
_ => return None,
})
}

#[inline]
fn to_op_arg(self) -> u32 {
self as u32
}
}

op_arg_enum!(
/// The kind of Raise that occurred.
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
Expand Down
Loading