projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some cases where StringRef was being passed by const reference. Remove const...
[oota-llvm.git]
/
tools
/
llvm-dwarfdump
/
llvm-dwarfdump.cpp
diff --git
a/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
b/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
index 29f0c8707a5b6ad7d8cbf58ef1b96dc503ab942c..b4aeb6b8d4aa2ae48c808ee9cff680751283b01c 100644
(file)
--- a/
tools/llvm-dwarfdump/llvm-dwarfdump.cpp
+++ b/
tools/llvm-dwarfdump/llvm-dwarfdump.cpp
@@
-65,25
+65,28
@@
DumpType("debug-dump", cl::init(DIDT_All),
clEnumValN(DIDT_StrOffsetsDwo, "str_offsets.dwo", ".debug_str_offsets.dwo"),
clEnumValEnd));
clEnumValN(DIDT_StrOffsetsDwo, "str_offsets.dwo", ".debug_str_offsets.dwo"),
clEnumValEnd));
-static void DumpInput(const StringRef &Filename) {
- std::unique_ptr<MemoryBuffer> Buff;
+static void DumpInput(StringRef Filename) {
+ ErrorOr<std::unique_ptr<MemoryBuffer>> BuffOrErr =
+ MemoryBuffer::getFileOrSTDIN(Filename);
- if (std::error_code
ec = MemoryBuffer::getFileOrSTDIN(Filename, Buff
)) {
- errs() << Filename << ": " <<
ec
.message() << "\n";
+ if (std::error_code
EC = BuffOrErr.getError(
)) {
+ errs() << Filename << ": " <<
EC
.message() << "\n";
return;
}
return;
}
+ std::unique_ptr<MemoryBuffer> Buff = std::move(BuffOrErr.get());
- ErrorOr<ObjectFile*> ObjOrErr(ObjectFile::createObjectFile(Buff.release()));
+ ErrorOr<std::unique_ptr<ObjectFile>> ObjOrErr =
+ ObjectFile::createObjectFile(Buff->getMemBufferRef());
if (std::error_code EC = ObjOrErr.getError()) {
errs() << Filename << ": " << EC.message() << '\n';
return;
}
if (std::error_code EC = ObjOrErr.getError()) {
errs() << Filename << ": " << EC.message() << '\n';
return;
}
-
std::unique_ptr<ObjectFile> Obj(ObjOrErr.get()
);
+
ObjectFile &Obj = *ObjOrErr.get(
);
- std::unique_ptr<DIContext> DICtx(DIContext::getDWARFContext(Obj
.get()
));
+ std::unique_ptr<DIContext> DICtx(DIContext::getDWARFContext(Obj));
outs() << Filename
outs() << Filename
- << ":\tfile format " << Obj
->
getFileFormatName() << "\n\n";
+ << ":\tfile format " << Obj
.
getFileFormatName() << "\n\n";
// Dump the complete DWARF structure.
DICtx->dump(outs(), DumpType);
}
// Dump the complete DWARF structure.
DICtx->dump(outs(), DumpType);
}