summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-objdump/llvm-objdump.cpp
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-08-25 18:16:47 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-08-25 18:16:47 +0000
commit3fd1e9933f4bb621ab6706b598830ff125fefe50 (patch)
tree4db6ed12f77a315b32b45962461944b0fbf2dfe5 /llvm/tools/llvm-objdump/llvm-objdump.cpp
parentb709222b8a579a121444485efaa71ea6944eda1d (diff)
downloadbcm5719-llvm-3fd1e9933f4bb621ab6706b598830ff125fefe50.tar.gz
bcm5719-llvm-3fd1e9933f4bb621ab6706b598830ff125fefe50.zip
Modernize raw_fd_ostream's constructor a bit.
Take a StringRef instead of a "const char *". Take a "std::error_code &" instead of a "std::string &" for error. A create static method would be even better, but this patch is already a bit too big. llvm-svn: 216393
Diffstat (limited to 'llvm/tools/llvm-objdump/llvm-objdump.cpp')
-rw-r--r--llvm/tools/llvm-objdump/llvm-objdump.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index 259d00118a3..d23bfec54ca 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -202,10 +202,10 @@ static const Target *getTarget(const ObjectFile *Obj = nullptr) {
static void emitDOTFile(const char *FileName, const MCFunction &f,
MCInstPrinter *IP) {
// Start a new dot file.
- std::string Error;
- raw_fd_ostream Out(FileName, Error, sys::fs::F_Text);
- if (!Error.empty()) {
- errs() << "llvm-objdump: warning: " << Error << '\n';
+ std::error_code EC;
+ raw_fd_ostream Out(FileName, EC, sys::fs::F_Text);
+ if (EC) {
+ errs() << "llvm-objdump: warning: " << EC.message() << '\n';
return;
}
@@ -386,10 +386,10 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
}
}
if (!YAMLCFG.empty()) {
- std::string Error;
- raw_fd_ostream YAMLOut(YAMLCFG.c_str(), Error, sys::fs::F_Text);
- if (!Error.empty()) {
- errs() << ToolName << ": warning: " << Error << '\n';
+ std::error_code EC;
+ raw_fd_ostream YAMLOut(YAMLCFG, EC, sys::fs::F_Text);
+ if (EC) {
+ errs() << ToolName << ": warning: " << EC.message() << '\n';
return;
}
mcmodule2yaml(YAMLOut, *Mod, *MII, *MRI);
OpenPOWER on IntegriCloud