Merge pull request #258 from Teemperor/MoveGetUnboundTypeMaster

[upstreaming] Move GetUnboundType to SwiftASTContext

Author: Teemperor

lldb/include/lldb/Symbol/ClangASTContext.h

@@ -692,8 +692,6 @@ class ClangASTContext : public TypeSystem {
   // If the current object represents a typedef type, get the underlying type
   CompilerType GetTypedefedType(lldb::opaque_compiler_type_t type) override;
 
-  CompilerType GetUnboundType(lldb::opaque_compiler_type_t type) override;
-
   static CompilerType RemoveFastQualifiers(const CompilerType &type);
 
   // Create related types using the current type's AST

lldb/include/lldb/Symbol/CompilerType.h

@@ -241,8 +241,6 @@ class CompilerType {
   // If the current object represents a typedef type, get the underlying type
   CompilerType GetTypedefedType() const;
 
-  CompilerType GetUnboundType() const;
-
   // Create related types using the current type's AST
   CompilerType GetBasicTypeFromAST(lldb::BasicType basic_type) const;
 

lldb/include/lldb/Symbol/SwiftASTContext.h

@@ -682,7 +682,9 @@ class SwiftASTContext : public TypeSystem {
   // If the current object represents a typedef type, get the underlying type
   CompilerType GetTypedefedType(void *type) override;
 
-  CompilerType GetUnboundType(lldb::opaque_compiler_type_t type) override;
+  CompilerType GetUnboundType(lldb::opaque_compiler_type_t type);
+
+  std::string GetSuperclassName(const CompilerType &superclass_type);
 
   CompilerType GetTypeForDecl(void *opaque_decl) override;
 

lldb/include/lldb/Symbol/TypeSystem.h

@@ -460,8 +460,6 @@ class TypeSystem : public PluginInterface {
   // If the current object represents a typedef type, get the underlying type
   virtual CompilerType GetTypedefedType(lldb::opaque_compiler_type_t type) = 0;
 
-  virtual CompilerType GetUnboundType(lldb::opaque_compiler_type_t type) = 0;
-
   virtual bool IsVectorType(lldb::opaque_compiler_type_t type,
                             CompilerType *element_type, uint64_t *size) = 0;
 

lldb/source/Symbol/ClangASTContext.cpp

@@ -4997,11 +4997,6 @@ ClangASTContext::GetTypedefedType(lldb::opaque_compiler_type_t type) {
   return CompilerType();
 }
 
-CompilerType
-ClangASTContext::GetUnboundType(lldb::opaque_compiler_type_t type) {
-  return CompilerType(this, GetQualType(type).getAsOpaquePtr());
-}
-
 //----------------------------------------------------------------------
 // Create related types using the current type's AST
 

lldb/source/Symbol/CompilerType.cpp

@@ -486,12 +486,6 @@ CompilerType CompilerType::GetTypedefedType() const {
     return CompilerType();
 }
 
-CompilerType CompilerType::GetUnboundType() const {
-  if (IsValid())
-    return m_type_system->GetUnboundType(m_type);
-  return CompilerType();
-}
-
 //----------------------------------------------------------------------
 // Create related types using the current type's AST
 

lldb/source/Symbol/SwiftASTContext.cpp

@@ -6697,8 +6697,8 @@ static std::string GetTupleElementName(const swift::TupleType *tuple_type,
 }
 
 /// Retrieve the printable name of a type referenced as a superclass.
-static std::string GetSuperclassName(const CompilerType &superclass_type) {
-  return superclass_type.GetUnboundType().GetTypeName().AsCString(
+std::string SwiftASTContext::GetSuperclassName(const CompilerType &superclass_type) {
+  return GetUnboundType(superclass_type.GetOpaqueQualType()).GetTypeName().AsCString(
       "<no type name>");
 }