summaryrefslogtreecommitdiffstats
path: root/clang/lib/Frontend/CompilerInvocation.cpp
diff options
context:
space:
mode:
authorVedant Kumar <vsk@apple.com>2016-05-13 20:10:22 +0000
committerVedant Kumar <vsk@apple.com>2016-05-13 20:10:22 +0000
commit2d87639c5acbd122261574226c570971b54ef61e (patch)
tree962bedac1fb0e18378448d98b8102c53792ee959 /clang/lib/Frontend/CompilerInvocation.cpp
parent064535c1eace2b43f3f628f43551422fb5d054f5 (diff)
downloadbcm5719-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/Frontend/CompilerInvocation.cpp')
-rw-r--r--clang/lib/Frontend/CompilerInvocation.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index 20b66906d56..8e93ff1a4b4 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -403,8 +403,7 @@ static void setPGOUseInstrumentor(CodeGenOptions &Opts,
const std::string ProfileName) {
auto ReaderOrErr = llvm::IndexedInstrProfReader::create(ProfileName);
// In error, return silently and let Clang PGOUse report the error message.
- if (auto E = ReaderOrErr.takeError()) {
- llvm::consumeError(std::move(E));
+ if (ReaderOrErr.getError()) {
Opts.setProfileUse(CodeGenOptions::ProfileClangInstr);
return;
}
OpenPOWER on IntegriCloud