diff options
| author | George Rimar <grimar@accesssoftek.com> | 2018-12-19 10:44:49 +0000 |
|---|---|---|
| committer | George Rimar <grimar@accesssoftek.com> | 2018-12-19 10:44:49 +0000 |
| commit | 7120fb9b0ba5474693a56d0f6e632058c9764f84 (patch) | |
| tree | cec9a22cbb32dba56e0532cba86b2ccfb5a58f25 | |
| parent | 2072b5afbec0e7e4a56c99bc47dabf086efc8ee9 (diff) | |
| download | bcm5719-llvm-7120fb9b0ba5474693a56d0f6e632058c9764f84.tar.gz bcm5719-llvm-7120fb9b0ba5474693a56d0f6e632058c9764f84.zip | |
[llvm-objdump] - Fix one more BB.
Should fix the http://lab.llvm.org:8011/builders/polly-amd64-linux/builds/25876/steps/build/logs/stdio:
/home/grosser/buildslave/polly-amd64-linux/llvm.src/tools/llvm-objdump/llvm-objdump.cpp:539:25: error: conditional expression is ambiguous; 'std::string' (aka 'basic_string<char>') can be converted to 'typename std::remove_reference<StringRef>::type' (aka 'llvm::StringRef') and vice versa
Target = Demangle ? demangle(*SymName) : *SymName;
llvm-svn: 349617
| -rw-r--r-- | llvm/tools/llvm-objdump/llvm-objdump.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index 503ef7fe97d..e15f79cc2b8 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -536,7 +536,10 @@ static std::error_code getRelocationValueString(const ELFObjectFile<ELFT> *Obj, Expected<StringRef> SymName = symb->getName(StrTab); if (!SymName) return errorToErrorCode(SymName.takeError()); - Target = Demangle ? demangle(*SymName) : *SymName; + if (Demangle) + Target = demangle(*SymName); + else + Target = *SymName; } } else Target = "*ABS*"; |
