fix: 还原 instanceof 的 null handler 归一化条件并翻转单测断言

This commit is contained in:
2026-10-14 07:14:36 +00:00
parent f3c3620b70
commit b1e2367556
4 changed files with 31 additions and 29 deletions
Generated
+21 -21
View File
@@ -1160,7 +1160,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_builtins" name = "oxide_builtins"
version = "0.19.4" version = "0.19.6"
dependencies = [ dependencies = [
"chrono", "chrono",
"fast-float", "fast-float",
@@ -1185,7 +1185,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_bytecode" name = "oxide_bytecode"
version = "0.19.4" version = "0.19.6"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"oxide_log", "oxide_log",
@@ -1193,7 +1193,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_cfg" name = "oxide_cfg"
version = "0.19.4" version = "0.19.6"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_emit", "oxide_emit",
@@ -1204,7 +1204,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_cli" name = "oxide_cli"
version = "0.19.4" version = "0.19.6"
dependencies = [ dependencies = [
"ansi_term", "ansi_term",
"bumpalo", "bumpalo",
@@ -1228,7 +1228,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_code_cache" name = "oxide_code_cache"
version = "0.19.4" version = "0.19.6"
dependencies = [ dependencies = [
"lru", "lru",
"oxide_bytecode", "oxide_bytecode",
@@ -1237,7 +1237,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_compiler" name = "oxide_compiler"
version = "0.19.4" version = "0.19.6"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_cfg", "oxide_cfg",
@@ -1258,7 +1258,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_dce" name = "oxide_dce"
version = "0.19.4" version = "0.19.6"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_cfg", "oxide_cfg",
@@ -1272,7 +1272,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_emit" name = "oxide_emit"
version = "0.19.4" version = "0.19.6"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"oxc_allocator", "oxc_allocator",
@@ -1288,7 +1288,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_engine" name = "oxide_engine"
version = "0.19.4" version = "0.19.6"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_compiler", "oxide_compiler",
@@ -1300,7 +1300,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_fold" name = "oxide_fold"
version = "0.19.4" version = "0.19.6"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"oxide_bytecode", "oxide_bytecode",
@@ -1312,7 +1312,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_ir" name = "oxide_ir"
version = "0.19.4" version = "0.19.6"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_log", "oxide_log",
@@ -1321,7 +1321,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_kernel" name = "oxide_kernel"
version = "0.19.4" version = "0.19.6"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"dashmap", "dashmap",
@@ -1335,7 +1335,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_liveness" name = "oxide_liveness"
version = "0.19.4" version = "0.19.6"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_cfg", "oxide_cfg",
@@ -1347,7 +1347,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_log" name = "oxide_log"
version = "0.19.4" version = "0.19.6"
dependencies = [ dependencies = [
"tracing", "tracing",
"tracing-appender", "tracing-appender",
@@ -1356,11 +1356,11 @@ dependencies = [
[[package]] [[package]]
name = "oxide_net" name = "oxide_net"
version = "0.19.4" version = "0.19.6"
[[package]] [[package]]
name = "oxide_parser" name = "oxide_parser"
version = "0.19.4" version = "0.19.6"
dependencies = [ dependencies = [
"oxc_allocator", "oxc_allocator",
"oxc_ast", "oxc_ast",
@@ -1375,7 +1375,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_regalloc" name = "oxide_regalloc"
version = "0.19.4" version = "0.19.6"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_cfg", "oxide_cfg",
@@ -1391,7 +1391,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_runtime_api" name = "oxide_runtime_api"
version = "0.19.4" version = "0.19.6"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"num-traits", "num-traits",
@@ -1404,7 +1404,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_test262" name = "oxide_test262"
version = "0.19.4" version = "0.19.6"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_compiler", "oxide_compiler",
@@ -1424,7 +1424,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_types" name = "oxide_types"
version = "0.19.4" version = "0.19.6"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"dashmap", "dashmap",
@@ -1437,7 +1437,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_vm" name = "oxide_vm"
version = "0.19.4" version = "0.19.6"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"chrono", "chrono",
+1 -1
View File
@@ -25,7 +25,7 @@ members = [
] ]
[workspace.package] [workspace.package]
version = "0.19.5" version = "0.19.6"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"
rust-version = "1.80" rust-version = "1.80"
+3 -3
View File
@@ -416,9 +416,9 @@ impl Vm {
Ok(_) => return Ok(()), Ok(_) => return Ok(()),
Err(e) => return self.raise_call_error(&e).map(|_| ()), Err(e) => return self.raise_call_error(&e).map(|_| ()),
}; };
// 仅 undefined 视为无 handler;null 非 undefined,须调用,Call(null) 抛 // GetMethod 语义:null 与 undefined 均归一化为无 handler,走 prototype
// TypeError。handler 在场须可调用;调用异常原值上抛(外围 try/catch 可捕获)。 // 分支。handler 在场须可调用;调用异常原值上抛(外围 try/catch 可捕获)。
if !has_instance_val.is_undefined() { if !has_instance_val.is_undefined() && !has_instance_val.is_null() {
if !is_callable(has_instance_val) { if !is_callable(has_instance_val) {
return self.raise_type_error("instanceof: @@hasInstance handler is not callable"); return self.raise_type_error("instanceof: @@hasInstance handler is not callable");
} }
@@ -195,15 +195,17 @@ fn has_instance_non_callable_handler_throws() {
} }
#[test] #[test]
fn has_instance_null_handler_throws_type_error() { fn has_instance_null_handler_returns_false() {
let mut vm = Vm::new(); let mut vm = Vm::new();
// null 非 undefined,规范仍须调用 handler,Call(null) 抛 TypeError。 // GetMethod 将 null handler 归一化为无 handler,走 prototype 分支:
// D.prototype 不在 ({}) 原型链上,返 false 不抛。
let source = r#" let source = r#"
class D {} class D {}
D[Symbol.hasInstance] = null; D[Symbol.hasInstance] = null;
var threw = false; var threw = false;
try { ({} ) instanceof D; } catch (e) { threw = e instanceof TypeError; } var result = false;
threw try { result = ({} ) instanceof D; } catch (e) { threw = true; }
threw === false && result === false
"#; "#;
let result = eval(&mut vm, source).unwrap(); let result = eval(&mut vm, source).unwrap();
assert!(result.as_bool()); assert!(result.as_bool());