Move getI64Pair to wasm::Types

src/wasm-type.h

@@ -645,9 +645,15 @@ constexpr HeapType noexn = HeapType::noexn;
 HeapType getMutI8Array();
 HeapType getMutI16Array();
 
+} // namespace HeapTypes
+
+namespace Types {
+
+// Certain Types are used by standard operations. Provide central accessors
+// for them to avoid having to build them everywhere they are used.
 Type getI64Pair();
 
-} // namespace HeapTypes
+} // namespace Types
 
 // A recursion group consisting of one or more HeapTypes. HeapTypes with single
 // members are encoded without using any additional memory, which is why

src/wasm/wasm-type.cpp

@@ -2834,9 +2834,7 @@ std::unordered_set<HeapType> getIgnorablePublicTypes() {
   return set;
 }
 
-} // namespace wasm
-
-namespace wasm::HeapTypes {
+namespace HeapTypes {
 
 HeapType getMutI8Array() {
   static HeapType i8Array = Array(Field(Field::i8, Mutable));
@@ -2848,12 +2846,18 @@ HeapType getMutI16Array() {
   return i16Array;
 }
 
+} // namespace HeapTypes
+
+namespace Types {
+
 Type getI64Pair() {
   static Type i64Pair({Type::i64, Type::i64});
   return i64Pair;
 }
 
-} // namespace wasm::HeapTypes
+} // namespace Types
+
+} // namespace wasm
 
 namespace std {
 

src/wasm/wasm.cpp

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