[wasm] Fix CanonicalEquality::EqualValueType

jakobkummerow · V8 LUCI CQ · commit a970eed8995b · 2025-06-05T07:09:22.000-07:00
For indexed types, the non-index bits also need to be equal. Fixed: 422313191 Change-Id: I09489081cca4953aff0d642721376f24cf40bda5 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6621628 Reviewed-by: Matthias Liedtke <mliedtke@chromium.org> Commit-Queue: Matthias Liedtke <mliedtke@chromium.org> Auto-Submit: Jakob Kummerow <jkummerow@chromium.org> Cr-Commit-Position: refs/heads/main@{#100693}
diff --git a/src/wasm/canonical-types.h b/src/wasm/canonical-types.h
@@ -359,7 +359,8 @@ class TypeCanonicalizer {
       const bool indexed = type1.has_index();
       if (indexed != type2.has_index()) return false;
       if (indexed) {
-        return EqualTypeIndex(type1.ref_index(), type2.ref_index());
+        return type1.is_equal_except_index(type2) &&
+               EqualTypeIndex(type1.ref_index(), type2.ref_index());
       }
       return type1 == type2;
     }
diff --git a/src/wasm/value-type.h b/src/wasm/value-type.h
@@ -1068,6 +1068,10 @@ class CanonicalValueType : public ValueTypeBase {
     return bit_field_ == other.bit_field_;
   }
 
+  constexpr bool is_equal_except_index(CanonicalValueType other) const {
+    return (bit_field_ & ~kIndexBits) == (other.bit_field_ & ~kIndexBits);
+  }
+
   constexpr bool IsFunctionType() const {
     return ref_type_kind() == RefTypeKind::kFunction;
   }

Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,8 @@ class TypeCanonicalizer {`
`359`	`359`	`const bool indexed = type1.has_index();`
`360`	`360`	`if (indexed != type2.has_index()) return false;`
`361`	`361`	`if (indexed) {`
`362`		`- return EqualTypeIndex(type1.ref_index(), type2.ref_index());`
	`362`	`+ return type1.is_equal_except_index(type2) &&`
	`363`	`+ EqualTypeIndex(type1.ref_index(), type2.ref_index());`
`363`	`364`	`}`
`364`	`365`	`return type1 == type2;`
`365`	`366`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1068,6 +1068,10 @@ class CanonicalValueType : public ValueTypeBase {`
`1068`	`1068`	`return bit_field_ == other.bit_field_;`
`1069`	`1069`	`}`
`1070`	`1070`
	`1071`	`+ constexpr bool is_equal_except_index(CanonicalValueType other) const {`
	`1072`	`+ return (bit_field_ & ~kIndexBits) == (other.bit_field_ & ~kIndexBits);`
	`1073`	`+ }`
	`1074`	`+`
`1071`	`1075`	`constexpr bool IsFunctionType() const {`
`1072`	`1076`	`return ref_type_kind() == RefTypeKind::kFunction;`
`1073`	`1077`	`}`