diff options
25 files changed, 61 insertions, 61 deletions
diff --git a/llvm/include/llvm/Support/Error.h b/llvm/include/llvm/Support/Error.h index 4e16190..4962812 100644 --- a/llvm/include/llvm/Support/Error.h +++ b/llvm/include/llvm/Support/Error.h @@ -953,10 +953,14 @@ Expected<T> handleExpected(Expected<T> ValOrErr, RecoveryFtor &&RecoveryPath, /// will be printed before the first one is logged. A newline will be printed /// after each error. /// +/// This function is compatible with the helpers from Support/WithColor.h. You +/// can pass any of them as the OS. Please consider using them instead of +/// including 'error: ' in the ErrorBanner. +/// /// This is useful in the base level of your program to allow clean termination /// (allowing clean deallocation of resources, etc.), while reporting error /// information to the user. -void logAllUnhandledErrors(Error E, raw_ostream &OS, Twine ErrorBanner); +void logAllUnhandledErrors(Error E, raw_ostream &OS, Twine ErrorBanner = {}); /// Write all error messages (if any) in E to a string. The newline character /// is used to separate error messages. diff --git a/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp b/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp index 25c0cb5..8122ed2 100644 --- a/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp +++ b/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp @@ -216,7 +216,7 @@ void MCJIT::generateCodeForModule(Module *M) { if (!LoadedObject) { std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(LoadedObject.takeError(), OS, ""); + logAllUnhandledErrors(LoadedObject.takeError(), OS); OS.flush(); report_fatal_error(Buf); } diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.cpp index 1c54ad6..340ddaa 100644 --- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.cpp +++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.cpp @@ -66,7 +66,7 @@ RuntimeDyldCOFF::loadObject(const object::ObjectFile &O) { } else { HasError = true; raw_string_ostream ErrStream(ErrorStr); - logAllUnhandledErrors(ObjSectionToIDOrErr.takeError(), ErrStream, ""); + logAllUnhandledErrors(ObjSectionToIDOrErr.takeError(), ErrStream); return nullptr; } } diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp index f9a81c7..226ee71 100644 --- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp +++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp @@ -255,7 +255,7 @@ RuntimeDyldELF::loadObject(const object::ObjectFile &O) { else { HasError = true; raw_string_ostream ErrStream(ErrorStr); - logAllUnhandledErrors(ObjSectionToIDOrErr.takeError(), ErrStream, ""); + logAllUnhandledErrors(ObjSectionToIDOrErr.takeError(), ErrStream); return nullptr; } } @@ -1130,7 +1130,7 @@ RuntimeDyldELF::processRelocationRef( if (!SymTypeOrErr) { std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(SymTypeOrErr.takeError(), OS, ""); + logAllUnhandledErrors(SymTypeOrErr.takeError(), OS); OS.flush(); report_fatal_error(Buf); } @@ -1151,7 +1151,7 @@ RuntimeDyldELF::processRelocationRef( if (!SectionOrErr) { std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(SectionOrErr.takeError(), OS, ""); + logAllUnhandledErrors(SectionOrErr.takeError(), OS); OS.flush(); report_fatal_error(Buf); } diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp index c5a215c..d47fcd4 100644 --- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp +++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp @@ -370,7 +370,7 @@ RuntimeDyldMachO::loadObject(const object::ObjectFile &O) { else { HasError = true; raw_string_ostream ErrStream(ErrorStr); - logAllUnhandledErrors(ObjSectionToIDOrErr.takeError(), ErrStream, ""); + logAllUnhandledErrors(ObjSectionToIDOrErr.takeError(), ErrStream); return nullptr; } } diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldCOFFThumb.h b/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldCOFFThumb.h index 729ea1e..8723dd0 100644 --- a/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldCOFFThumb.h +++ b/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldCOFFThumb.h @@ -28,7 +28,7 @@ static bool isThumbFunc(symbol_iterator Symbol, const ObjectFile &Obj, if (!SymTypeOrErr) { std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(SymTypeOrErr.takeError(), OS, ""); + logAllUnhandledErrors(SymTypeOrErr.takeError(), OS); OS.flush(); report_fatal_error(Buf); } diff --git a/llvm/lib/LTO/LTOModule.cpp b/llvm/lib/LTO/LTOModule.cpp index 20fc094..0d40d49 100644 --- a/llvm/lib/LTO/LTOModule.cpp +++ b/llvm/lib/LTO/LTOModule.cpp @@ -73,7 +73,7 @@ bool LTOModule::isBitcodeFile(StringRef Path) { bool LTOModule::isThinLTO() { Expected<BitcodeLTOInfo> Result = getBitcodeLTOInfo(MBRef); if (!Result) { - logAllUnhandledErrors(Result.takeError(), errs(), ""); + logAllUnhandledErrors(Result.takeError(), errs()); return false; } return Result->IsThinLTO; diff --git a/llvm/lib/Object/Object.cpp b/llvm/lib/Object/Object.cpp index 5fd823e..c932e5b 100644 --- a/llvm/lib/Object/Object.cpp +++ b/llvm/lib/Object/Object.cpp @@ -105,7 +105,7 @@ void LLVMMoveToContainingSection(LLVMSectionIteratorRef Sect, if (!SecOrErr) { std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(SecOrErr.takeError(), OS, ""); + logAllUnhandledErrors(SecOrErr.takeError(), OS); OS.flush(); report_fatal_error(Buf); } @@ -187,7 +187,7 @@ const char *LLVMGetSymbolName(LLVMSymbolIteratorRef SI) { if (!Ret) { std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(Ret.takeError(), OS, ""); + logAllUnhandledErrors(Ret.takeError(), OS); OS.flush(); report_fatal_error(Buf); } @@ -199,7 +199,7 @@ uint64_t LLVMGetSymbolAddress(LLVMSymbolIteratorRef SI) { if (!Ret) { std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(Ret.takeError(), OS, ""); + logAllUnhandledErrors(Ret.takeError(), OS); OS.flush(); report_fatal_error(Buf); } diff --git a/llvm/lib/Support/Error.cpp b/llvm/lib/Support/Error.cpp index ad2443d..0b0be8d 100644 --- a/llvm/lib/Support/Error.cpp +++ b/llvm/lib/Support/Error.cpp @@ -141,7 +141,7 @@ void report_fatal_error(Error Err, bool GenCrashDiag) { std::string ErrMsg; { raw_string_ostream ErrStream(ErrMsg); - logAllUnhandledErrors(std::move(Err), ErrStream, ""); + logAllUnhandledErrors(std::move(Err), ErrStream); } report_fatal_error(ErrMsg); } diff --git a/llvm/tools/lli/lli.cpp b/llvm/tools/lli/lli.cpp index c3c57e2..e4a7462 100644 --- a/llvm/tools/lli/lli.cpp +++ b/llvm/tools/lli/lli.cpp @@ -511,7 +511,7 @@ int main(int argc, char **argv, char * const *envp) { if (!ArOrErr) { std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(ArOrErr.takeError(), OS, ""); + logAllUnhandledErrors(ArOrErr.takeError(), OS); OS.flush(); errs() << Buf; exit(1); diff --git a/llvm/tools/llvm-cov/TestingSupport.cpp b/llvm/tools/llvm-cov/TestingSupport.cpp index e07abdb..16a1c26 100644 --- a/llvm/tools/llvm-cov/TestingSupport.cpp +++ b/llvm/tools/llvm-cov/TestingSupport.cpp @@ -33,7 +33,7 @@ int convertForTestingMain(int argc, const char *argv[]) { if (!ObjErr) { std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(ObjErr.takeError(), OS, ""); + logAllUnhandledErrors(ObjErr.takeError(), OS); OS.flush(); errs() << "error: " << Buf; return 1; diff --git a/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp b/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp index 40db5c9..7594066 100644 --- a/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp +++ b/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp @@ -52,7 +52,8 @@ static void error(std::error_code EC) { static void error(Error Err) { if (!Err) return; - logAllUnhandledErrors(std::move(Err), WithColor::error(outs(), ""), "reading file: "); + logAllUnhandledErrors(std::move(Err), WithColor::error(outs()), + "reading file: "); outs().flush(); exit(1); } @@ -497,7 +498,7 @@ static void dumpArchive(const Archive *Arc) { if (auto E = isNotObjectErrorInvalidFileType(ChildOrErr.takeError())) { std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(std::move(E), OS, ""); + logAllUnhandledErrors(std::move(E), OS); OS.flush(); reportError(Arc->getFileName(), Buf); } diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp index 21f3a2b..a30a71a 100644 --- a/llvm/tools/llvm-nm/llvm-nm.cpp +++ b/llvm/tools/llvm-nm/llvm-nm.cpp @@ -209,7 +209,7 @@ static bool error(std::error_code EC, Twine Path = Twine()) { // This version of error() prints the archive name and member name, for example: // "libx.a(foo.o)" after the ToolName before the error message. It sets -// HadError but returns allowing the code to move on to other archive members. +// HadError but returns allowing the code to move on to other archive members. static void error(llvm::Error E, StringRef FileName, const Archive::Child &C, StringRef ArchitectureName = StringRef()) { HadError = true; @@ -230,7 +230,7 @@ static void error(llvm::Error E, StringRef FileName, const Archive::Child &C, std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(std::move(E), OS, ""); + logAllUnhandledErrors(std::move(E), OS); OS.flush(); errs() << " " << Buf << "\n"; } @@ -238,7 +238,7 @@ static void error(llvm::Error E, StringRef FileName, const Archive::Child &C, // This version of error() prints the file name and which architecture slice it // is from, for example: "foo.o (for architecture i386)" after the ToolName // before the error message. It sets HadError but returns allowing the code to -// move on to other architecture slices. +// move on to other architecture slices. static void error(llvm::Error E, StringRef FileName, StringRef ArchitectureName = StringRef()) { HadError = true; @@ -249,7 +249,7 @@ static void error(llvm::Error E, StringRef FileName, std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(std::move(E), OS, ""); + logAllUnhandledErrors(std::move(E), OS); OS.flush(); errs() << " " << Buf << "\n"; } @@ -1029,8 +1029,7 @@ static char getSymbolNMTypeChar(MachOObjectFile &Obj, basic_symbol_iterator I) { StringRef SectionName; Obj.getSectionName(Ref, SectionName); StringRef SegmentName = Obj.getSectionFinalSegmentName(Ref); - if (Obj.is64Bit() && - Obj.getHeader64().filetype == MachO::MH_KEXT_BUNDLE && + if (Obj.is64Bit() && Obj.getHeader64().filetype == MachO::MH_KEXT_BUNDLE && SegmentName == "__TEXT_EXEC" && SectionName == "__text") return 't'; if (SegmentName == "__TEXT" && SectionName == "__text") @@ -1606,7 +1605,7 @@ dumpSymbolNamesFromObject(SymbolicFile &Obj, bool printName, uint64_t lc_main_offset = UINT64_MAX; for (const auto &Command : MachO->load_commands()) { if (Command.C.cmd == MachO::LC_FUNCTION_STARTS) { - // We found a function starts segment, parse the addresses for + // We found a function starts segment, parse the addresses for // consumption. MachO::linkedit_data_command LLC = MachO->getLinkeditDataLoadCommand(Command); diff --git a/llvm/tools/llvm-objcopy/llvm-objcopy.cpp b/llvm/tools/llvm-objcopy/llvm-objcopy.cpp index 755c786..bc50880 100644 --- a/llvm/tools/llvm-objcopy/llvm-objcopy.cpp +++ b/llvm/tools/llvm-objcopy/llvm-objcopy.cpp @@ -66,7 +66,7 @@ LLVM_ATTRIBUTE_NORETURN void reportError(StringRef File, Error E) { assert(E); std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(std::move(E), OS, ""); + logAllUnhandledErrors(std::move(E), OS); OS.flush(); WithColor::error(errs(), ToolName) << "'" << File << "': " << Buf; exit(1); diff --git a/llvm/tools/llvm-objcopy/llvm-objcopy.h b/llvm/tools/llvm-objcopy/llvm-objcopy.h index e222b65..d8edf3e 100644 --- a/llvm/tools/llvm-objcopy/llvm-objcopy.h +++ b/llvm/tools/llvm-objcopy/llvm-objcopy.h @@ -31,7 +31,7 @@ template <class T> T unwrapOrError(Expected<T> EO) { return *EO; std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(EO.takeError(), OS, ""); + logAllUnhandledErrors(EO.takeError(), OS); OS.flush(); error(Buf); } diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index 671e8a2..1f936e5 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -372,7 +372,7 @@ LLVM_ATTRIBUTE_NORETURN void llvm::report_error(StringRef File, assert(E); std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(std::move(E), OS, ""); + logAllUnhandledErrors(std::move(E), OS); OS.flush(); errs() << ToolName << ": '" << File << "': " << Buf; exit(1); @@ -392,7 +392,7 @@ LLVM_ATTRIBUTE_NORETURN void llvm::report_error(StringRef ArchiveName, errs() << " (for architecture " << ArchitectureName << ")"; std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(std::move(E), OS, ""); + logAllUnhandledErrors(std::move(E), OS); OS.flush(); errs() << ": " << Buf; exit(1); diff --git a/llvm/tools/llvm-readobj/ARMWinEHPrinter.cpp b/llvm/tools/llvm-readobj/ARMWinEHPrinter.cpp index eb57589..4b823b8 100644 --- a/llvm/tools/llvm-readobj/ARMWinEHPrinter.cpp +++ b/llvm/tools/llvm-readobj/ARMWinEHPrinter.cpp @@ -903,7 +903,7 @@ bool Decoder::dumpXDataRecord(const COFFObjectFile &COFF, if (!Name) { std::string Buf; llvm::raw_string_ostream OS(Buf); - logAllUnhandledErrors(Name.takeError(), OS, ""); + logAllUnhandledErrors(Name.takeError(), OS); OS.flush(); report_fatal_error(Buf); } @@ -942,7 +942,7 @@ bool Decoder::dumpUnpackedEntry(const COFFObjectFile &COFF, if (!FunctionNameOrErr) { std::string Buf; llvm::raw_string_ostream OS(Buf); - logAllUnhandledErrors(FunctionNameOrErr.takeError(), OS, ""); + logAllUnhandledErrors(FunctionNameOrErr.takeError(), OS); OS.flush(); report_fatal_error(Buf); } @@ -951,7 +951,7 @@ bool Decoder::dumpUnpackedEntry(const COFFObjectFile &COFF, if (!FunctionAddressOrErr) { std::string Buf; llvm::raw_string_ostream OS(Buf); - logAllUnhandledErrors(FunctionAddressOrErr.takeError(), OS, ""); + logAllUnhandledErrors(FunctionAddressOrErr.takeError(), OS); OS.flush(); report_fatal_error(Buf); } @@ -967,7 +967,7 @@ bool Decoder::dumpUnpackedEntry(const COFFObjectFile &COFF, if (!Name) { std::string Buf; llvm::raw_string_ostream OS(Buf); - logAllUnhandledErrors(Name.takeError(), OS, ""); + logAllUnhandledErrors(Name.takeError(), OS); OS.flush(); report_fatal_error(Buf); } @@ -976,7 +976,7 @@ bool Decoder::dumpUnpackedEntry(const COFFObjectFile &COFF, if (!AddressOrErr) { std::string Buf; llvm::raw_string_ostream OS(Buf); - logAllUnhandledErrors(AddressOrErr.takeError(), OS, ""); + logAllUnhandledErrors(AddressOrErr.takeError(), OS); OS.flush(); report_fatal_error(Buf); } @@ -1025,7 +1025,7 @@ bool Decoder::dumpPackedEntry(const object::COFFObjectFile &COFF, if (!FunctionNameOrErr) { std::string Buf; llvm::raw_string_ostream OS(Buf); - logAllUnhandledErrors(FunctionNameOrErr.takeError(), OS, ""); + logAllUnhandledErrors(FunctionNameOrErr.takeError(), OS); OS.flush(); report_fatal_error(Buf); } @@ -1034,7 +1034,7 @@ bool Decoder::dumpPackedEntry(const object::COFFObjectFile &COFF, if (!FunctionAddressOrErr) { std::string Buf; llvm::raw_string_ostream OS(Buf); - logAllUnhandledErrors(FunctionAddressOrErr.takeError(), OS, ""); + logAllUnhandledErrors(FunctionAddressOrErr.takeError(), OS); OS.flush(); report_fatal_error(Buf); } diff --git a/llvm/tools/llvm-readobj/llvm-readobj.h b/llvm/tools/llvm-readobj/llvm-readobj.h index 374ffd0..73eee76 100644 --- a/llvm/tools/llvm-readobj/llvm-readobj.h +++ b/llvm/tools/llvm-readobj/llvm-readobj.h @@ -40,7 +40,7 @@ namespace llvm { return *EO; std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(EO.takeError(), OS, ""); + logAllUnhandledErrors(EO.takeError(), OS); OS.flush(); reportError(Buf); } diff --git a/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp b/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp index 6ef2823..975638e 100644 --- a/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp +++ b/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp @@ -309,7 +309,7 @@ static int printLineInfoForInput(bool LoadObjects, bool UseDebugObj) { if (!MaybeObj) { std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(MaybeObj.takeError(), OS, ""); + logAllUnhandledErrors(MaybeObj.takeError(), OS); OS.flush(); ErrorAndExit("unable to create object file: '" + Buf + "'"); } @@ -438,7 +438,7 @@ static int executeInput() { if (!MaybeObj) { std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(MaybeObj.takeError(), OS, ""); + logAllUnhandledErrors(MaybeObj.takeError(), OS); OS.flush(); ErrorAndExit("unable to create object file: '" + Buf + "'"); } @@ -710,7 +710,7 @@ static int linkAndVerify() { if (!MaybeObj) { std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(MaybeObj.takeError(), OS, ""); + logAllUnhandledErrors(MaybeObj.takeError(), OS); OS.flush(); ErrorAndExit("unable to create object file: '" + Buf + "'"); } diff --git a/llvm/tools/llvm-size/llvm-size.cpp b/llvm/tools/llvm-size/llvm-size.cpp index ad1aefc..3922cad 100644 --- a/llvm/tools/llvm-size/llvm-size.cpp +++ b/llvm/tools/llvm-size/llvm-size.cpp @@ -140,7 +140,7 @@ static void error(llvm::Error E, StringRef FileName, const Archive::Child &C, std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(std::move(E), OS, ""); + logAllUnhandledErrors(std::move(E), OS); OS.flush(); errs() << " " << Buf << "\n"; } @@ -158,7 +158,7 @@ static void error(llvm::Error E, StringRef FileName, std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(std::move(E), OS, ""); + logAllUnhandledErrors(std::move(E), OS); OS.flush(); errs() << " " << Buf << "\n"; } diff --git a/llvm/tools/llvm-xray/xray-stacks.cpp b/llvm/tools/llvm-xray/xray-stacks.cpp index 059940b..d3af9e2 100644 --- a/llvm/tools/llvm-xray/xray-stacks.cpp +++ b/llvm/tools/llvm-xray/xray-stacks.cpp @@ -737,7 +737,7 @@ static CommandRegistration Unused(&Stack, []() -> Error { Twine("Failed loading input file '") + Filename + "'", std::make_error_code(std::errc::invalid_argument)), TraceOrErr.takeError()); - logAllUnhandledErrors(TraceOrErr.takeError(), errs(), ""); + logAllUnhandledErrors(TraceOrErr.takeError(), errs()); continue; } auto &T = *TraceOrErr; diff --git a/llvm/tools/obj2yaml/coff2yaml.cpp b/llvm/tools/obj2yaml/coff2yaml.cpp index e7e9e19..57fb1d0 100644 --- a/llvm/tools/obj2yaml/coff2yaml.cpp +++ b/llvm/tools/obj2yaml/coff2yaml.cpp @@ -188,7 +188,7 @@ void COFFDumper::dumpSections(unsigned NumSections) { if (!SymbolNameOrErr) { std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(SymbolNameOrErr.takeError(), OS, ""); + logAllUnhandledErrors(SymbolNameOrErr.takeError(), OS); OS.flush(); report_fatal_error(Buf); } diff --git a/llvm/tools/obj2yaml/obj2yaml.cpp b/llvm/tools/obj2yaml/obj2yaml.cpp index 7678615..459572a 100644 --- a/llvm/tools/obj2yaml/obj2yaml.cpp +++ b/llvm/tools/obj2yaml/obj2yaml.cpp @@ -50,7 +50,7 @@ static void reportError(StringRef Input, Error Err) { Input = "<stdin>"; std::string ErrMsg; raw_string_ostream OS(ErrMsg); - logAllUnhandledErrors(std::move(Err), OS, ""); + logAllUnhandledErrors(std::move(Err), OS); OS.flush(); errs() << "Error reading file: " << Input << ": " << ErrMsg; errs().flush(); diff --git a/llvm/unittests/ExecutionEngine/Orc/RemoteObjectLayerTest.cpp b/llvm/unittests/ExecutionEngine/Orc/RemoteObjectLayerTest.cpp index ae408a0..09224c2 100644 --- a/llvm/unittests/ExecutionEngine/Orc/RemoteObjectLayerTest.cpp +++ b/llvm/unittests/ExecutionEngine/Orc/RemoteObjectLayerTest.cpp @@ -112,10 +112,9 @@ TEST(RemoteObjectLayer, AddObject) { auto Channels = createPairedQueueChannels(); - auto ReportError = - [](Error Err) { - logAllUnhandledErrors(std::move(Err), llvm::errs(), ""); - }; + auto ReportError = [](Error Err) { + logAllUnhandledErrors(std::move(Err), llvm::errs()); + }; // Copy the bytes out of the test object: the copy will be used to verify // that the original is correctly transmitted over RPC to the mock layer. @@ -225,10 +224,9 @@ TEST(RemoteObjectLayer, RemoveObject) { auto Channels = createPairedQueueChannels(); - auto ReportError = - [](Error Err) { - logAllUnhandledErrors(std::move(Err), llvm::errs(), ""); - }; + auto ReportError = [](Error Err) { + logAllUnhandledErrors(std::move(Err), llvm::errs()); + }; RPCEndpoint ClientEP(*Channels.first, true); RemoteObjectClientLayer<RPCEndpoint> Client(ClientEP, ReportError); @@ -489,10 +487,9 @@ TEST(RemoteObjectLayer, EmitAndFinalize) { auto Channels = createPairedQueueChannels(); - auto ReportError = - [](Error Err) { - logAllUnhandledErrors(std::move(Err), llvm::errs(), ""); - }; + auto ReportError = [](Error Err) { + logAllUnhandledErrors(std::move(Err), llvm::errs()); + }; RPCEndpoint ClientEP(*Channels.first, true); RemoteObjectClientLayer<RPCEndpoint> Client(ClientEP, ReportError); diff --git a/llvm/unittests/Support/ErrorTest.cpp b/llvm/unittests/Support/ErrorTest.cpp index ed1e2bb..eee2fe2 100644 --- a/llvm/unittests/Support/ErrorTest.cpp +++ b/llvm/unittests/Support/ErrorTest.cpp @@ -434,9 +434,8 @@ TEST(Error, CatchErrorFromHandler) { TEST(Error, StringError) { std::string Msg; raw_string_ostream S(Msg); - logAllUnhandledErrors(make_error<StringError>("foo" + Twine(42), - inconvertibleErrorCode()), - S, ""); + logAllUnhandledErrors( + make_error<StringError>("foo" + Twine(42), inconvertibleErrorCode()), S); EXPECT_EQ(S.str(), "foo42\n") << "Unexpected StringError log result"; auto EC = @@ -451,13 +450,13 @@ TEST(Error, createStringError) { std::string Msg; raw_string_ostream S(Msg); logAllUnhandledErrors(createStringError(EC, "foo%s%d0x%" PRIx8, Bar, 1, 0xff), - S, ""); + S); EXPECT_EQ(S.str(), "foobar10xff\n") << "Unexpected createStringError() log result"; S.flush(); Msg.clear(); - logAllUnhandledErrors(createStringError(EC, Bar), S, ""); + logAllUnhandledErrors(createStringError(EC, Bar), S); EXPECT_EQ(S.str(), "bar\n") << "Unexpected createStringError() (overloaded) log result"; |