projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use getValue instead of getAddress in a few MachO only cases.
[oota-llvm.git]
/
tools
/
llvm-objdump
/
llvm-objdump.cpp
diff --git
a/tools/llvm-objdump/llvm-objdump.cpp
b/tools/llvm-objdump/llvm-objdump.cpp
index d225d4943ec060ecb3e71c639178a1d3b86f0a35..7869818546098d4f783f98fe7f0050e976f11776 100644
(file)
--- a/
tools/llvm-objdump/llvm-objdump.cpp
+++ b/
tools/llvm-objdump/llvm-objdump.cpp
@@
-433,9
+433,10
@@
static std::error_code getRelocationValueString(const COFFObjectFile *Obj,
const RelocationRef &Rel,
SmallVectorImpl<char> &Result) {
symbol_iterator SymI = Rel.getSymbol();
const RelocationRef &Rel,
SmallVectorImpl<char> &Result) {
symbol_iterator SymI = Rel.getSymbol();
-
StringRef SymName
;
- if (std::error_code EC = Sym
I->getName(SymName
))
+
ErrorOr<StringRef> SymNameOrErr = SymI->getName()
;
+ if (std::error_code EC = Sym
NameOrErr.getError(
))
return EC;
return EC;
+ StringRef SymName = *SymNameOrErr;
Result.append(SymName.begin(), SymName.end());
return std::error_code();
}
Result.append(SymName.begin(), SymName.end());
return std::error_code();
}
@@
-455,15
+456,15
@@
static void printRelocationTargetName(const MachOObjectFile *O,
for (const SymbolRef &Symbol : O->symbols()) {
std::error_code ec;
uint64_t Addr;
for (const SymbolRef &Symbol : O->symbols()) {
std::error_code ec;
uint64_t Addr;
-
StringRef Name
;
+
ErrorOr<StringRef> Name = Symbol.getName()
;
if ((ec = Symbol.getAddress(Addr)))
report_fatal_error(ec.message());
if (Addr != Val)
continue;
if ((ec = Symbol.getAddress(Addr)))
report_fatal_error(ec.message());
if (Addr != Val)
continue;
- if (
(ec = Symbol.getName(Name)
))
- report_fatal_error(
ec
.message());
- fmt << Name;
+ if (
std::error_code EC = Name.getError(
))
+ report_fatal_error(
EC
.message());
+ fmt <<
*
Name;
return;
}
return;
}
@@
-493,7
+494,9
@@
static void printRelocationTargetName(const MachOObjectFile *O,
if (isExtern) {
symbol_iterator SI = O->symbol_begin();
advance(SI, Val);
if (isExtern) {
symbol_iterator SI = O->symbol_begin();
advance(SI, Val);
- SI->getName(S);
+ ErrorOr<StringRef> SOrErr = SI->getName();
+ if (!error(SOrErr.getError()))
+ S = *SOrErr;
} else {
section_iterator SI = O->section_begin();
// Adjust for the fact that sections are 1-indexed.
} else {
section_iterator SI = O->section_begin();
// Adjust for the fact that sections are 1-indexed.
@@
-830,10
+833,10
@@
static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
if (Address >= SectSize)
continue;
if (Address >= SectSize)
continue;
-
StringRef Name
;
- if (error(
Symbol.getName(Name
)))
+
ErrorOr<StringRef> Name = Symbol.getName()
;
+ if (error(
Name.getError(
)))
break;
break;
- Symbols.push_back(std::make_pair(Address, Name));
+ Symbols.push_back(std::make_pair(Address,
*
Name));
}
}
}
}
@@
-1121,8
+1124,11
@@
void llvm::PrintSymbolTable(const ObjectFile *o) {
StringRef Name;
if (Type == SymbolRef::ST_Debug && Section != o->section_end()) {
Section->getName(Name);
StringRef Name;
if (Type == SymbolRef::ST_Debug && Section != o->section_end()) {
Section->getName(Name);
- } else if (error(Symbol.getName(Name))) {
- continue;
+ } else {
+ ErrorOr<StringRef> NameOrErr = Symbol.getName();
+ if (error(NameOrErr.getError()))
+ continue;
+ Name = *NameOrErr;
}
bool Global = Flags & SymbolRef::SF_Global;
}
bool Global = Flags & SymbolRef::SF_Global;