summaryrefslogtreecommitdiffstats
path: root/lld/wasm/OutputSegment.h
diff options
context:
space:
mode:
authorSam Clegg <sbc@chromium.org>2018-01-13 15:57:48 +0000
committerSam Clegg <sbc@chromium.org>2018-01-13 15:57:48 +0000
commitf98bccf06f3a54d1db08e9fb58bba0e08ebaf4e4 (patch)
tree44b176cb6fb82f1042b7f2293861541fc6c14dfd /lld/wasm/OutputSegment.h
parent7c11dbf5b09b5a91587c2b744ef52fa810992ee4 (diff)
downloadbcm5719-llvm-f98bccf06f3a54d1db08e9fb58bba0e08ebaf4e4.tar.gz
bcm5719-llvm-f98bccf06f3a54d1db08e9fb58bba0e08ebaf4e4.zip
Revert "[WebAssembly] Move checking of InputSegment comdat group earlier"
This reverts commit 7421eab7ccf2e14518f4526a084a5afc76ac9c6a. llvm-svn: 322441
Diffstat (limited to 'lld/wasm/OutputSegment.h')
-rw-r--r--lld/wasm/OutputSegment.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/lld/wasm/OutputSegment.h b/lld/wasm/OutputSegment.h
index 420d9744165..9825ce8e697 100644
--- a/lld/wasm/OutputSegment.h
+++ b/lld/wasm/OutputSegment.h
@@ -25,18 +25,12 @@ public:
void addInputSegment(InputSegment *Segment) {
Alignment = std::max(Alignment, Segment->getAlignment());
- if (InputSegments.empty())
- Comdat = Segment->getComdat();
- else
- assert(Comdat == Segment->getComdat());
InputSegments.push_back(Segment);
Size = llvm::alignTo(Size, Segment->getAlignment());
Segment->setOutputSegment(this, Size);
Size += Segment->getSize();
}
- StringRef getComdat() const { return Comdat; }
-
uint32_t getSectionOffset() const { return SectionOffset; }
void setSectionOffset(uint32_t Offset) { SectionOffset = Offset; }
@@ -53,7 +47,6 @@ public:
std::string Header;
private:
- StringRef Comdat;
uint32_t SectionOffset = 0;
};
OpenPOWER on IntegriCloud