From f98bccf06f3a54d1db08e9fb58bba0e08ebaf4e4 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Sat, 13 Jan 2018 15:57:48 +0000 Subject: Revert "[WebAssembly] Move checking of InputSegment comdat group earlier" This reverts commit 7421eab7ccf2e14518f4526a084a5afc76ac9c6a. llvm-svn: 322441 --- lld/wasm/OutputSegment.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'lld/wasm/OutputSegment.h') 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; }; -- cgit v1.2.3