RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-02-03 19:15:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "[Coverage] Clarify ownership of a MemoryBuffer in the reader (NFC)"

Browse Source 
This reverts commit 1037ef2574adde2103ad221d63834c3e1df4a776.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@274105 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Vedant Kumar 2016-06-29 05:33:24 +00:00
parent c590a00f89
commit 0282a55d99
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/llvm/ProfileData/Coverage/CoverageMappingReader.h
View File

@ -181,7 +181,8 @@ private:
public:
static Expected<std::unique_ptr<BinaryCoverageReader>>
create(MemoryBuffer &ObjectBuffer, StringRef Arch);
create(std::unique_ptr<MemoryBuffer> &ObjectBuffer,
StringRef Arch);
Error readNextRecord(CoverageMappingRecord &Record) override;
};

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

@ -236,13 +236,11 @@ CoverageMapping::load(CoverageMappingReader &CoverageReader,
Expected<std::unique_ptr<CoverageMapping>>
CoverageMapping::load(StringRef ObjectFilename, StringRef ProfileFilename,
StringRef Arch) {
auto CounterMappingBufOrErr = MemoryBuffer::getFileOrSTDIN(ObjectFilename);
if (std::error_code EC = CounterMappingBufOrErr.getError())
auto CounterMappingBuff = MemoryBuffer::getFileOrSTDIN(ObjectFilename);
if (std::error_code EC = CounterMappingBuff.getError())
return errorCodeToError(EC);
std::unique_ptr<MemoryBuffer> ObjectBuffer =
std::move(CounterMappingBufOrErr.get());
auto CoverageReaderOrErr =
BinaryCoverageReader::create(*ObjectBuffer.get(), Arch);
BinaryCoverageReader::create(CounterMappingBuff.get(), Arch);
if (Error E = CoverageReaderOrErr.takeError())
return std::move(E);
auto CoverageReader = std::move(CoverageReaderOrErr.get());

9
lib/ProfileData/Coverage/CoverageMappingReader.cpp
View File

@ -641,7 +641,8 @@ static Error loadBinaryFormat(MemoryBufferRef ObjectBuffer,
}
Expected<std::unique_ptr<BinaryCoverageReader>>
BinaryCoverageReader::create(MemoryBuffer &ObjectBuffer, StringRef Arch) {
BinaryCoverageReader::create(std::unique_ptr<MemoryBuffer> &ObjectBuffer,
StringRef Arch) {
std::unique_ptr<BinaryCoverageReader> Reader(new BinaryCoverageReader());
StringRef Coverage;
@ -649,12 +650,12 @@ BinaryCoverageReader::create(MemoryBuffer &ObjectBuffer, StringRef Arch) {
support::endianness Endian;
Error E;
consumeError(std::move(E));
if (ObjectBuffer.getBuffer().startswith(TestingFormatMagic))
if (ObjectBuffer->getBuffer().startswith(TestingFormatMagic))
// This is a special format used for testing.
E = loadTestingFormat(ObjectBuffer.getBuffer(), Reader->ProfileNames,
E = loadTestingFormat(ObjectBuffer->getBuffer(), Reader->ProfileNames,
Coverage, BytesInAddress, Endian);
else
E = loadBinaryFormat(ObjectBuffer.getMemBufferRef(), Reader->ProfileNames,
E = loadBinaryFormat(ObjectBuffer->getMemBufferRef(), Reader->ProfileNames,
Coverage, BytesInAddress, Endian, Arch);
if (E)
return std::move(E);