maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[llvm-dwarfdump] Simplify -o handling 

ToolOutputFile handles '-' so no need to specialize here.
Also, we neither reassign the variable nor pass it around, thus no need
to use std::unique_ptr<ToolOutputFile>.

exit(1) -> return 1;  to call the destructor of raw_fd_stream

llvm-svn: 357051
This commit is contained in:
Fangrui Song 2019-03-27 08:19:36 +00:00
parent feadc2a1de
commit 95db95729c
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,7 +159,7 @@ static opt<unsigned long long> Lookup("lookup",
"available file, function, block and line table details."),
value_desc("address"), cat(DwarfDumpCategory));
static opt<std::string>
OutputFilename("out-file", cl::init(""),
OutputFilename("out-file", cl::init("-"),
cl::desc("Redirect output to the specified file."),
cl::value_desc("filename"));
static alias OutputFilenameAlias("o", desc("Alias for -out-file."),
@ -586,17 +586,12 @@ int main(int argc, char **argv) {
return 0;
}
std::unique_ptr<ToolOutputFile> OutputFile;
if (!OutputFilename.empty()) {
std::error_code EC;
OutputFile = llvm::make_unique<ToolOutputFile>(OutputFilename, EC,
sys::fs::F_None);
error("Unable to open output file" + OutputFilename, EC);
// Don't remove output file if we exit with an error.
OutputFile->keep();
}
std::error_code EC;
ToolOutputFile OutputFile(OutputFilename, EC, sys::fs::OF_None);
error("Unable to open output file" + OutputFilename, EC);
// Don't remove output file if we exit with an error.
OutputFile.keep();
raw_ostream &OS = OutputFile ? OutputFile->os() : outs();
bool OffsetRequested = false;
// Defaults to dumping all sections, unless brief mode is specified in which
@ -640,15 +635,15 @@ int main(int argc, char **argv) {
if (Verify) {
// If we encountered errors during verify, exit with a non-zero exit status.
if (!all_of(Objects, [&](std::string Object) {
return handleFile(Object, verifyObjectFile, OS);
return handleFile(Object, verifyObjectFile, OutputFile.os());
}))
exit(1);
return 1;
} else if (Statistics)
for (auto Object : Objects)
handleFile(Object, collectStatsForObjectFile, OS);
handleFile(Object, collectStatsForObjectFile, OutputFile.os());
else
for (auto Object : Objects)
handleFile(Object, dumpObjectFile, OS);
handleFile(Object, dumpObjectFile, OutputFile.os());
return EXIT_SUCCESS;
}