diff options
| author | Greg Clayton <gclayton@apple.com> | 2012-07-18 23:18:10 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2012-07-18 23:18:10 +0000 |
| commit | 037520e9cf8d2293ce2abfd5d4cde583e79556a6 (patch) | |
| tree | db91a4c957aff985f8d4c870ab482e51a7bb77f1 /lldb/source/Plugins/ObjectFile/Mach-O | |
| parent | 9208abd7c330510238568b0ccb4313e2f90029ac (diff) | |
| download | bcm5719-llvm-037520e9cf8d2293ce2abfd5d4cde583e79556a6.tar.gz bcm5719-llvm-037520e9cf8d2293ce2abfd5d4cde583e79556a6.zip | |
Cleaned up the lldb_private::Mangled class to get rid of the tokenizing code that has bit rotted and isn't being used. Also cleaned up the API to the "lldb_private::Mangled" to always take "const ConstString &" arguments instead of both "const ConstString &" and "const char *".
llvm-svn: 160466
Diffstat (limited to 'lldb/source/Plugins/ObjectFile/Mach-O')
| -rw-r--r-- | lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp index 7d44f8316e6..8b074ce24bd 100644 --- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp +++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp @@ -2520,7 +2520,7 @@ struct lldb_copy_dyld_cache_local_symbols_entry { // We have two consecutive N_SO entries where the first contains a directory // and the second contains a full path. - sym[sym_idx - 1].GetMangled().SetValue(symbol_name, false); + sym[sym_idx - 1].GetMangled().SetValue(ConstString(symbol_name), false); m_nlist_idx_to_sym_idx[nlist_idx] = sym_idx - 1; add_nlist = false; } @@ -2542,7 +2542,7 @@ struct lldb_copy_dyld_cache_local_symbols_entry if (*full_so_path.rbegin() != '/') full_so_path += '/'; full_so_path += symbol_name; - sym[sym_idx - 1].GetMangled().SetValue(full_so_path.c_str(), false); + sym[sym_idx - 1].GetMangled().SetValue(ConstString(full_so_path.c_str()), false); add_nlist = false; m_nlist_idx_to_sym_idx[nlist_idx] = sym_idx - 1; } @@ -2846,8 +2846,8 @@ struct lldb_copy_dyld_cache_local_symbols_entry if (symbol_name_non_abi_mangled) { - sym[sym_idx].GetMangled().SetMangledName (symbol_name_non_abi_mangled); - sym[sym_idx].GetMangled().SetDemangledName (symbol_name); + sym[sym_idx].GetMangled().SetMangledName (ConstString(symbol_name_non_abi_mangled)); + sym[sym_idx].GetMangled().SetDemangledName (ConstString(symbol_name)); } else { @@ -2859,7 +2859,7 @@ struct lldb_copy_dyld_cache_local_symbols_entry if (symbol_name) { - sym[sym_idx].GetMangled().SetValue(symbol_name, symbol_name_is_mangled); + sym[sym_idx].GetMangled().SetValue(ConstString(symbol_name), symbol_name_is_mangled); } } @@ -3065,7 +3065,7 @@ struct lldb_copy_dyld_cache_local_symbols_entry ++synthetic_function_symbol_idx, module_sp->GetFileSpec().GetFilename().GetCString()); sym[sym_idx].SetID (synthetic_sym_id++); - sym[sym_idx].GetMangled().SetDemangledName(synthetic_function_symbol); + sym[sym_idx].GetMangled().SetDemangledName(ConstString(synthetic_function_symbol)); sym[sym_idx].SetType (eSymbolTypeCode); sym[sym_idx].SetIsSynthetic (true); sym[sym_idx].GetAddress() = symbol_addr; |
