Merge pull request #1500 from adrian-prantl/minimum

Hoist SwiftASTContext::GetMinimumLanguage() into TypeSystemSwift (NFC)

Author: adrian-prantl

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

@@ -218,7 +218,7 @@ swift::Type SwiftASTContext::GetSwiftType(opaque_compiler_type_t opaque_type) {
 
 swift::CanType
 SwiftASTContext::GetCanonicalSwiftType(opaque_compiler_type_t opaque_type) {
-  assert(opaque_type && *reinterpret_cast<const char *>(opaque_type) != '$' &&
+  assert(!opaque_type || *reinterpret_cast<const char *>(opaque_type) != '$' &&
          "wrong type system");
   return lldb_private::GetCanonicalSwiftType(CompilerType(this, opaque_type));
 }
@@ -5537,14 +5537,6 @@ SwiftASTContext::GetTypeInfo(opaque_compiler_type_t type,
   return swift_flags;
 }
 
-lldb::LanguageType
-SwiftASTContext::GetMinimumLanguage(opaque_compiler_type_t type) {
-  if (!type)
-    return lldb::eLanguageTypeC;
-
-  return lldb::eLanguageTypeSwift;
-}
-
 lldb::TypeClass SwiftASTContext::GetTypeClass(opaque_compiler_type_t type) {
   VALID_OR_RETURN(lldb::eTypeClassInvalid);
 

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.h

@@ -531,9 +531,6 @@ class SwiftASTContext : public TypeSystemSwift {
   uint32_t GetTypeInfo(lldb::opaque_compiler_type_t type,
                        CompilerType *pointee_or_element_clang_type) override;
 
-  lldb::LanguageType
-  GetMinimumLanguage(lldb::opaque_compiler_type_t type) override;
-
   lldb::TypeClass GetTypeClass(lldb::opaque_compiler_type_t type) override;
 
   // Creating related types

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwift.h

@@ -168,6 +168,10 @@ class TypeSystemSwift : public TypeSystem {
     // TestSwiftStepping were failing because of this Darwin.
     return false;
   }
+  lldb::LanguageType
+  GetMinimumLanguage(lldb::opaque_compiler_type_t type) override {
+    return lldb::eLanguageTypeSwift;
+  }
   unsigned GetTypeQualifiers(lldb::opaque_compiler_type_t type) override {
     return 0;
   }

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp

@@ -1459,10 +1459,6 @@ uint32_t TypeSystemSwiftTypeRef::GetTypeInfo(
   VALIDATE_AND_RETURN(impl, GetTypeInfo, type,
                       (ReconstructType(type), nullptr));
 }
-lldb::LanguageType
-TypeSystemSwiftTypeRef::GetMinimumLanguage(opaque_compiler_type_t type) {
-  return m_swift_ast_context->GetMinimumLanguage(ReconstructType(type));
-}
 lldb::TypeClass
 TypeSystemSwiftTypeRef::GetTypeClass(opaque_compiler_type_t type) {
   return m_swift_ast_context->GetTypeClass(ReconstructType(type));

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.h

@@ -110,8 +110,6 @@ class TypeSystemSwiftTypeRef : public TypeSystemSwift {
   ConstString GetMangledTypeName(lldb::opaque_compiler_type_t type) override;
   uint32_t GetTypeInfo(lldb::opaque_compiler_type_t type,
                        CompilerType *pointee_or_element_clang_type) override;
-  lldb::LanguageType
-  GetMinimumLanguage(lldb::opaque_compiler_type_t type) override;
   lldb::TypeClass GetTypeClass(lldb::opaque_compiler_type_t type) override;
 
   // Creating related types

lldb/unittests/Symbol/TestTypeSystemSwiftTypeRef.cpp

@@ -346,3 +346,14 @@ TEST_F(TestTypeSystemSwiftTypeRef, ScalarAddress) {
     ASSERT_TRUE(c.ShouldTreatScalarValueAsAddress());
   }
 }
+
+TEST_F(TestTypeSystemSwiftTypeRef, LanguageVersion) {
+  using namespace swift::Demangle;
+  Demangler dem;
+  NodeBuilder b(dem);
+  {
+    NodePointer int_node = b.GlobalTypeMangling(b.IntType());
+    CompilerType int_type = GetCompilerType(b.Mangle(int_node));
+    ASSERT_EQ(int_type.GetMinimumLanguage(), lldb::eLanguageTypeSwift);
+  }
+}