Remove redundant ptrType from MemorySize/Grow instructions. NFC

src/passes/Memory64Lowering.cpp

@@ -70,7 +70,7 @@ struct Memory64Lowering : public WalkerPass<PostWalker<Memory64Lowering>> {
     if (memory->is64()) {
       auto size = static_cast<Expression*>(curr);
       extendAddress64(size, curr->memory);
-      curr->ptrType = Type::i32;
+      curr->type = Type::i32;
       replaceCurrent(size);
     }
   }
@@ -82,7 +82,7 @@ struct Memory64Lowering : public WalkerPass<PostWalker<Memory64Lowering>> {
       wrapAddress64(curr->delta, curr->memory);
       auto size = static_cast<Expression*>(curr);
       extendAddress64(size, curr->memory);
-      curr->ptrType = Type::i32;
+      curr->type = Type::i32;
       replaceCurrent(size);
     }
   }

src/wasm-builder.h

@@ -666,7 +666,7 @@ class Builder {
                              MemoryInfo info = MemoryInfo::Unspecified) {
     auto* ret = wasm.allocator.alloc<MemorySize>();
     if (isMemory64(memoryName, info)) {
-      ret->make64();
+      ret->type = Type::i64;
     }
     ret->memory = memoryName;
     ret->finalize();
@@ -677,7 +677,7 @@ class Builder {
                              MemoryInfo info = MemoryInfo::Unspecified) {
     auto* ret = wasm.allocator.alloc<MemoryGrow>();
     if (isMemory64(memoryName, info)) {
-      ret->make64();
+      ret->type = Type::i64;
     }
     ret->delta = delta;
     ret->memory = memoryName;

src/wasm-delegations-fields.def

@@ -485,12 +485,10 @@ DELEGATE_FIELD_OPTIONAL_CHILD(Return, value)
 DELEGATE_FIELD_CASE_END(Return)
 
 DELEGATE_FIELD_CASE_START(MemorySize)
-DELEGATE_FIELD_TYPE(MemorySize, ptrType)
 DELEGATE_FIELD_NAME_KIND(MemorySize, memory, ModuleItemKind::Memory)
 DELEGATE_FIELD_CASE_END(MemorySize)
 
 DELEGATE_FIELD_CASE_START(MemoryGrow)
-DELEGATE_FIELD_TYPE(MemoryGrow, ptrType)
 DELEGATE_FIELD_CHILD(MemoryGrow, delta)
 DELEGATE_FIELD_NAME_KIND(MemoryGrow, memory, ModuleItemKind::Memory)
 DELEGATE_FIELD_CASE_END(MemoryGrow)

src/wasm.h

@@ -1305,10 +1305,8 @@ class MemorySize : public SpecificExpression<Expression::MemorySizeId> {
   MemorySize() { type = Type::i32; }
   MemorySize(MixedArena& allocator) : MemorySize() {}
 
-  Type ptrType = Type::i32;
   Name memory;
 
-  void make64();
   void finalize();
 };
 
@@ -1318,10 +1316,8 @@ class MemoryGrow : public SpecificExpression<Expression::MemoryGrowId> {
   MemoryGrow(MixedArena& allocator) : MemoryGrow() {}
 
   Expression* delta = nullptr;
-  Type ptrType = Type::i32;
   Name memory;
 
-  void make64();
   void finalize();
 };
 

src/wasm/wasm-binary.cpp

@@ -6882,7 +6882,7 @@ void WasmBinaryReader::visitMemorySize(MemorySize* curr) {
   BYN_TRACE("zz node: MemorySize\n");
   Index index = getU32LEB();
   if (getMemory(index)->is64()) {
-    curr->make64();
+    curr->type = Type::i64;
   }
   curr->finalize();
   memoryRefs[index].push_back(&curr->memory);
@@ -6893,7 +6893,7 @@ void WasmBinaryReader::visitMemoryGrow(MemoryGrow* curr) {
   curr->delta = popNonVoidExpression();
   Index index = getU32LEB();
   if (getMemory(index)->is64()) {
-    curr->make64();
+    curr->type = Type::i64;
   }
   memoryRefs[index].push_back(&curr->memory);
 }

src/wasm/wasm-s-parser.cpp

@@ -1533,7 +1533,7 @@ Expression* SExpressionWasmBuilder::makeMemorySize(Element& s) {
   }
   ret->memory = memory;
   if (isMemory64(memory)) {
-    ret->make64();
+    ret->type = Type::i64;
   }
   ret->finalize();
   return ret;
@@ -1550,7 +1550,7 @@ Expression* SExpressionWasmBuilder::makeMemoryGrow(Element& s) {
   }
   ret->memory = memory;
   if (isMemory64(memory)) {
-    ret->make64();
+    ret->type = Type::i64;
   }
   ret->delta = parseExpression(s[i]);
   ret->finalize();

src/wasm/wasm.cpp

@@ -789,15 +789,11 @@ void Drop::finalize() {
   }
 }
 
-void MemorySize::make64() { type = ptrType = Type::i64; }
-void MemorySize::finalize() { type = ptrType; }
+void MemorySize::finalize() {}
 
-void MemoryGrow::make64() { type = ptrType = Type::i64; }
 void MemoryGrow::finalize() {
   if (delta->type == Type::unreachable) {
     type = Type::unreachable;
-  } else {
-    type = ptrType;
   }
 }
 

test/binaryen.js/expressions.js

@@ -482,11 +482,7 @@ console.log("# MemorySize");
   assert(theMemorySize instanceof binaryen.MemorySize);
   assert(theMemorySize instanceof binaryen.Expression);
   assert(theMemorySize.type === type);
-
-  theMemorySize.type = type = binaryen.f64;
-  assert(theMemorySize.type === type);
   theMemorySize.finalize();
-  assert(theMemorySize.type === binaryen.i32);
 
   console.log(theMemorySize.toText());
   assert(
@@ -513,10 +509,7 @@ console.log("# MemoryGrow");
 
   theMemoryGrow.delta = delta = module.i32.const(2);
   assert(theMemoryGrow.delta === delta);
-  theMemoryGrow.type = type = binaryen.f64;
-  assert(theMemoryGrow.type === type);
   theMemoryGrow.finalize();
-  assert(theMemoryGrow.type === binaryen.i32);
 
   console.log(theMemoryGrow.toText());
   assert(