From: George Rimar <grimar@accesssoftek.com>
Date: Wed, 19 Dec 2018 10:44:49 +0000 (+0000)
Subject: [llvm-objdump] - Fix one more BB.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96c60eab748dda93a117660836dbc2e026af315d;p=llvm

[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;

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@349617 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp
index 503ef7fe97d..e15f79cc2b8 100644
--- a/tools/llvm-objdump/llvm-objdump.cpp
+++ b/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*";