commit a1e299f58b2340a3c452f567626ed4baa62f8818
author Nicholas Wilson <nicholas@nicholaswilson.me.uk> Fri Apr 20 17:18:06 2018 +0000
committer Nicholas Wilson <nicholas@nicholaswilson.me.uk> Fri Apr 20 17:18:06 2018 +0000
tree 248938db3dbcc4a307c0c5d9c170c6ea0e688a96
parent 21d9c70b91ec7a8dc1e204502f3f3d429938e1d6

[WebAssembly] Implement GC for imports

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

llvm-svn: 330454

lld/wasm/Writer.cpp

diff --git a/lld/wasm/Writer.cpp b/lld/wasm/Writer.cpp
index 4a52b52..41aa165 100644
--- a/lld/wasm/Writer.cpp
+++ b/lld/wasm/Writer.cpp
@@ -697,6 +697,8 @@
       continue;
     if (Sym->isWeak() && !Config->Relocatable)
       continue;
+    if (!Sym->isLive())
+      continue;
 
     DEBUG(dbgs() << "import: " << Sym->getName() << "\n");
     ImportedSymbols.emplace_back(Sym);
@@ -825,13 +827,6 @@
         // Mark target type as live
         File->TypeMap[Reloc.Index] = registerType(Types[Reloc.Index]);
         File->TypeIsUsed[Reloc.Index] = true;
-      } else if (Reloc.Type == R_WEBASSEMBLY_GLOBAL_INDEX_LEB) {
-        // Mark target global as live
-        GlobalSymbol *Sym = File->getGlobalSymbol(Reloc.Index);
-        if (auto *G = dyn_cast<DefinedGlobal>(Sym)) {
-          DEBUG(dbgs() << "marking global live: " << Sym->getName() << "\n");
-          G->Global->Live = true;
-        }
       }
     }
   };