Merge pull request #4065 from adrian-prantl/88509698

Remove SwiftASTContext from HashedCollectionConfig::StorageObjectAtAddress()

Author: adrian-prantl

lldb/source/Plugins/Language/Swift/SwiftDictionary.cpp

@@ -45,7 +45,7 @@ DictionaryConfig::DictionaryConfig()
   // still used to name classes in the ObjC runtime.
 
   m_nativeStorageRoot_mangled =
-    ConstString("_TtCs22__RawDictionaryStorage");
+    ConstString("$ss22__RawDictionaryStorageCD");
   m_nativeStorageRoot_demangled =
     ConstString("Swift.__RawDictionaryStorage");
 

lldb/source/Plugins/Language/Swift/SwiftHashedContainer.cpp

@@ -303,10 +303,8 @@ HashedCollectionConfig::StorageObjectAtAddress(
   auto scratch_ctx = reader->get();
   if (!scratch_ctx)
     return nullptr;
-  SwiftASTContext *ast_ctx = scratch_ctx->GetSwiftASTContext();
-
   CompilerType rawStorage_type =
-      ast_ctx->GetTypeFromMangledTypename(m_nativeStorageRoot_mangled);
+      scratch_ctx->GetTypeFromMangledTypename(m_nativeStorageRoot_mangled);
   if (!rawStorage_type.IsValid())
     return nullptr;
 

lldb/source/Plugins/Language/Swift/SwiftSet.cpp

@@ -46,7 +46,7 @@ SetConfig::SetConfig()
   // still used to name classes in the ObjC runtime.
 
   m_nativeStorageRoot_mangled =
-    ConstString("_TtCs15__RawSetStorage");
+    ConstString("$ss15__RawSetStorageCD");
   m_nativeStorageRoot_demangled =
     ConstString("Swift.__RawSetStorage");