Merge pull request #260 from Teemperor/MoveGetInstanceTypeMaster

[upstreaming] Move GetInstanceType to SwiftASTContext

Author: Teemperor

lldb/include/lldb/Symbol/ClangASTContext.h

@@ -648,8 +648,6 @@ class ClangASTContext : public TypeSystem {
 
   CompilerType GetCanonicalType(lldb::opaque_compiler_type_t type) override;
 
-  CompilerType GetInstanceType(lldb::opaque_compiler_type_t type) override;
-
   CompilerType
   GetFullyUnqualifiedType(lldb::opaque_compiler_type_t type) override;
 

lldb/include/lldb/Symbol/CompilerType.h

@@ -181,8 +181,6 @@ class CompilerType {
 
   CompilerType GetCanonicalType() const;
 
-  CompilerType GetInstanceType() const;
-
   CompilerType GetFullyUnqualifiedType() const;
 
   // Returns -1 if this isn't a function of if the function doesn't have a

lldb/include/lldb/Symbol/SwiftASTContext.h

@@ -521,7 +521,8 @@ class SwiftASTContext : public TypeSystem {
 
   CompilerType GetCanonicalType(void *type) override;
 
-  CompilerType GetInstanceType(void *type) override;
+  static CompilerType GetInstanceType(CompilerType ct);
+  CompilerType GetInstanceType(void *type);
 
   // Returns -1 if this isn't a function of if the function doesn't have a
   // prototype. Returns a value >override if there is a prototype.

lldb/include/lldb/Symbol/TypeSystem.h

@@ -261,8 +261,6 @@ class TypeSystem : public PluginInterface {
 
   virtual CompilerType GetCanonicalType(lldb::opaque_compiler_type_t type) = 0;
 
-  virtual CompilerType GetInstanceType(lldb::opaque_compiler_type_t type) = 0;
-
   // Returns -1 if this isn't a function of if the function doesn't have a
   // prototype Returns a value >= 0 if there is a prototype.
   virtual int GetFunctionArgumentCount(lldb::opaque_compiler_type_t type) = 0;

lldb/source/Plugins/ExpressionParser/Swift/SwiftUserExpression.cpp

@@ -223,7 +223,7 @@ void SwiftUserExpression::ScanContext(ExecutionContext &exe_ctx, Status &err) {
   Flags self_type_flags(self_type.GetTypeInfo());
 
   if (self_type_flags.AllSet(lldb::eTypeIsSwift | lldb::eTypeIsMetatype)) {
-    self_type = self_type.GetInstanceType();
+    self_type = SwiftASTContext::GetInstanceType(self_type);
     self_type_flags = self_type.GetTypeInfo();
     if (self_type_flags.Test(lldb::eTypeIsClass))
       m_is_class = true;

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

@@ -1237,7 +1237,7 @@ std::unique_ptr<Language::TypeScavenger> SwiftLanguage::GetTypeScavenger() {
                   CompilerType result_type(result_sp->GetCompilerType());
                   if (Flags(result_type.GetTypeInfo())
                           .AllSet(eTypeIsSwift | eTypeIsMetatype))
-                    result_type = result_type.GetInstanceType();
+                    result_type = SwiftASTContext::GetInstanceType(result_type);
                   results.insert(TypeOrDecl(result_type));
                 }
               }

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

@@ -29,7 +29,8 @@ bool lldb_private::formatters::swift::SwiftMetatype_SummaryProvider(
   lldb::addr_t metadata_ptr = valobj.GetPointerValue();
   if (metadata_ptr == LLDB_INVALID_ADDRESS || metadata_ptr == 0) {
     CompilerType compiler_metatype_type(valobj.GetCompilerType());
-    CompilerType instancetype(compiler_metatype_type.GetInstanceType());
+    CompilerType instancetype =
+      SwiftASTContext::GetInstanceType(compiler_metatype_type);
 
     const char *ptr = instancetype.GetDisplayTypeName().AsCString(nullptr);
     if (ptr && *ptr) {

lldb/source/Symbol/ClangASTContext.cpp

@@ -4538,12 +4538,6 @@ ClangASTContext::GetCanonicalType(lldb::opaque_compiler_type_t type) {
   return CompilerType();
 }
 
-CompilerType ClangASTContext::GetInstanceType(void *type) {
-  if (type)
-    return CompilerType(this, GetQualType(type).getAsOpaquePtr());
-  return CompilerType();
-}
-
 static clang::QualType GetFullyUnqualifiedType_Impl(clang::ASTContext *ast,
                                                     clang::QualType qual_type) {
   if (qual_type->isPointerType())

lldb/source/Symbol/CompilerType.cpp

@@ -374,12 +374,6 @@ CompilerType CompilerType::GetCanonicalType() const {
   return CompilerType();
 }
 
-CompilerType CompilerType::GetInstanceType() const {
-  if (IsValid())
-    return m_type_system->GetInstanceType(m_type);
-  return CompilerType();
-}
-
 CompilerType CompilerType::GetFullyUnqualifiedType() const {
   if (IsValid())
     return m_type_system->GetFullyUnqualifiedType(m_type);

lldb/source/Symbol/SwiftASTContext.cpp

@@ -5880,6 +5880,18 @@ CompilerType SwiftASTContext::GetCanonicalType(void *type) {
   return CompilerType();
 }
 
+CompilerType SwiftASTContext::GetInstanceType(CompilerType ct) {
+  if (!ct)
+    return {};
+
+  SwiftASTContext *ctxt = llvm::dyn_cast<SwiftASTContext>(ct.GetTypeSystem());
+
+  if (!ctxt)
+    return CompilerType();
+
+  return ctxt->GetInstanceType(ct.GetOpaqueQualType());
+}
+
 CompilerType SwiftASTContext::GetInstanceType(void *type) {
   VALID_OR_RETURN(CompilerType());