From 2d87639c5acbd122261574226c570971b54ef61e Mon Sep 17 00:00:00 2001 From: Vedant Kumar Date: Fri, 13 May 2016 20:10:22 +0000 Subject: Revert "[ProfileData] (clang) Use Error in InstrProf and Coverage, NFC" This reverts commit r269463. It fails two llvm-profdata tests. llvm-svn: 269468 --- clang/lib/Frontend/CompilerInvocation.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'clang/lib/Frontend/CompilerInvocation.cpp') diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 20b66906..8e93ff1 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; } -- cgit v1.1