From 85c7d66fdc20fea6eeef66fd8e1749b864f88186 Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Thu, 25 Jun 2015 23:40:15 +0000 Subject: Make llvm-dwarfdump exit with non-zero exit code if error was occured. llvm-svn: 240729 --- llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'llvm/tools/llvm-dwarfdump') diff --git a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp index c1cb0218ac3..db3fcf6ee7b 100644 --- a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp +++ b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp @@ -69,22 +69,27 @@ DumpType("debug-dump", cl::init(DIDT_All), clEnumValN(DIDT_StrOffsetsDwo, "str_offsets.dwo", ".debug_str_offsets.dwo"), clEnumValEnd)); +static int ReturnValue = EXIT_SUCCESS; + +static bool error(StringRef Filename, std::error_code EC) { + if (!EC) + return false; + errs() << Filename << ": " << EC.message() << "\n"; + ReturnValue = EXIT_FAILURE; + return true; +} + static void DumpInput(StringRef Filename) { ErrorOr> BuffOrErr = MemoryBuffer::getFileOrSTDIN(Filename); - - if (std::error_code EC = BuffOrErr.getError()) { - errs() << Filename << ": " << EC.message() << "\n"; + if (error(Filename, BuffOrErr.getError())) return; - } std::unique_ptr Buff = std::move(BuffOrErr.get()); ErrorOr> ObjOrErr = ObjectFile::createObjectFile(Buff->getMemBufferRef()); - if (std::error_code EC = ObjOrErr.getError()) { - errs() << Filename << ": " << EC.message() << '\n'; + if (error(Filename, ObjOrErr.getError())) return; - } ObjectFile &Obj = *ObjOrErr.get(); std::unique_ptr DICtx(new DWARFContextInMemory(Obj)); @@ -109,5 +114,5 @@ int main(int argc, char **argv) { std::for_each(InputFilenames.begin(), InputFilenames.end(), DumpInput); - return 0; + return ReturnValue; } -- cgit v1.2.3