diff options
| author | Vedant Kumar <vsk@apple.com> | 2016-05-13 20:10:22 +0000 |
|---|---|---|
| committer | Vedant Kumar <vsk@apple.com> | 2016-05-13 20:10:22 +0000 |
| commit | 2d87639c5acbd122261574226c570971b54ef61e (patch) | |
| tree | 962bedac1fb0e18378448d98b8102c53792ee959 /clang/lib/CodeGen/CodeGenModule.cpp | |
| parent | 064535c1eace2b43f3f628f43551422fb5d054f5 (diff) | |
| download | bcm5719-llvm-2d87639c5acbd122261574226c570971b54ef61e.tar.gz bcm5719-llvm-2d87639c5acbd122261574226c570971b54ef61e.zip | |
Revert "[ProfileData] (clang) Use Error in InstrProf and Coverage, NFC"
This reverts commit r269463. It fails two llvm-profdata tests.
llvm-svn: 269468
Diffstat (limited to 'clang/lib/CodeGen/CodeGenModule.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CodeGenModule.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 57a6429c4be..79da25c13fa 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -141,13 +141,11 @@ CodeGenModule::CodeGenModule(ASTContext &C, const HeaderSearchOptions &HSO, if (CodeGenOpts.hasProfileClangUse()) { auto ReaderOrErr = llvm::IndexedInstrProfReader::create( CodeGenOpts.ProfileInstrumentUsePath); - if (auto E = ReaderOrErr.takeError()) { + if (std::error_code EC = ReaderOrErr.getError()) { unsigned DiagID = Diags.getCustomDiagID(DiagnosticsEngine::Error, "Could not read profile %0: %1"); - llvm::handleAllErrors(std::move(E), [&](const llvm::ErrorInfoBase &EI) { - getDiags().Report(DiagID) << CodeGenOpts.ProfileInstrumentUsePath - << EI.message(); - }); + getDiags().Report(DiagID) << CodeGenOpts.ProfileInstrumentUsePath + << EC.message(); } else PGOReader = std::move(ReaderOrErr.get()); } |
