Revert r343342 together with LLVM commit 347490.

llvm-svn: 347491

diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.cpp
index 1d927ba..99becdb 100644 (file)
--- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.cpp
@@ -504,9 +504,9 @@ const char *DW_MACINFO_value_to_name(uint32_t val) {
   return llvmstr.data();
 }
 
-const char *DW_CFA_value_to_name(uint32_t val) {
+const char *DW_CFA_value_to_name(uint32_t val, llvm::Triple::ArchType Arch) {
   static char invalid[100];
-  llvm::StringRef llvmstr = llvm::dwarf::CallFrameString(val);
+  llvm::StringRef llvmstr = llvm::dwarf::CallFrameString(val, Arch);
   if (llvmstr.empty()) {
     snprintf(invalid, sizeof(invalid), "Unknown DW_CFA constant: 0x%x", val);
     return invalid;

diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.h b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.h
index 926f83b..edde869 100644 (file)
--- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.h
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.h
@@ -64,7 +64,7 @@ const char *DW_LNE_value_to_name(uint32_t val);
 
 const char *DW_MACINFO_value_to_name(uint32_t val);
 
-const char *DW_CFA_value_to_name(uint32_t val);
+const char *DW_CFA_value_to_eame(uint32_t val, llvm::Triple::ArchType Arch);
 
 const char *DW_GNU_EH_PE_value_to_name(uint32_t val);