summaryrefslogtreecommitdiffstats
path: root/lld/wasm/MarkLive.cpp
diff options
context:
space:
mode:
authorSam Clegg <sbc@chromium.org>2018-06-22 15:13:10 +0000
committerSam Clegg <sbc@chromium.org>2018-06-22 15:13:10 +0000
commitffd0aaf810e7dbae871c046a9b3c48ae0a7d7eb0 (patch)
tree073d1fc9d8b79126d1cb8a6cb68c9616d0a0e011 /lld/wasm/MarkLive.cpp
parenta99b3759bfc34a253a271f5bc8f5c7a6c2cfd284 (diff)
downloadbcm5719-llvm-ffd0aaf810e7dbae871c046a9b3c48ae0a7d7eb0.tar.gz
bcm5719-llvm-ffd0aaf810e7dbae871c046a9b3c48ae0a7d7eb0.zip
Revert "[WebAssembly] Error on mismatched function signature in final output"
This caused a lot of issues on the WebAssembly waterfall. In particular, until with the signature of `main`. We probably want a better solution for main before we re-land. Reverts rL335192 llvm-svn: 335355
Diffstat (limited to 'lld/wasm/MarkLive.cpp')
-rw-r--r--lld/wasm/MarkLive.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/lld/wasm/MarkLive.cpp b/lld/wasm/MarkLive.cpp
index c9dbbf59c95..018b3255b55 100644
--- a/lld/wasm/MarkLive.cpp
+++ b/lld/wasm/MarkLive.cpp
@@ -34,6 +34,9 @@ using namespace lld;
using namespace lld::wasm;
void lld::wasm::markLive() {
+ if (!Config->GcSections)
+ return;
+
LLVM_DEBUG(dbgs() << "markLive\n");
SmallVector<InputChunk *, 256> Q;
@@ -42,8 +45,6 @@ void lld::wasm::markLive() {
return;
LLVM_DEBUG(dbgs() << "markLive: " << Sym->getName() << "\n");
Sym->markLive();
- if (Sym->SignatureMismatch)
- error("function signature mismatch: " + Sym->getName());
if (InputChunk *Chunk = Sym->getChunk())
Q.push_back(Chunk);
};
OpenPOWER on IntegriCloud