commit 149f6eaed9818057b83d8f0b17bb5e8764a13143
author Mehdi Amini <mehdi.amini@apple.com> Wed Oct 05 05:59:29 2016 +0000
committer Mehdi Amini <mehdi.amini@apple.com> Wed Oct 05 05:59:29 2016 +0000
tree b0b1a0063de2bc0dfc3db17266a1d477be54c844
parent efe40389c0e82cf173f88979c56420dfeba6b8ed

Re-commit "Use StringRef in Support/Darf APIs (NFC)"

This reverts commit r283285 and re-commit r283275 with
a fix for format("%s", Str); where Str is a StringRef.

llvm-svn: 283298

llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp

diff --git a/llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
index 4253401..046559e 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
@@ -394,13 +394,15 @@
   OperandType Type = OpTypes[Opcode][OperandIdx];
 
   switch (Type) {
-  case OT_Unset:
+  case OT_Unset: {
     OS << " Unsupported " << (OperandIdx ? "second" : "first") << " operand to";
-    if (const char *OpcodeName = CallFrameString(Opcode))
+    auto OpcodeName = CallFrameString(Opcode);
+    if (!OpcodeName.empty())
       OS << " " << OpcodeName;
     else
       OS << format(" Opcode %x",  Opcode);
     break;
+  }
   case OT_None:
     break;
   case OT_Address: