diff --git a/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h b/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h --- a/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h +++ b/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h @@ -573,6 +573,11 @@ CoverageMapping() = default; + // Load coverage records from readers. + static Error loadFromReaders( + ArrayRef> CoverageReaders, + IndexedInstrProfReader &ProfileReader, CoverageMapping &Coverage); + /// Add a function record corresponding to \p Record. Error loadFunctionRecord(const CoverageMappingRecord &Record, IndexedInstrProfReader &ProfileReader); diff --git a/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp b/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp --- a/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp +++ b/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp @@ -281,21 +281,29 @@ return Error::success(); } -Expected> CoverageMapping::load( +// This function is for memory optimization by shortening the lifetimes +// of CoverageMappingReader instances. +Error CoverageMapping::loadFromReaders( ArrayRef> CoverageReaders, - IndexedInstrProfReader &ProfileReader) { - auto Coverage = std::unique_ptr(new CoverageMapping()); - + IndexedInstrProfReader &ProfileReader, CoverageMapping &Coverage) { for (const auto &CoverageReader : CoverageReaders) { for (auto RecordOrErr : *CoverageReader) { if (Error E = RecordOrErr.takeError()) - return std::move(E); + return E; const auto &Record = *RecordOrErr; - if (Error E = Coverage->loadFunctionRecord(Record, ProfileReader)) - return std::move(E); + if (Error E = Coverage.loadFunctionRecord(Record, ProfileReader)) + return E; } } + return Error::success(); +} +Expected> CoverageMapping::load( + ArrayRef> CoverageReaders, + IndexedInstrProfReader &ProfileReader) { + auto Coverage = std::unique_ptr(new CoverageMapping()); + if (Error E = loadFromReaders(CoverageReaders, ProfileReader, *Coverage)) + return std::move(E); return std::move(Coverage); } @@ -316,16 +324,18 @@ if (Error E = ProfileReaderOrErr.takeError()) return std::move(E); auto ProfileReader = std::move(ProfileReaderOrErr.get()); + auto Coverage = std::unique_ptr(new CoverageMapping()); + bool DataFound = false; - SmallVector, 4> Readers; - SmallVector, 4> Buffers; for (const auto &File : llvm::enumerate(ObjectFilenames)) { - auto CovMappingBufOrErr = MemoryBuffer::getFileOrSTDIN(File.value()); + auto CovMappingBufOrErr = MemoryBuffer::getFileOrSTDIN( + File.value(), /*FileSize=*/-1, /*RequiresNullTerminator=*/false); if (std::error_code EC = CovMappingBufOrErr.getError()) return errorCodeToError(EC); StringRef Arch = Arches.empty() ? StringRef() : Arches[File.index()]; MemoryBufferRef CovMappingBufRef = CovMappingBufOrErr.get()->getMemBufferRef(); + SmallVector, 4> Buffers; auto CoverageReadersOrErr = BinaryCoverageReader::create(CovMappingBufRef, Arch, Buffers); if (Error E = CoverageReadersOrErr.takeError()) { @@ -335,15 +345,19 @@ // E == success (originally a no_data_found error). continue; } + + SmallVector, 4> Readers; for (auto &Reader : CoverageReadersOrErr.get()) Readers.push_back(std::move(Reader)); - Buffers.push_back(std::move(CovMappingBufOrErr.get())); + DataFound |= !Readers.empty(); + if (Error E = loadFromReaders(Readers, *ProfileReader, *Coverage)) + return std::move(E); } // If no readers were created, either no objects were provided or none of them // had coverage data. Return an error in the latter case. - if (Readers.empty() && !ObjectFilenames.empty()) + if (!DataFound && !ObjectFilenames.empty()) return make_error(coveragemap_error::no_data_found); - return load(Readers, *ProfileReader); + return std::move(Coverage); } namespace {