[upstreaming] Move GetGenericArgumentType to SwiftASTContext

lldb/include/lldb/Symbol/CompilerType.h

@@ -331,8 +331,6 @@ class CompilerType {
   lldb::TemplateArgumentKind GetTemplateArgumentKind(size_t idx) const;
   CompilerType GetTypeTemplateArgument(size_t idx) const;
 
-  CompilerType GetGenericArgumentType(size_t idx) const;
-
   // Returns the value of the template argument and its type.
   llvm::Optional<IntegralTemplateArgument>
   GetIntegralTemplateArgument(size_t idx) const;

lldb/include/lldb/Symbol/SwiftASTContext.h

@@ -599,7 +599,8 @@ class SwiftASTContext : public TypeSystem {
   lldb::GenericKind GetGenericArgumentKind(void *type, size_t idx);
   CompilerType GetUnboundGenericType(void *type, size_t idx);
   CompilerType GetBoundGenericType(void *type, size_t idx);
-  CompilerType GetGenericArgumentType(void *type, size_t idx) override;
+  static CompilerType GetGenericArgumentType(CompilerType ct, size_t idx);
+  CompilerType GetGenericArgumentType(void *type, size_t idx);
 
   CompilerType GetTypeForFormatters(void *type) override;
 

lldb/include/lldb/Symbol/TypeSystem.h

@@ -386,8 +386,6 @@ class TypeSystem : public PluginInterface {
   virtual llvm::Optional<CompilerType::IntegralTemplateArgument>
   GetIntegralTemplateArgument(lldb::opaque_compiler_type_t type, size_t idx);
 
-  virtual CompilerType GetGenericArgumentType(void *type, size_t idx);
-
   // Dumping types
 
 #ifndef NDEBUG

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

@@ -342,7 +342,7 @@ SwiftArrayBufferHandler::CreateBufferHandler(ValueObject &valobj) {
         swift_runtime->GetMetadataPromise(argmetadata_ptr, valobj));
     if (promise_sp)
       if (CompilerType type = promise_sp->FulfillTypePromise())
-        argument_type = type.GetGenericArgumentType(0);
+        argument_type = SwiftASTContext::GetGenericArgumentType(type, 0);
 
     if (!argument_type.IsValid())
       return nullptr;

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

@@ -366,8 +366,8 @@ HashedCollectionConfig::CreateNativeHandler(
   }
 
   if (typeName.startswith(m_nativeStorage_demangledPrefix.GetStringRef())) {
-    auto key_type = type.GetGenericArgumentType(0);
-    auto value_type = type.GetGenericArgumentType(1);
+    auto key_type = SwiftASTContext::GetGenericArgumentType(type, 0);
+    auto value_type = SwiftASTContext::GetGenericArgumentType(type, 1);
     if (key_type.IsValid()) {
       return _CreateNativeHandler(dynamic_storage_sp, key_type, value_type);
     }
@@ -377,8 +377,8 @@ HashedCollectionConfig::CreateNativeHandler(
   // is some valid storage class instance, and attempt to get
   // key/value types from value_sp.
   type = value_sp->GetCompilerType();
-  CompilerType key_type = type.GetGenericArgumentType(0);
-  CompilerType value_type = type.GetGenericArgumentType(1);
+  CompilerType key_type = SwiftASTContext::GetGenericArgumentType(type, 0);
+  CompilerType value_type = SwiftASTContext::GetGenericArgumentType(type, 1);
   if (key_type.IsValid()) {
     return _CreateNativeHandler(storage_sp, key_type, value_type);
   }

lldb/source/Symbol/CompilerType.cpp

@@ -711,13 +711,6 @@ CompilerType CompilerType::GetTypeTemplateArgument(size_t idx) const {
   return CompilerType();
 }
 
-CompilerType CompilerType::GetGenericArgumentType(size_t idx) const {
-  if (IsValid()) {
-    return m_type_system->GetGenericArgumentType(m_type, idx);
-  }
-  return CompilerType();
-}
-
 llvm::Optional<CompilerType::IntegralTemplateArgument>
 CompilerType::GetIntegralTemplateArgument(size_t idx) const {
   if (IsValid())

lldb/source/Symbol/SwiftASTContext.cpp

@@ -7724,6 +7724,18 @@ CompilerType SwiftASTContext::GetUnboundGenericType(void *type, size_t idx) {
   return {};
 }
 
+CompilerType SwiftASTContext::GetGenericArgumentType(CompilerType ct, size_t idx) {
+  if (!ct)
+    return {};
+
+  SwiftASTContext *ctxt = llvm::dyn_cast<SwiftASTContext>(ct.GetTypeSystem());
+
+  if (!ctxt)
+    return CompilerType();
+
+  return ctxt->GetGenericArgumentType(ct.GetOpaqueQualType(), idx);
+}
+
 CompilerType SwiftASTContext::GetGenericArgumentType(void *type, size_t idx) {
   VALID_OR_RETURN(CompilerType());
 

lldb/source/Symbol/TypeSystem.cpp

@@ -141,10 +141,6 @@ CompilerType TypeSystem::GetTypeTemplateArgument(opaque_compiler_type_t type,
   return CompilerType();
 }
 
-CompilerType TypeSystem::GetGenericArgumentType(void *type, size_t idx) {
-  return CompilerType();
-}
-
 llvm::Optional<CompilerType::IntegralTemplateArgument>
 TypeSystem::GetIntegralTemplateArgument(opaque_compiler_type_t type,
                                         size_t idx) {