PR updates

Author: stevenfontanella

src/wasm-delegations-fields.def

@@ -933,10 +933,10 @@ DELEGATE_FIELD_CASE_END(StructNotify)
 
 DELEGATE_FIELD_CASE_START(WideIntAddSub)
 DELEGATE_FIELD_INT(WideIntAddSub, op)
-DELEGATE_FIELD_CHILD(WideIntAddSub, leftLow)
-DELEGATE_FIELD_CHILD(WideIntAddSub, leftHigh)
-DELEGATE_FIELD_CHILD(WideIntAddSub, rightLow)
 DELEGATE_FIELD_CHILD(WideIntAddSub, rightHigh)
+DELEGATE_FIELD_CHILD(WideIntAddSub, rightLow)
+DELEGATE_FIELD_CHILD(WideIntAddSub, leftHigh)
+DELEGATE_FIELD_CHILD(WideIntAddSub, leftLow)
 DELEGATE_FIELD_CASE_END(WideIntAddSub)
 
 DELEGATE_FIELD_MAIN_END

src/wasm-type.h

@@ -581,14 +581,18 @@ class Type {
   };
 
   Iterator begin() const { return Iterator{{this, 0}}; }
-  Iterator end() const { return Iterator{{this, size()}}; }
+  Iterator end() const {
+    return Iterator{{this, size()}};
+  }
   std::reverse_iterator<Iterator> rbegin() const {
     return std::make_reverse_iterator(end());
   }
   std::reverse_iterator<Iterator> rend() const {
     return std::make_reverse_iterator(begin());
   }
-  const Type& operator[](size_t i) const { return *Iterator{{this, i}}; }
+  const Type& operator[](size_t i) const {
+    return *Iterator{{this, i}};
+  }
 };
 
 Type Type::asWrittenGivenFeatures(FeatureSet feats) const {
@@ -645,6 +649,8 @@ constexpr HeapType noexn = HeapType::noexn;
 HeapType getMutI8Array();
 HeapType getMutI16Array();
 
+Type getI64Pair();
+
 } // namespace HeapTypes
 
 // A recursion group consisting of one or more HeapTypes. HeapTypes with single
@@ -669,8 +675,12 @@ class RecGroup {
   };
 
   Iterator begin() const { return Iterator{{this, 0}}; }
-  Iterator end() const { return Iterator{{this, size()}}; }
-  HeapType operator[](size_t i) const { return *Iterator{{this, i}}; }
+  Iterator end() const {
+    return Iterator{{this, size()}};
+  }
+  HeapType operator[](size_t i) const {
+    return *Iterator{{this, i}};
+  }
 };
 
 struct Signature {

src/wasm/wasm-type.cpp

@@ -2848,6 +2848,11 @@ HeapType getMutI16Array() {
   return i16Array;
 }
 
+Type getI64Pair() {
+  static Type i64Pair({Type::i64, Type::i64});
+  return i64Pair;
+}
+
 } // namespace wasm::HeapTypes
 
 namespace std {

src/wasm/wasm-validator.cpp

@@ -2453,7 +2453,7 @@ void FunctionValidator::visitWideIntAddSub(WideIntAddSub* curr) {
   for (auto* operand :
        {curr->leftLow, curr->leftHigh, curr->rightLow, curr->rightHigh}) {
     shouldBeEqualOrFirstIsUnreachable(operand->type,
-                                      Type(Type::BasicType::i64),
+                                      Type(Type::i64),
                                       curr,
                                       "wide binary child types must be i64");
   }

src/wasm/wasm.cpp

@@ -808,7 +808,8 @@ void WideIntAddSub::finalize() {
       rightHigh->type == Type::unreachable) {
     type = Type::unreachable;
   } else {
-    type = Type({Type::i64, Type::i64});
+    static Type i64Pair = HeapTypes::getI64Pair();
+    type = i64Pair;
   }
 }