diff --git a/include/llvm/ProfileData/Coverage/CoverageMapping.h b/include/llvm/ProfileData/Coverage/CoverageMapping.h index d5a7502ce95..fa9a87aed68 100644 --- a/include/llvm/ProfileData/Coverage/CoverageMapping.h +++ b/include/llvm/ProfileData/Coverage/CoverageMapping.h @@ -450,21 +450,10 @@ public: CoverageMapping &operator=(const CoverageMapping &) = delete; /// \brief Load the coverage mapping using the given readers. - static Expected> - load(CoverageMappingReader &CoverageReader, - IndexedInstrProfReader &ProfileReader); - static Expected> load(ArrayRef> CoverageReaders, IndexedInstrProfReader &ProfileReader); - /// \brief Load the coverage mapping from the given files. - static Expected> - load(StringRef ObjectFilename, StringRef ProfileFilename, - StringRef Arch = StringRef()) { - return load(ArrayRef(ObjectFilename), ProfileFilename, Arch); - } - static Expected> load(ArrayRef ObjectFilenames, StringRef ProfileFilename, StringRef Arch = StringRef()); diff --git a/lib/ProfileData/Coverage/CoverageMapping.cpp b/lib/ProfileData/Coverage/CoverageMapping.cpp index 49e356b83b6..8c5f136ea27 100644 --- a/lib/ProfileData/Coverage/CoverageMapping.cpp +++ b/lib/ProfileData/Coverage/CoverageMapping.cpp @@ -245,18 +245,6 @@ Error CoverageMapping::loadFunctionRecord( return Error::success(); } -Expected> -CoverageMapping::load(CoverageMappingReader &CoverageReader, - IndexedInstrProfReader &ProfileReader) { - auto Coverage = std::unique_ptr(new CoverageMapping()); - - for (const auto &Record : CoverageReader) - if (Error E = Coverage->loadFunctionRecord(Record, ProfileReader)) - return std::move(E); - - return std::move(Coverage); -} - Expected> CoverageMapping::load( ArrayRef> CoverageReaders, IndexedInstrProfReader &ProfileReader) { diff --git a/unittests/ProfileData/CoverageMappingTest.cpp b/unittests/ProfileData/CoverageMappingTest.cpp index ea51f717a1d..9cd186ac4bc 100644 --- a/unittests/ProfileData/CoverageMappingTest.cpp +++ b/unittests/ProfileData/CoverageMappingTest.cpp @@ -232,15 +232,16 @@ struct CoverageMappingTest : ::testing::TestWithParam> { } Expected> readOutputFunctions() { - if (!UseMultipleReaders) { - CoverageMappingReaderMock CovReader(OutputFunctions); - return CoverageMapping::load(CovReader, *ProfileReader); - } - std::vector> CoverageReaders; - for (const auto &OF : OutputFunctions) { - ArrayRef Funcs(OF); - CoverageReaders.push_back(make_unique(Funcs)); + if (UseMultipleReaders) { + for (const auto &OF : OutputFunctions) { + ArrayRef Funcs(OF); + CoverageReaders.push_back( + make_unique(Funcs)); + } + } else { + CoverageReaders.push_back( + make_unique(OutputFunctions)); } return CoverageMapping::load(CoverageReaders, *ProfileReader); }