This is an archive of the discontinued LLVM Phabricator instance.

Differential D14585

Adding qualifier for make_unique.
ClosedPublic

Authored by aizatsky on Nov 11 2015, 1:29 PM.

Details

Reviewers
samsonov
Commits
rG8b2e05242903: Adding qualifier for make_unique.
rL252804: Adding qualifier for make_unique.
Summary

MSVC gets confused.

Diff Detail

Repository
rL LLVM

Event Timeline

aizatsky updated this revision to Diff 39965.Nov 11 2015, 1:29 PM
aizatsky retitled this revision from to Adding qualifier for make_unique..
aizatsky updated this object.
aizatsky added a reviewer: samsonov.Nov 11 2015, 1:29 PM
aizatsky added a subscriber: llvm-commits.
aizatsky updated this revision to Diff 39966.Nov 11 2015, 1:30 PM

another one

Closed by commit rL252804: Adding qualifier for make_unique. (authored by aizatsky). · Explain WhyNov 11 2015, 1:31 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
tools/
sancov/
4 lines

Diff 39967

llvm/trunk/tools/sancov/sancov.cc

Show First 20 Lines • Show All 110 Lines • ▼ Show 20 Lines static ErrorOr<std::unique_ptr<CoverageData>> read(std::string FileName) {
const FileHeader *Header = const FileHeader *Header =
reinterpret_cast<const FileHeader *>(Buf->getBufferStart()); reinterpret_cast<const FileHeader *>(Buf->getBufferStart());
if (Header->Magic != BinCoverageMagic) { if (Header->Magic != BinCoverageMagic) {
errs() << "Wrong magic: " << Header->Magic; errs() << "Wrong magic: " << Header->Magic;
return make_error_code(errc::illegal_byte_sequence); return make_error_code(errc::illegal_byte_sequence);
} }
auto Addrs = make_unique<std::vector<uint64_t>>(); auto Addrs = llvm::make_unique<std::vector<uint64_t>>();
switch (Header->Bitness) { switch (Header->Bitness) {
case Bitness64: case Bitness64:
readInts<uint64_t>(Buf->getBufferStart() + 8, Buf->getBufferEnd(), readInts<uint64_t>(Buf->getBufferStart() + 8, Buf->getBufferEnd(),
Addrs.get()); Addrs.get());
break; break;
case Bitness32: case Bitness32:
readInts<uint32_t>(Buf->getBufferStart() + 8, Buf->getBufferEnd(), readInts<uint32_t>(Buf->getBufferStart() + 8, Buf->getBufferEnd(),
Show All 10 Lines public:
// Merge multiple coverage data together. // Merge multiple coverage data together.
static std::unique_ptr<CoverageData> static std::unique_ptr<CoverageData>
merge(const std::vector<std::unique_ptr<CoverageData>> &Covs) { merge(const std::vector<std::unique_ptr<CoverageData>> &Covs) {
std::set<uint64_t> Addrs; std::set<uint64_t> Addrs;
for (const auto &Cov : Covs) for (const auto &Cov : Covs)
Addrs.insert(Cov->Addrs->begin(), Cov->Addrs->end()); Addrs.insert(Cov->Addrs->begin(), Cov->Addrs->end());
auto AddrsVector = make_unique<std::vector<uint64_t>>( auto AddrsVector = llvm::make_unique<std::vector<uint64_t>>(
Addrs.begin(), Addrs.end()); Addrs.begin(), Addrs.end());
return std::unique_ptr<CoverageData>( return std::unique_ptr<CoverageData>(
new CoverageData(std::move(AddrsVector))); new CoverageData(std::move(AddrsVector)));
} }
// Read list of files and merges their coverage info. // Read list of files and merges their coverage info.
static ErrorOr<std::unique_ptr<CoverageData>> static ErrorOr<std::unique_ptr<CoverageData>>
readAndMerge(const std::vector<std::string> &FileNames) { readAndMerge(const std::vector<std::string> &FileNames) {
▲ Show 20 Lines • Show All 110 Lines • Show Last 20 Lines