Emit imports before defined things in text format (#1715)

That is the correct order in the text format, wabt errors otherwise.

See AssemblyScript/assemblyscript#310

Author: kripken

src/ir/module-utils.h

@@ -128,7 +128,35 @@ inline void copyModule(Module& in, Module& out) {
   out.debugInfoFileNames = in.debugInfoFileNames;
 }
 
-// Convenient iteration over imported/non-imported functions/globals
+// Convenient iteration over imported/non-imported module elements
+
+template<typename T>
+inline void iterImportedMemories(Module& wasm, T visitor) {
+  if (wasm.memory.exists && wasm.memory.imported()) {
+    visitor(&wasm.memory);
+  }
+}
+
+template<typename T>
+inline void iterDefinedMemories(Module& wasm, T visitor) {
+  if (wasm.memory.exists && !wasm.memory.imported()) {
+    visitor(&wasm.memory);
+  }
+}
+
+template<typename T>
+inline void iterImportedTables(Module& wasm, T visitor) {
+  if (wasm.table.exists && wasm.table.imported()) {
+    visitor(&wasm.table);
+  }
+}
+
+template<typename T>
+inline void iterDefinedTables(Module& wasm, T visitor) {
+  if (wasm.table.exists && !wasm.table.imported()) {
+    visitor(&wasm.table);
+  }
+}
 
 template<typename T>
 inline void iterImportedGlobals(Module& wasm, T visitor) {

src/passes/Print.cpp

@@ -957,6 +957,7 @@ struct PrintSExpression : public Visitor<PrintSExpression> {
   void printTableHeader(Table* curr) {
     o << '(';
     printMedium(o, "table") << ' ';
+    printName(curr->name, o) << ' ';
     o << curr->initial;
     if (curr->hasMax()) o << ' ' << curr->max;
     o << " anyfunc)";
@@ -1056,16 +1057,24 @@ struct PrintSExpression : public Visitor<PrintSExpression> {
       visitFunctionType(child.get());
       o << ")" << maybeNewLine;
     }
-    visitMemory(&curr->memory);
-    if (curr->table.exists) {
-      visitTable(&curr->table); // Prints its own newlines
-    }
+    ModuleUtils::iterImportedMemories(*curr, [&](Memory* memory) {
+      visitMemory(memory);
+    });
+    ModuleUtils::iterImportedTables(*curr, [&](Table* table) {
+      visitTable(table);
+    });
     ModuleUtils::iterImportedGlobals(*curr, [&](Global* global) {
       visitGlobal(global);
     });
     ModuleUtils::iterImportedFunctions(*curr, [&](Function* func) {
       visitFunction(func);
     });
+    ModuleUtils::iterDefinedMemories(*curr, [&](Memory* memory) {
+      visitMemory(memory);
+    });
+    ModuleUtils::iterDefinedTables(*curr, [&](Table* table) {
+      visitTable(table);
+    });
     ModuleUtils::iterDefinedGlobals(*curr, [&](Global* global) {
       visitGlobal(global);
     });

test/bad_params.fromasm.clamp.no-opts

@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (export "ex" (func $ex))

test/bad_params.fromasm.imprecise.no-opts

@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (export "ex" (func $ex))

test/bad_params.fromasm.no-opts

@@ -1,6 +1,6 @@
 (module
  (import "env" "memory" (memory $memory 256 256))
- (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "table" (table $table 0 0 anyfunc))
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (export "ex" (func $ex))

test/badvartype.wasm.fromBinary

@@ -10,7 +10,7 @@
  (type $8 (func (param f64) (result f64)))
  (memory $0 (shared 1 1))
  (data (i32.const 0) "\00\00\00\00\00\00\00\00X\00\00\00U\00\00\0b\00\00\00\00\00\00\00k\00\00")
- (table 2 anyfunc)
+ (table $0 2 anyfunc)
  (elem (i32.const 0) $1 $5)
  (global $global$0 (mut i32) (i32.const 255))
  (global $global$1 (mut i32) (i32.const -7045592))

test/binaryen.js/kitchen-sink.js.txt

@@ -46,11 +46,11 @@ getExpressionInfo(f64.const)={"id":14,"type":4,"value":9.5}
  (type $fiF (func (param i32 f64) (result f32)))
  (type $v (func))
  (type $3 (func))
+ (import "module" "base" (func $an-imported (param i32 f64) (result f32)))
  (memory $0 1 256)
  (data (i32.const 10) "hello, world")
- (table 1 anyfunc)
+ (table $0 1 anyfunc)
  (elem (i32.const 0) "$kitchen()sinker")
- (import "module" "base" (func $an-imported (param i32 f64) (result f32)))
  (export "kitchen_sinker" (func "$kitchen()sinker"))
  (export "mem" (memory $0))
  (start $starter)
@@ -1502,11 +1502,11 @@ getExpressionInfo(f64.const)={"id":14,"type":4,"value":9.5}
  (type $fiF (func (param i32 f64) (result f32)))
  (type $v (func))
  (type $3 (func))
+ (import "module" "base" (func $an-imported (param i32 f64) (result f32)))
  (memory $0 1 256)
  (data (i32.const 10) "hello, world")
- (table 1 anyfunc)
+ (table $0 1 anyfunc)
  (elem (i32.const 0) "$kitchen()sinker")
- (import "module" "base" (func $an-imported (param i32 f64) (result f32)))
  (export "kitchen_sinker" (func "$kitchen()sinker"))
  (export "mem" (memory $0))
  (start $starter)

test/ctor-eval/bad-indirect-call.wast.out

@@ -2,7 +2,7 @@
  (type $v (func))
  (memory $0 256 256)
  (data (i32.const 10) "waka waka waka waka waka")
- (table 1 1 anyfunc)
+ (table $0 1 1 anyfunc)
  (elem (i32.const 0) $call-indirect)
  (export "test1" (func $test1))
  (func $test1 (; 0 ;) (type $v)

test/ctor-eval/bad-indirect-call2.wast.out

@@ -1,10 +1,10 @@
 (module
  (type $FUNCSIG$v (func))
+ (import "env" "_abort" (func $_abort))
  (memory $0 256 256)
  (data (i32.const 10) "waka waka waka waka waka")
- (table 2 2 anyfunc)
+ (table $0 2 2 anyfunc)
  (elem (i32.const 0) $_abort $call-indirect)
- (import "env" "_abort" (func $_abort))
  (export "test1" (func $test1))
  (func $test1 (; 1 ;) (type $FUNCSIG$v)
   (call_indirect (type $FUNCSIG$v)

test/ctor-eval/indirect-call3.wast.out

@@ -1,9 +1,9 @@
 (module
  (type $FUNCSIG$v (func))
- (memory $0 256 256)
- (data (i32.const 10) "waka waka xaka waka waka\00\00\00\00\00\00C")
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "_abort" (func $_abort))
+ (memory $0 256 256)
+ (data (i32.const 10) "waka waka xaka waka waka\00\00\00\00\00\00C")
  (func $call-indirect (; 1 ;) (type $FUNCSIG$v)
   (i32.store8
    (i32.const 40)