Skip to content

Constify OpArgState methods #7616

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

Open
ShaharNaveh wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −5
Open

Constify OpArgState methods #7616

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 17 additions & 5 deletions crates/compiler-core/src/bytecode/oparg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@ impl OpArgByte {
pub const fn new(value: u8) -> Self {
Self(value)
}

/// Returns the inner value as a [`u8`].
#[must_use]
pub const fn as_u8(self) -> u8 {
self.0
}

/// Returns the inner value as a [`u32`].
#[must_use]
pub const fn as_u32(self) -> u32 {
self.0 as u32
}
}

impl From<u8> for OpArgByte {
Expand All @@ -29,7 +41,7 @@ impl From<u8> for OpArgByte {

impl From<OpArgByte> for u8 {
fn from(value: OpArgByte) -> Self {
value.0
value.as_u8()
}
}

Expand Down Expand Up @@ -93,7 +105,7 @@ pub struct OpArgState {

impl OpArgState {
#[inline(always)]
pub fn get(&mut self, ins: CodeUnit) -> (Instruction, OpArg) {
pub const fn get(&mut self, ins: CodeUnit) -> (Instruction, OpArg) {
let arg = self.extend(ins.arg);
if !matches!(ins.op, Instruction::ExtendedArg) {
self.reset();
Expand All @@ -102,9 +114,9 @@ impl OpArgState {
}

#[inline(always)]
pub fn extend(&mut self, arg: OpArgByte) -> OpArg {
self.state = (self.state << 8) | u32::from(arg.0);
self.state.into()
pub const fn extend(&mut self, arg: OpArgByte) -> OpArg {
self.state = (self.state << 8) | arg.as_u32();
OpArg::new(self.state)
}

#[inline(always)]
Expand Down
Loading