Skip to content

Revert "📝 CodeRabbit Chat: Avoid unnecessary clones in atanhv and WASM exports" #660

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
claycuy merged 1 commit into from
Sep 27, 2026
Merged

Revert "📝 CodeRabbit Chat: Avoid unnecessary clones in atanhv and WASM exports" #660

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
111 changes: 0 additions & 111 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,6 @@ ureq = "2"
ahash = { version = "0.8", default-features = false, features = ["serde", "no-rng", "std"] }
getrandom = { version = "0.2.17", features = ["js"] }

[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
wasm-bindgen-test = "0.3"

[profile.dev]
incremental = false

Expand Down
41 changes: 3 additions & 38 deletions rust/src/instructions/math/vector/trigonometry/hyperbolic/inverse/atanhv_func.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ use crate::types::value::Value;
use crate::utils::{expected_type::expected_type, get_type_name::get_type_name};
#[inline(always)]
pub fn atanhv_values(a_val: Value, num_type: PrimitiveTypes, ip: usize) -> Result<Value, VMError> {
atanhv_borrowed(&a_val, num_type, ip)
}
fn atanhv_borrowed(a_val: &Value, num_type: PrimitiveTypes, ip: usize) -> Result<Value, VMError> {
let arr_a = a_val.as_array().ok_or_else(|| VMError::TypeMismatch {
let arr_a = a_val.as_array().ok_or(VMError::TypeMismatch {
ip,
expected: expected_type(num_type, ExpectedCategory::Float),
found: get_type_name(a_val.clone()),
Expand Down Expand Up @@ -54,11 +51,11 @@ fn atanhv_borrowed(a_val: &Value, num_type: PrimitiveTypes, ip: usize) -> Result
}
#[inline]
pub fn atanhv_func(stack: &mut Stack, num_type: PrimitiveTypes, ip: usize) -> Result<(), VMError> {
let value = stack.last().ok_or(VMError::StackUnderflow {
let value = stack.last().cloned().ok_or(VMError::StackUnderflow {
ip,
opcode: "ATANHV",
})?;
let result = atanhv_borrowed(value, num_type, ip)?;
let result = atanhv_values(value, num_type, ip)?;
*stack.last_mut().unwrap() = result;
Ok(())
}
Expand Down Expand Up @@ -87,38 +84,6 @@ mod tests {
assert_eq!(stack, original);
}
#[test]
fn replaces_only_top_value_after_success() {
let mut stack = Stack::from_vec(vec![Value::Int32(7), array(vec![Value::Float32(0.5)])]);
atanhv_func(&mut stack, PrimitiveTypes::Flt, 16).unwrap();
assert_eq!(stack[0], Value::Int32(7));
assert!((stack[1].as_array().unwrap()[0].as_f32() - 0.5_f32.atanh()).abs() < f32::EPSILON);
}
#[test]
fn invalid_element_and_directive_preserve_stack() {
let mut stack = Stack::from_vec(vec![Value::Int32(7), array(vec![Value::Bool(false)])]);
let original = stack.clone();
assert!(matches!(
atanhv_func(&mut stack, PrimitiveTypes::Flt, 19),
Err(VMError::TypeMismatch {
ip: 19,
found: "Boolean",
..
})
));
assert_eq!(stack, original);
let mut stack = Stack::from_vec(vec![array(vec![Value::Float32(0.0)])]);
let original = stack.clone();
assert!(matches!(
atanhv_func(&mut stack, PrimitiveTypes::Str, 20),
Err(VMError::TypeMismatch {
ip: 20,
found: "unknown",
..
})
));
assert_eq!(stack, original);
}
#[test]
fn validates_elements_and_directives() {
assert!(atanhv_values(array(vec![Value::Float32(1.0)]), PrimitiveTypes::Flt, 11).is_ok());
assert!(matches!(
Expand Down
53 changes: 4 additions & 49 deletions rust/src/interfaces/wasm_interface.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,14 +309,15 @@ impl WasmLightVM {
}
#[wasm_bindgen(js_name = "callExport")]
pub fn call_export(&mut self, name: String, args: JsValue) -> Result<JsValue, JsValue> {
let is_function = self.inner.functions.contains_key(name.as_str());
let target_name = name.clone();
let is_function = self.inner.functions.contains_key(target_name.as_str());
let serde_args: serde_json::Value = serde_wasm_bindgen::from_value(args).map_err(|e| {
wasm_bindgen::JsValue::from(js_sys::Error::new(&format!("Invalid export args: {}", e)))
})?;
if is_function {
let raw_result = self
.inner
.call_exported_internal(name, serde_args)
.call_exported_internal(target_name, serde_args)
.map_err(|e| wasm_bindgen::JsValue::from(js_sys::Error::new(&e.to_string())))?;
let parsed: serde_json::Value = serde_json::from_str(&raw_result).map_err(|e| {
let vm_err = VMError::SystemError(smol_str::SmolStr::from(format!(
Expand Down Expand Up @@ -354,7 +355,7 @@ impl WasmLightVM {
} else {
let raw_result = self
.inner
.var_exported_internal(name)
.var_exported_internal(target_name)
.map_err(|e| wasm_bindgen::JsValue::from(js_sys::Error::new(&e.to_string())))?;
let parsed: serde_json::Value = serde_json::from_str(&raw_result).map_err(|e| {
let vm_err = VMError::SystemError(smol_str::SmolStr::from(format!(
Expand Down Expand Up @@ -543,52 +544,6 @@ mod tests {
assert_eq!(parse_event("start"), Some(VmEvent::Start));
assert_eq!(parse_event("finish"), Some(VmEvent::Finish));
}
#[cfg(target_arch = "wasm32")]
#[wasm_bindgen_test::wasm_bindgen_test]
fn call_export_returns_function_and_variable_values() {
let mut vm = vm_with_control_capability();
vm.inner.caps.insert(Capability::Observe);
vm.inner.nightly = true;
vm.inner
.load_internal(
serde_json::json!([
["jump", 7],
["func", "add", 2, 2, 6, "a", "b"],
["get", "a"],
["get", "b"],
["add", "int"],
["return"],
["stop"],
["export", "add"],
["val", "x"],
["push", 5],
["set", "x"],
["export", "x"]
])
.to_string(),
)
.unwrap();
let function_result = vm
.call_export(
"add".to_string(),
serde_wasm_bindgen::to_value(&serde_json::json!([5, 6])).unwrap(),
)
.unwrap();
assert_eq!(
serde_wasm_bindgen::from_value::<serde_json::Value>(function_result).unwrap(),
11
);
let variable_result = vm
.call_export(
"x".to_string(),
serde_wasm_bindgen::to_value(&serde_json::json!([])).unwrap(),
)
.unwrap();
assert_eq!(
serde_wasm_bindgen::from_value::<serde_json::Value>(variable_result).unwrap(),
5
);
}
#[test]
fn tools_optimizer_typed_output_matches_string_boundary() {
let bytecode = serde_json::json!([["stop"]]);
Expand Down
Loading