[Lldb-commits] [lldb] r160539 - /lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp

[Jason Molenda]

Author: jmolenda
Date: Thu Jul 19 22:35:44 2012
New Revision: 160539

URL: http://llvm.org/viewvc/llvm-project?rev=160539&view=rev
Log:
Change the things we pass to Mangled::SetValue to be ConstStrings instead of 
char*'s - Greg removed the methods which accept char*'s earlier today.

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=160539&r1=160538&r2=160539&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp (original)
+++ lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp Thu Jul 19 22:35:44 2012
@@ -1801,7 +1801,7 @@
                                                                 {
                                                                     // 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;
                                                                 }
@@ -1823,7 +1823,7 @@
                                                                     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;
                                                                 }
@@ -2127,8 +2127,8 @@
                                                 
                                                 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
                                                 {
@@ -2140,7 +2140,7 @@
                                                     
                                                     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);
                                                     }
                                                 }