6502
/
llvm-6502
mirror of https://github.com/c64scene-ar/llvm-6502.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[llvm-dwarfump] Don't rely on global state, part 3. 

Some tools used to rely on a global static variable to keep track of the 
return value for main(). I changed llvm-cxxdump to use exit(1)
and Rafael shortly after did the same with llvm-readobj. This is
(yet) another step towards the goal.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@243240 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Davide Italiano 2015-07-26 05:35:59 +00:00
parent 09fa5a537e
commit 5e7aab0de2
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/llvm-dwarfdump/llvm-dwarfdump.cpp
View File

@ -69,27 +69,22 @@ 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) {
static void error(StringRef Filename, std::error_code EC) {
if (!EC)
return false;
return;
errs() << Filename << ": " << EC.message() << "\n";
ReturnValue = EXIT_FAILURE;
return true;
exit(1);
}
static void DumpInput(StringRef Filename) {
ErrorOr<std::unique_ptr<MemoryBuffer>> BuffOrErr =
MemoryBuffer::getFileOrSTDIN(Filename);
if (error(Filename, BuffOrErr.getError()))
return;
error(Filename, BuffOrErr.getError());
std::unique_ptr<MemoryBuffer> Buff = std::move(BuffOrErr.get());
ErrorOr<std::unique_ptr<ObjectFile>> ObjOrErr =
ObjectFile::createObjectFile(Buff->getMemBufferRef());
if (error(Filename, ObjOrErr.getError()))
return;
error(Filename, ObjOrErr.getError());
ObjectFile &Obj = *ObjOrErr.get();
std::unique_ptr<DIContext> DICtx(new DWARFContextInMemory(Obj));
@ -114,5 +109,5 @@ int main(int argc, char **argv) {
std::for_each(InputFilenames.begin(), InputFilenames.end(), DumpInput);
return ReturnValue;
return EXIT_SUCCESS;
}