diff options
| author | Sam Clegg <sbc@chromium.org> | 2017-11-14 00:49:16 +0000 |
|---|---|---|
| committer | Sam Clegg <sbc@chromium.org> | 2017-11-14 00:49:16 +0000 |
| commit | 999660761e45f0c17693c5a756af69a4eb0b0b71 (patch) | |
| tree | af450981313ff5ce61b88226b2ff1de9105f643f /llvm/lib/Bitcode/Reader/BitcodeReader.cpp | |
| parent | e41151965f04bf631923343566a91c4904f100a6 (diff) | |
| download | llvm-999660761e45f0c17693c5a756af69a4eb0b0b71.zip llvm-999660761e45f0c17693c5a756af69a4eb0b0b71.tar.gz llvm-999660761e45f0c17693c5a756af69a4eb0b0b71.tar.bz2 | |
[WebAssembly] Explicily disable comdat support for wasm output
For now at least. We clearly need some kind of comdat or
linkonce_odr support for wasm but currently COMDAT is not
supported.
Disable COMDAT support in the same way we do the Mach-O. This
also causes clang not to generated COMDATs.
Differential Revision: https://reviews.llvm.org/D39873
llvm-svn: 318123
Diffstat (limited to 'llvm/lib/Bitcode/Reader/BitcodeReader.cpp')
| -rw-r--r-- | llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp index 3e0a39c..0b03d00 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -1825,10 +1825,10 @@ Expected<Value *> BitcodeReader::recordValue(SmallVectorImpl<uint64_t> &Record, auto *GO = dyn_cast<GlobalObject>(V); if (GO) { if (GO->getComdat() == reinterpret_cast<Comdat *>(1)) { - if (TT.isOSBinFormatMachO()) - GO->setComdat(nullptr); - else + if (TT.supportsCOMDAT()) GO->setComdat(TheModule->getOrInsertComdat(V->getName())); + else + GO->setComdat(nullptr); } } return V; |