wip

Author: stevenfontanella

src/passes/Print.cpp

@@ -3940,4 +3940,10 @@ std::ostream& operator<<(std::ostream& o, wasm::ModuleHeapType pair) {
   return o << "(unnamed)";
 }
 
+std::ostream& operator<<(std::ostream& o, wasm::Memory& memory) {
+  wasm::PrintSExpression printer(o);
+  printer.visitMemory(&memory);
+  return o;
+}
+
 } // namespace std

src/wasm-interpreter.h

@@ -3275,7 +3275,8 @@ class ModuleRunnerBase : public ExpressionRunner<SubType> {
   };
 
   // Trap if types don't match between all imports and their corresponding
-  // exports. Imported memories must also be a subtype of their export.
+  // exports. Imported memories and tables must also be a subtype of their
+  // export.
   void validateImports() {
     ModuleUtils::iterImportable(
       wasm,
@@ -3311,7 +3312,10 @@ class ModuleRunnerBase : public ExpressionRunner<SubType> {
           Memory* exportedMemory =
             importedInstance->wasm.getMemory(*export_->getInternalName());
           if (!(*memory)->isSubType(*exportedMemory)) {
-            trap("Imported memory isn't compatible");
+            trap((std::stringstream()
+                  << "Imported memory isn't compatible. Imported memory: "
+                  << **memory << ". Exported memory: " << *exportedMemory)
+                   .str());
           }
         }
 

src/wasm.h

@@ -2692,6 +2692,7 @@ std::ostream& operator<<(std::ostream& o, wasm::ModuleExpression pair);
 std::ostream& operator<<(std::ostream& o, wasm::ShallowExpression expression);
 std::ostream& operator<<(std::ostream& o, wasm::ModuleType pair);
 std::ostream& operator<<(std::ostream& o, wasm::ModuleHeapType pair);
+std::ostream& operator<<(std::ostream& o, wasm::Memory& memory);
 
 } // namespace std