[WebAssembly] Add test for imported ctor and fix indexing bug found

This bug was found by accident while trying to expand out testcases
for imported symbols, and is covered by the additional test case.

Differential Revision: https://reviews.llvm.org/D44331

llvm-svn: 327290

1 files changed, 2 insertions, 3 deletions

diff --git a/lld/wasm/Writer.cpp b/lld/wasm/Writer.cpp
index dc2210b1146..b5eafe5abdd 100644
--- a/lld/wasm/Writer.cpp
+++ b/lld/wasm/Writer.cpp
@@ -657,12 +657,11 @@ void Writer::calculateImports() {
       continue;
 
     DEBUG(dbgs() << "import: " << Sym->getName() << "\n");
-    Sym->setOutputIndex(ImportedSymbols.size());
     ImportedSymbols.emplace_back(Sym);
     if (isa<FunctionSymbol>(Sym))
-      ++NumImportedFunctions;
+      Sym->setOutputIndex(NumImportedFunctions++);
     else
-      ++NumImportedGlobals;
+      Sym->setOutputIndex(NumImportedGlobals++);
   }
 }