From 31d3f59d2b6a5660f47cb0d1ac1e1ff3f2279e0a Mon Sep 17 00:00:00 2001 From: pjh456 <147148383@qq.com> Date: Thu, 10 Sep 2026 06:42:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20runner=20not-defined=20subkey=20?= =?UTF-8?q?=E5=89=A5=20vm=20error:=20=E7=94=9F=E4=BA=A7=E5=89=8D=E7=BC=80?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=A0=87=E8=AF=86=E7=AC=A6=E6=8F=90=E5=8F=96?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E5=89=8D=E7=BC=80=E5=85=9C=E5=BA=95=E6=94=B9?= =?UTF-8?q?=E5=BD=A2=E6=80=81=E9=97=A8=E9=98=B2=20negative=20mismatch=20?= =?UTF-8?q?=E6=BC=82=E5=85=A5=20not-defined=20=E6=A1=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crates/oxide_test262/src/main.rs | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/crates/oxide_test262/src/main.rs b/crates/oxide_test262/src/main.rs index ee342eb9..be0ae0b4 100644 --- a/crates/oxide_test262/src/main.rs +++ b/crates/oxide_test262/src/main.rs @@ -789,9 +789,11 @@ fn judge_vm_error(path: &Path, e: &str, meta: &TestMeta, dur: u64, no_skip: bool /// /// # 边界与前提 /// - 运行期形态：`uncaught ReferenceError: {name} is not defined` +/// （可带 `vm error: ` 前缀，即 runner Fail 消息的生产形态） /// - 编译期形态：`Identifier '{name}' is not defined`（可带 `compile error: ` 前缀） /// - 两种形态都不匹配返回 `None`（不属未绑定标识符错误）。 fn parse_undefined_ident(e: &str) -> Option<&str> { + let e = e.strip_prefix("vm error: ").unwrap_or(e); let e = e.strip_prefix("compile error: ").unwrap_or(e); let e = e.strip_prefix("uncaught ").unwrap_or(e); if let Some(rest) = e.strip_prefix("ReferenceError: ") { @@ -1526,9 +1528,11 @@ fn categorize_fail(msg: &str) -> (String, String) { ("harness: runtime error".into(), String::new()) } else if msg.contains("expected runtime error") { ("expected runtime error".into(), String::new()) - } else if msg.contains("is not defined") { - // 无前缀形态的未绑定标识符错误兜底（生产路径均带 vm error: 前缀）。 - ("vm: not defined".into(), parse_undefined_ident(msg).unwrap_or("").to_string()) + } else if let Some(ident) = parse_undefined_ident(msg) { + // 无前缀形态的未绑定标识符错误兜底（生产路径均带 vm error: 前缀走 vm 臂）： + // 形态门——parse 出标识符才入 not-defined 桶；negative mismatch 等 + // 解析不出的含 `is not defined` 形态回落 other，不污染 not-defined 计数。 + ("vm: not defined".into(), ident.to_string()) } else { ("other".into(), String::new()) } @@ -1965,11 +1969,15 @@ mod tests { assert_outcome("TypeError: boom", Some(&neg("RangeError")), false, &TestOutcome::Fail("".into())); } - /// `is not defined` 标识符解析：运行期 `uncaught` 前缀、编译期 `Identifier '..'` - /// 两种形态都能取出标识符名；非该形态返回 None。 + /// `is not defined` 标识符解析：运行期 `uncaught` 前缀（含 `vm error: ` + /// 生产前缀）、编译期 `Identifier '..'` 两种形态都能取出标识符名；非该形态返回 None。 #[test] fn parse_undefined_ident_extracts_name() { assert_eq!(parse_undefined_ident("uncaught ReferenceError: $262 is not defined"), Some("$262")); + assert_eq!( + parse_undefined_ident("vm error: uncaught ReferenceError: foo is not defined"), + Some("foo") + ); assert_eq!(parse_undefined_ident("ReferenceError: foo is not defined"), Some("foo")); assert_eq!( parse_undefined_ident("compile error: Identifier 'structuredClone' is not defined"), @@ -2010,17 +2018,24 @@ mod tests { /// categorize_fail 双返回：类别大类名口径不变（碎片桶去消息尾巴）， /// subkey 仅 not callable / not defined 三类非空，IC_GET_PROP 独立成桶。 + /// not defined 覆盖 `vm error: ` 生产形态（subkey 非空）与无前缀裸形态 + /// （形态门：parse 出标识符才入桶）；negative mismatch 形态归 other。 #[test] fn categorize_fail_returns_category_and_subkey() { let cases = [ ("vm error: TypeError: CALL target is not callable", ("vm: not callable", "CALL target")), ("vm error: TypeError: accessor is not callable", ("vm: not callable", "accessor")), ("vm error: TypeError: x is not callable", ("vm: not callable", "x")), + ("vm error: uncaught ReferenceError: foo is not defined", ("vm: not defined", "foo")), ("uncaught ReferenceError: foo is not defined", ("vm: not defined", "foo")), ("compile error: Identifier 'x' is not defined", ("compile: not defined", "x")), ("vm error: IC_GET_PROP on non-object", ("vm: IC_GET_PROP on non-object", "")), ("vm error: TypeError: method called on incompatible receiver", ("vm: other", "")), ("engine panic: boom", ("engine panic", "")), + ( + "expected TypeError error, got: uncaught ReferenceError: foo is not defined", + ("other", ""), + ), ("random string", ("other", "")), ]; for (msg, (want_cat, want_sub)) in cases {