From 7120fb9b0ba5474693a56d0f6e632058c9764f84 Mon Sep 17 00:00:00 2001 From: George Rimar Date: Wed, 19 Dec 2018 10:44:49 +0000 Subject: [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') can be converted to 'typename std::remove_reference::type' (aka 'llvm::StringRef') and vice versa Target = Demangle ? demangle(*SymName) : *SymName; llvm-svn: 349617 --- llvm/tools/llvm-objdump/llvm-objdump.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'llvm/tools/llvm-objdump/llvm-objdump.cpp') 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 *Obj, Expected 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*"; -- cgit v1.2.3