From 2d1e9a6f6b34be745ccebfa48fe803afac0e8540 Mon Sep 17 00:00:00 2001 From: Luke Cheeseman Date: Fri, 23 Nov 2018 11:03:00 +0000 Subject: [PATCH] Revert r343342 together with LLVM commit 347490. llvm-svn: 347491 --- lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.cpp | 4 ++-- lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.cpp index 1d927ba..99becdb 100644 --- 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 --- 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); -- 2.7.4