Author: jmolenda
Date: Mon Feb 29 23:34:05 2016
New Revision: 262300
URL: http://llvm.org/viewvc/llvm-project?rev=262300&view=rev
Log:
Update the on-device arm specific code to match the API changes
that happened in other parts of this file so it builds cleanly
for arm again.
Modified:
lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
Modified: lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp?rev=262300&r1=262299&r2=262300&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp (original)
+++ lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp Mon Feb 29
23:34:05 2016
@@ -3080,7 +3080,7 @@ ObjectFileMachO::ParseSymtab ()
{
// This is
usually the second N_SO entry that contains just the filename,
// so here we
combine it with the first one if we are minimizing the symbol table
- const char
*so_path = sym[sym_idx - 1].GetMangled().GetDemangledName().AsCString();
+ const char
*so_path = sym[sym_idx -
1].GetMangled().GetDemangledName(lldb::eLanguageTypeUnknown).AsCString();
if (so_path &&
so_path[0])
{
std::string full_so_path (so_path);
@@ -3467,7 +3467,7 @@ ObjectFileMachO::ParseSymtab ()
sym[sym_idx].GetMangled().SetValue(const_symbol_name, symbol_name_is_mangled);
if (is_gsym &&
is_debug)
{
- const char
*gsym_name =
sym[sym_idx].GetMangled().GetName(Mangled::ePreferMangled).GetCString();
+ const char
*gsym_name = sym[sym_idx].GetMangled().GetName(lldb::eLanguageTypeUnknown,
Mangled::ePreferMangled).GetCString();
if (gsym_name)
N_GSYM_name_to_sym_idx[gsym_name] = sym_idx;
}
@@ -3541,7 +3541,7 @@ ObjectFileMachO::ParseSymtab ()
bool found_it =
false;
for
(ValueToSymbolIndexMap::const_iterator pos = range.first; pos != range.second;
++pos)
{
- if
(sym[sym_idx].GetMangled().GetName(Mangled::ePreferMangled) ==
sym[pos->second].GetMangled().GetName(Mangled::ePreferMangled))
+ if
(sym[sym_idx].GetMangled().GetName(lldb::eLanguageTypeUnknown,
Mangled::ePreferMangled) ==
sym[pos->second].GetMangled().GetName(lldb::eLanguageTypeUnknown,
Mangled::ePreferMangled))
{
m_nlist_idx_to_sym_idx[nlist_idx] = pos->second;
// We just
need the flags from the linker symbol, so put these flags
@@ -3580,7 +3580,7 @@ ObjectFileMachO::ParseSymtab ()
bool found_it =
false;
for
(ValueToSymbolIndexMap::const_iterator pos = range.first; pos != range.second;
++pos)
{
- if
(sym[sym_idx].GetMangled().GetName(Mangled::ePreferMangled) ==
sym[pos->second].GetMangled().GetName(Mangled::ePreferMangled))
+ if
(sym[sym_idx].GetMangled().GetName(lldb::eLanguageTypeUnknown,
Mangled::ePreferMangled) ==
sym[pos->second].GetMangled().GetName(lldb::eLanguageTypeUnknown,
Mangled::ePreferMangled))
{
m_nlist_idx_to_sym_idx[nlist_idx] = pos->second;
// We just
need the flags from the linker symbol, so put these flags
@@ -3597,7 +3597,7 @@ ObjectFileMachO::ParseSymtab ()
}
else
{
- const char
*gsym_name =
sym[sym_idx].GetMangled().GetName(Mangled::ePreferMangled).GetCString();
+ const char
*gsym_name = sym[sym_idx].GetMangled().GetName(lldb::eLanguageTypeUnknown,
Mangled::ePreferMangled).GetCString();
if (gsym_name)
{
// Combine
N_GSYM stab entries with the non stab symbol
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
