Backed out 3 changesets (bug 1774827) for causing SM bustages.

Backed out changeset 129877d9c8c8 (bug 1774827) Backed out changeset 1977aeb86c32 (bug 1774827) Backed out changeset e1c6eb1e9f4f (bug 1774827)
dothq · Nov 3, 2022 · 445a633 · 445a633
1 parent 90d73ef
commit 445a633
Show file tree

Hide file tree

Showing 26 changed files with 884 additions and 1,160 deletions.
diff --git a/js/public/RefCounted.h b/js/public/RefCounted.h
@@ -82,11 +82,6 @@ class AtomicRefCounted {
     }
   }
 
-  bool hasOneRef() const {
-    MOZ_ASSERT(mRefCnt > 0);
-    return mRefCnt == 1;
-  }
-
  private:
   mutable mozilla::Atomic<MozRefCountType> mRefCnt{0};
 };

diff --git a/js/src/gc/GCEnum.h b/js/src/gc/GCEnum.h
@@ -129,6 +129,7 @@ enum class GCAbortReason {
   _(WasmTableTable)                        \
   _(WasmExceptionData)                     \
   _(WasmTagType)                           \
+  _(WasmRttValueChildren)                  \
   _(FileObjectFile)                        \
   _(Debugger)                              \
   _(DebuggerFrameGeneratorInfo)            \

diff --git a/js/src/jit-test/tests/wasm/gc/br-on-cast.js b/js/src/jit-test/tests/wasm/gc/br-on-cast.js
@@ -52,7 +52,7 @@ invalidTyping('(type $a (struct))', '$a', ['i32', 'f32', 'eqref'], ['f32', 'i32'
 {
   let { makeA, makeB, isA, isB } = wasmEvalText(`(module
     (type $a (struct))
-    (sub $a (type $b (struct (field i32))))
+    (type $b (struct (field i32)))
 
     (func (export "makeA") (result eqref)
       struct.new_default $a
@@ -91,7 +91,7 @@ invalidTyping('(type $a (struct))', '$a', ['i32', 'f32', 'eqref'], ['f32', 'i32'
   let b = makeB();
 
   assertEq(isA(a), 1);
-  assertEq(isA(b), 1);
+  assertEq(isA(b), 0);
   assertEq(isB(a), 0);
   assertEq(isB(b), 1);
 }

diff --git a/js/src/jit-test/tests/wasm/gc/ref-struct.js b/js/src/jit-test/tests/wasm/gc/ref-struct.js
@@ -117,7 +117,7 @@ function checkInvalid(body, errorMessage) {
 wasmEvalText(
     `(module
       (type $node (struct (field (mut (ref null $node)))))
-      (sub $node (type $nix (struct (field (mut (ref null $node))) (field i32))))
+      (type $nix (struct (field (mut (ref null $node))) (field i32)))
       (func $f (param $p (ref null $node)) (param $q (ref null $nix))
        (struct.set $node 0 (local.get $p) (local.get $q))))`);
 
@@ -139,7 +139,7 @@ assertErrorMessage(() => wasmEvalText(
 assertEq(wasmEvalText(
     `(module
       (type $node (struct (field i32)))
-      (sub $node (type $node2 (struct (field i32) (field f32))))
+      (type $node2 (struct (field i32) (field f32)))
       (func $f (param $p (ref null $node)) (result (ref null $node2))
        (ref.cast $node2 (local.get $p)))
       (func (export "test") (result i32)
@@ -153,7 +153,7 @@ assertEq(wasmEvalText(
 assertEq(wasmEvalText(
     `(module
       (type $node (struct (field (mut i32))))
-      (sub $node (type $node2 (struct (field (mut i32)) (field f32))))
+      (type $node2 (struct (field (mut i32)) (field f32)))
       (func $f (param $p (ref null $node)) (result (ref null $node2))
        (ref.cast $node2 (local.get $p)))
       (func (export "test") (result i32)

diff --git a/js/src/jit-test/tests/wasm/gc/ref.js b/js/src/jit-test/tests/wasm/gc/ref.js
@@ -3,19 +3,17 @@
 // Parsing and resolving.
 
 var text = `(module
-      (rec
-        (type $cons (struct
-                     (field $car i32)
-                     (field $cdr (ref null $cons))))
-
-        (type $odd (struct
-                    (field $odd.x i32)
-                    (field $to_even (ref null $even))))
-
-        (type $even (struct
-                     (field $even.x i32)
-                     (field $to_odd (ref null $odd))))
-      )
+      (type $cons (struct
+                   (field $car i32)
+                   (field $cdr (ref null $cons))))
+
+      (type $odd (struct
+                  (field $odd.x i32)
+                  (field $to_even (ref null $even))))
+
+      (type $even (struct
+                   (field $even.x i32)
+                   (field $to_odd (ref null $odd))))
 
       ;; Use eqref on the API since struct types cannot be exposed outside the module yet.
 

diff --git a/js/src/jit-test/tests/wasm/gc/regress-outline-repr.js b/js/src/jit-test/tests/wasm/gc/regress-outline-repr.js
@@ -7,8 +7,7 @@
 
 const wat = `
 (module
-  (type $S2 (struct))
-  (sub $S2 (type $S
+  (type $S
     (struct
       (field (mut i64))
       (field (mut i64))
@@ -28,7 +27,8 @@ const wat = `
       (field (mut i64))
       (field (mut i64))
       (field (mut i64))
-      (field (mut eqref)))))
+      (field (mut eqref))))
+  (type $S2 (struct))
 
   (func $main
     (struct.set $S 18
@@ -61,16 +61,13 @@ wasmEvalText(wat);
 
 wasmEvalText(`
 (module
-  (type $inline
+  (type $outline
     (struct
       (field (mut i64))
       (field (mut i64))
       (field (mut i64))
       (field (mut i64))
       (field (mut i64))
-    ))
-  (sub $inline (type $outline
-    (struct
       (field (mut i64))
       (field (mut i64))
       (field (mut i64))
@@ -84,13 +81,16 @@ wasmEvalText(`
       (field (mut i64))
       (field (mut i64))
       (field (mut i64))
+      (field (mut i64))))
+  (type $inline
+    (struct
       (field (mut i64))
       (field (mut i64))
       (field (mut i64))
       (field (mut i64))
       (field (mut i64))
-      (field (mut i64)))))
-  
+    ))
+
   (func $main
     (local $outline (ref null $outline))
     (local $inline (ref null $inline))