Skip to content

refactor(ecmascript): add ToUint32 trait #13272

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
graphite-app merged 1 commit into from
Aug 24, 2025
Merged

refactor(ecmascript): add ToUint32 trait #13272

Show file tree
Hide file tree
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
15 changes: 6 additions & 9 deletions crates/oxc_ecmascript/src/constant_evaluation/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use oxc_ast::{AstBuilder, ast::*};
use equality_comparison::{abstract_equality_comparison, strict_equality_comparison};

use crate::{
ToBigInt, ToBoolean, ToInt32, ToJsString as ToJsStringTrait, ToNumber,
ToBigInt, ToBoolean, ToInt32, ToJsString as ToJsStringTrait, ToNumber, ToUint32,
is_less_than::is_less_than,
side_effects::{MayHaveSideEffects, MayHaveSideEffectsContext},
to_numeric::ToNumeric,
Expand Down Expand Up @@ -265,29 +265,26 @@ fn binary_operation_evaluate_value_to<'a>(
}
Some(ConstantValue::Number(result))
}
#[expect(clippy::cast_sign_loss)]
BinaryOperator::ShiftLeft => {
let left = left.evaluate_value_to_number(ctx)?;
let right = right.evaluate_value_to_number(ctx)?;
let left = left.to_int_32();
let right = (right.to_int_32() as u32) & 31;
let right = right.to_uint_32() & 31;
Some(ConstantValue::Number(f64::from(left << right)))
}
#[expect(clippy::cast_sign_loss)]
BinaryOperator::ShiftRight => {
let left = left.evaluate_value_to_number(ctx)?;
let right = right.evaluate_value_to_number(ctx)?;
let left = left.to_int_32();
let right = (right.to_int_32() as u32) & 31;
let right = right.to_uint_32() & 31;
Some(ConstantValue::Number(f64::from(left >> right)))
}
#[expect(clippy::cast_sign_loss)]
BinaryOperator::ShiftRightZeroFill => {
let left = left.evaluate_value_to_number(ctx)?;
let right = right.evaluate_value_to_number(ctx)?;
let left = left.to_int_32();
let right = (right.to_int_32() as u32) & 31;
Some(ConstantValue::Number(f64::from((left as u32) >> right)))
let left = left.to_uint_32();
let right = right.to_uint_32() & 31;
Some(ConstantValue::Number(f64::from(left >> right)))
}
BinaryOperator::LessThan => is_less_than(ctx, left, right).map(|value| match value {
ConstantValue::Undefined => ConstantValue::Boolean(false),
Expand Down
2 changes: 1 addition & 1 deletion crates/oxc_ecmascript/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ pub use self::{
string_to_number::StringToNumber,
to_big_int::ToBigInt,
to_boolean::ToBoolean,
to_int_32::ToInt32,
to_int_32::{ToInt32, ToUint32},
to_integer_index::ToIntegerIndex,
to_number::ToNumber,
to_primitive::ToPrimitive,
Expand Down
23 changes: 23 additions & 0 deletions crates/oxc_ecmascript/src/to_int_32.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ pub trait ToInt32 {
fn to_int_32(&self) -> i32;
}

pub trait ToUint32: ToInt32 {
fn to_uint_32(&self) -> u32 {
self.to_int_32().cast_unsigned()
}
}
impl<T> ToUint32 for T where T: ToInt32 {}

impl ToInt32 for f64 {
fn to_int_32(&self) -> i32 {
#[cfg(all(target_arch = "aarch64", target_os = "macos"))]
Expand Down Expand Up @@ -191,4 +198,20 @@ mod test {
}
}
}

#[test]
#[expect(clippy::cast_precision_loss)]
fn f64_to_uint32_conversion() {
assert_eq!(0.0_f64.to_uint_32(), 0);
assert_eq!((-0.0_f64).to_uint_32(), 0);
assert_eq!(f64::NAN.to_uint_32(), 0);
assert_eq!(f64::INFINITY.to_uint_32(), 0);
assert_eq!(f64::NEG_INFINITY.to_uint_32(), 0);
assert_eq!(((i64::from(u32::MAX) + 1) as f64).to_uint_32(), u32::MIN);
assert_eq!(((i64::from(u32::MIN) - 1) as f64).to_uint_32(), u32::MAX);

// Test edge cases with maximum safe integers
assert_eq!((9_007_199_254_740_992.0_f64).to_uint_32(), 0); // 2^53
assert_eq!((-9_007_199_254_740_992.0_f64).to_uint_32(), 0); // -2^53
}
}
9 changes: 4 additions & 5 deletions crates/oxc_isolated_declarations/src/enum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use rustc_hash::FxHashMap;

use oxc_allocator::CloneIn;
use oxc_ast::ast::*;
use oxc_ecmascript::ToInt32;
use oxc_ecmascript::{ToInt32, ToUint32};
use oxc_span::{Atom, GetSpan, SPAN};
use oxc_syntax::{
number::{NumberBase, ToJsString},
Expand Down Expand Up @@ -204,16 +204,15 @@ impl<'a> IsolatedDeclarations<'a> {
ConstantValue::String(_) => return None,
};

#[expect(clippy::cast_sign_loss)]
match expr.operator {
BinaryOperator::ShiftRight => Some(ConstantValue::Number(f64::from(
left.to_int_32().wrapping_shr(right.to_int_32() as u32),
left.to_int_32().wrapping_shr(right.to_uint_32()),
))),
BinaryOperator::ShiftRightZeroFill => Some(ConstantValue::Number(f64::from(
(left.to_int_32() as u32).wrapping_shr(right.to_int_32() as u32),
(left.to_uint_32()).wrapping_shr(right.to_uint_32()),
))),
BinaryOperator::ShiftLeft => Some(ConstantValue::Number(f64::from(
left.to_int_32().wrapping_shl(right.to_int_32() as u32),
left.to_int_32().wrapping_shl(right.to_uint_32()),
))),
BinaryOperator::BitwiseXOR => {
Some(ConstantValue::Number(f64::from(left.to_int_32() ^ right.to_int_32())))
Expand Down
9 changes: 4 additions & 5 deletions crates/oxc_transformer/src/typescript/enum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use oxc_allocator::{StringBuilder, TakeIn, Vec as ArenaVec};
use oxc_ast::{NONE, ast::*};
use oxc_ast_visit::{VisitMut, walk_mut};
use oxc_data_structures::stack::NonEmptyStack;
use oxc_ecmascript::ToInt32;
use oxc_ecmascript::{ToInt32, ToUint32};
use oxc_semantic::{ScopeFlags, ScopeId};
use oxc_span::{Atom, SPAN, Span};
use oxc_syntax::{
Expand Down Expand Up @@ -444,7 +444,6 @@ impl<'a> TypeScriptEnum<'a> {
}
}

#[expect(clippy::cast_sign_loss)]
fn eval_binary_expression(
&self,
expr: &BinaryExpression<'a>,
Expand Down Expand Up @@ -485,13 +484,13 @@ impl<'a> TypeScriptEnum<'a> {

match expr.operator {
BinaryOperator::ShiftRight => Some(ConstantValue::Number(f64::from(
left.to_int_32().wrapping_shr(right.to_int_32() as u32),
left.to_int_32().wrapping_shr(right.to_uint_32()),
))),
BinaryOperator::ShiftRightZeroFill => Some(ConstantValue::Number(f64::from(
(left.to_int_32() as u32).wrapping_shr(right.to_int_32() as u32),
(left.to_uint_32()).wrapping_shr(right.to_uint_32()),
))),
BinaryOperator::ShiftLeft => Some(ConstantValue::Number(f64::from(
left.to_int_32().wrapping_shl(right.to_int_32() as u32),
left.to_int_32().wrapping_shl(right.to_uint_32()),
))),
BinaryOperator::BitwiseXOR => {
Some(ConstantValue::Number(f64::from(left.to_int_32() ^ right.to_int_32())))
Expand Down
Loading