RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

[Coverage] Remove two overloads of CoverageMapping::load. NFC.

Browse Source 
These overloads are essentially dead, and pose a maintenance cost
without adding any benefit. This is coming up now because I'd like to
experiment with changing the way we store coverage mapping data, and
would rather not have to fix up the old overloads while doing so.

Testing: check-{llvm,profile}, build clang.
llvm-svn: 306776
This commit is contained in:
Vedant Kumar 2017-06-30 00:45:26 +00:00
parent 0a3a01b67d
commit dbd44e728a
3 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/llvm/ProfileData/Coverage/CoverageMapping.h
View File

@ -450,21 +450,10 @@ public:
CoverageMapping &operator=(const CoverageMapping &) = delete; CoverageMapping &operator=(const CoverageMapping &) = delete;
/// \brief Load the coverage mapping using the given readers. /// \brief Load the coverage mapping using the given readers.
static Expected<std::unique_ptr<CoverageMapping>>
load(CoverageMappingReader &CoverageReader,
IndexedInstrProfReader &ProfileReader);
static Expected<std::unique_ptr<CoverageMapping>> static Expected<std::unique_ptr<CoverageMapping>>
load(ArrayRef<std::unique_ptr<CoverageMappingReader>> CoverageReaders, load(ArrayRef<std::unique_ptr<CoverageMappingReader>> CoverageReaders,
IndexedInstrProfReader &ProfileReader); IndexedInstrProfReader &ProfileReader);
/// \brief Load the coverage mapping from the given files.
static Expected<std::unique_ptr<CoverageMapping>>
load(StringRef ObjectFilename, StringRef ProfileFilename,
StringRef Arch = StringRef()) {
return load(ArrayRef<StringRef>(ObjectFilename), ProfileFilename, Arch);
}
static Expected<std::unique_ptr<CoverageMapping>> static Expected<std::unique_ptr<CoverageMapping>>
load(ArrayRef<StringRef> ObjectFilenames, StringRef ProfileFilename, load(ArrayRef<StringRef> ObjectFilenames, StringRef ProfileFilename,
StringRef Arch = StringRef()); StringRef Arch = StringRef());

12
lib/ProfileData/Coverage/CoverageMapping.cpp
View File

@ -245,18 +245,6 @@ Error CoverageMapping::loadFunctionRecord(
return Error::success(); return Error::success();
} }
Expected<std::unique_ptr<CoverageMapping>>
CoverageMapping::load(CoverageMappingReader &CoverageReader,
IndexedInstrProfReader &ProfileReader) {
auto Coverage = std::unique_ptr<CoverageMapping>(new CoverageMapping());
for (const auto &Record : CoverageReader)
if (Error E = Coverage->loadFunctionRecord(Record, ProfileReader))
return std::move(E);
return std::move(Coverage);
}
Expected<std::unique_ptr<CoverageMapping>> CoverageMapping::load( Expected<std::unique_ptr<CoverageMapping>> CoverageMapping::load(
ArrayRef<std::unique_ptr<CoverageMappingReader>> CoverageReaders, ArrayRef<std::unique_ptr<CoverageMappingReader>> CoverageReaders,
IndexedInstrProfReader &ProfileReader) { IndexedInstrProfReader &ProfileReader) {

17
unittests/ProfileData/CoverageMappingTest.cpp
View File

@ -232,15 +232,16 @@ struct CoverageMappingTest : ::testing::TestWithParam<std::pair<bool, bool>> {
} }
Expected<std::unique_ptr<CoverageMapping>> readOutputFunctions() { Expected<std::unique_ptr<CoverageMapping>> readOutputFunctions() {
if (!UseMultipleReaders) {
CoverageMappingReaderMock CovReader(OutputFunctions);
return CoverageMapping::load(CovReader, *ProfileReader);
}
std::vector<std::unique_ptr<CoverageMappingReader>> CoverageReaders; std::vector<std::unique_ptr<CoverageMappingReader>> CoverageReaders;
for (const auto &OF : OutputFunctions) { if (UseMultipleReaders) {
ArrayRef<OutputFunctionCoverageData> Funcs(OF); for (const auto &OF : OutputFunctions) {
CoverageReaders.push_back(make_unique<CoverageMappingReaderMock>(Funcs)); ArrayRef<OutputFunctionCoverageData> Funcs(OF);
CoverageReaders.push_back(
make_unique<CoverageMappingReaderMock>(Funcs));
}
} else {
CoverageReaders.push_back(
make_unique<CoverageMappingReaderMock>(OutputFunctions));
} }
return CoverageMapping::load(CoverageReaders, *ProfileReader); return CoverageMapping::load(CoverageReaders, *ProfileReader);
} }