Revert "[threads] Allow i31refs of mixed shareability to compare equal (#6752)" (#6761)

Allowing Literals with different types to compare equal causes problems
for passes that want equality to mean real equality, e.g. because they
are using literals as map keys or because they otherwise need to use
them interchangeably.

At a minimum, we would need to differentiate a `refEq` operation where
mixed-shareability i31refs can compare equal from physical equality on
Literals, but there is also appetite to disallow mixed-shareability
ref.eq at the spec level. See
https://github.com/WebAssembly/shared-everything-threads/issues/76.

1 files changed, 3 insertions, 9 deletions

diff --git a/src/wasm/literal.cpp b/src/wasm/literal.cpp
index 300fc3773..20b6b7234 100644
--- a/src/wasm/literal.cpp
+++ b/src/wasm/literal.cpp
@@ -412,14 +412,6 @@ void Literal::getBits(uint8_t (&buf)[16]) const {
 }
 
 bool Literal::operator==(const Literal& other) const {
-  // As a special case, shared and unshared i31 can compare equal even if their
-  // types are different (because one is shared and the other is not).
-  if (type.isRef() && other.type.isRef() && type.getHeapType().isBasic() &&
-      other.type.getHeapType().isBasic() &&
-      type.getHeapType().getBasic(Unshared) == HeapType::i31 &&
-      other.type.getHeapType().getBasic(Unshared) == HeapType::i31) {
-    return i32 == other.i32;
-  }
   if (type != other.type) {
     return false;
   }
@@ -453,7 +445,9 @@ bool Literal::operator==(const Literal& other) const {
     if (type.isData()) {
       return gcData == other.gcData;
     }
-    // i31 already handled.
+    if (type.getHeapType() == HeapType::i31) {
+      return i32 == other.i32;
+    }
     WASM_UNREACHABLE("unexpected type");
   }
   WASM_UNREACHABLE("unexpected type");