Modified the Objective-C type map in SymbolFileSymtab

to use ConstStrings.  The const char*s were assumed to
be from ConstStrings before, but since storing a full-on
ConstString is no more expensive than storing a const
char* it makes better sense to enforce uniqueness with
the type checker.

llvm-svn: 145688

2 files changed, 3 insertions, 3 deletions

diff --git a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp
index 891cb49c0ea..a44d092f7df 100644
--- a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp
+++ b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp
@@ -396,7 +396,7 @@ SymbolFileSymtab::FindTypes (const lldb_private::SymbolContext& sc, const lldb_p
     
     if (HasObjCSymbols())
     {
-        TypeMap::iterator iter = m_objc_class_types.find(name.AsCString());
+        TypeMap::iterator iter = m_objc_class_types.find(name);
         
         if (iter != m_objc_class_types.end())
         {
@@ -510,7 +510,7 @@ SymbolFileSymtab::FindTypes (const lldb_private::SymbolContext& sc, const lldb_p
                                     objc_object_type,
                                     Type::eResolveStateFull));
         
-        m_objc_class_types[name.AsCString()] = type;
+        m_objc_class_types[name] = type;
         
         types.Insert(type);
         
diff --git a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h
index d7cdf1a4d22..a913014d188 100644
--- a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h
+++ b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h
@@ -126,7 +126,7 @@ protected:
     std::vector<uint32_t>   m_data_indexes;
     std::vector<uint32_t>   m_addr_indexes; // Anything that needs to go into an search by address
     
-    typedef std::map<const char *, lldb::TypeSP> TypeMap;
+    typedef std::map<lldb_private::ConstString, lldb::TypeSP> TypeMap;
     
     TypeMap                 m_objc_class_types;