void InputSectionBase::uncompress() const {
size_t Size = UncompressedSize;
- UncompressedBuf.reset(new char[Size]);
+ char *UncompressedBuf;
+ {
+ static std::mutex Mu;
+ std::lock_guard<std::mutex> Lock(Mu);
+ UncompressedBuf = BAlloc.Allocate<char>(Size);
+ }
- if (Error E =
- zlib::uncompress(toStringRef(RawData), UncompressedBuf.get(), Size))
+ if (Error E = zlib::uncompress(toStringRef(RawData), UncompressedBuf, Size))
fatal(toString(this) +
": uncompress failed: " + llvm::toString(std::move(E)));
- RawData = makeArrayRef((uint8_t *)UncompressedBuf.get(), Size);
+ RawData = makeArrayRef((uint8_t *)UncompressedBuf, Size);
+ UncompressedSize = -1;
}
uint64_t InputSectionBase::getOffsetInFile() const {
// If this is a compressed section, uncompress section contents directly
// to the buffer.
- if (UncompressedSize >= 0 && !UncompressedBuf) {
+ if (UncompressedSize >= 0) {
size_t Size = UncompressedSize;
if (Error E = zlib::uncompress(toStringRef(RawData),
(char *)(Buf + OutSecOff), Size))
}
ArrayRef<uint8_t> data() const {
- if (UncompressedSize >= 0 && !UncompressedBuf)
+ if (UncompressedSize >= 0)
uncompress();
return RawData;
}
mutable ArrayRef<uint8_t> RawData;
- // A pointer that owns uncompressed data if a section is compressed by zlib.
- // Since the feature is not used often, this is usually a nullptr.
- mutable std::unique_ptr<char[]> UncompressedBuf;
- int64_t UncompressedSize = -1;
+ // This field stores the uncompressed size of the compressed data in RawData,
+ // or -1 if RawData is not compressed (either because the section wasn't
+ // compressed in the first place, or because we ended up uncompressing it).
+ // Since the feature is not used often, this is usually -1.
+ mutable int64_t UncompressedSize = -1;
};
// SectionPiece represents a piece of splittable section contents.