Hoist SwiftASTContext::IsScalarType into TypeSystemSwift (NFC)

and add a unit test for it.

Author: adrian-prantl

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

@@ -5195,13 +5195,6 @@ bool SwiftASTContext::IsPossibleDynamicType(opaque_compiler_type_t type,
   return false;
 }
 
-bool SwiftASTContext::IsScalarType(opaque_compiler_type_t type) {
-  if (!type)
-    return false;
-
-  return (GetTypeInfo(type, nullptr) & eTypeIsScalar) != 0;
-}
-
 bool SwiftASTContext::IsTypedefType(opaque_compiler_type_t type) {
   if (!type)
     return false;

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

@@ -473,8 +473,6 @@ class SwiftASTContext : public TypeSystemSwift {
   bool IsPointerType(lldb::opaque_compiler_type_t type,
                      CompilerType *pointee_type) override;
 
-  bool IsScalarType(lldb::opaque_compiler_type_t type) override;
-
   bool IsVoidType(lldb::opaque_compiler_type_t type) override;
 
   static bool IsGenericType(const CompilerType &compiler_type);

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

@@ -31,3 +31,10 @@ bool TypeSystemSwift::IsIntegerType(opaque_compiler_type_t type,
                                     bool &is_signed) {
   return (GetTypeInfo(type, nullptr) & eTypeIsInteger);
 }
+
+bool TypeSystemSwift::IsScalarType(opaque_compiler_type_t type) {
+  if (!type)
+    return false;
+
+  return (GetTypeInfo(type, nullptr) & eTypeIsScalar) != 0;
+}

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

@@ -136,6 +136,7 @@ class TypeSystemSwift : public TypeSystem {
                            bool &is_complex) override;
   bool IsIntegerType(lldb::opaque_compiler_type_t type,
                      bool &is_signed) override;
+  bool IsScalarType(lldb::opaque_compiler_type_t type) override;
   bool IsCStringType(lldb::opaque_compiler_type_t type,
                      uint32_t &length) override {
     return false;

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

@@ -1367,9 +1367,6 @@ bool TypeSystemSwiftTypeRef::IsPointerType(opaque_compiler_type_t type,
   VALIDATE_AND_RETURN(impl, IsPointerType, type,
                       (ReconstructType(type), pointee_type));
 }
-bool TypeSystemSwiftTypeRef::IsScalarType(opaque_compiler_type_t type) {
-  return m_swift_ast_context->IsScalarType(ReconstructType(type));
-}
 bool TypeSystemSwiftTypeRef::IsVoidType(opaque_compiler_type_t type) {
   auto impl = [&]() {
     using namespace swift::Demangle;

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

@@ -100,7 +100,6 @@ class TypeSystemSwiftTypeRef : public TypeSystemSwift {
                              bool check_cplusplus, bool check_objc) override;
   bool IsPointerType(lldb::opaque_compiler_type_t type,
                      CompilerType *pointee_type) override;
-  bool IsScalarType(lldb::opaque_compiler_type_t type) override;
   bool IsVoidType(lldb::opaque_compiler_type_t type) override;
   // Type Completion
   bool GetCompleteType(lldb::opaque_compiler_type_t type) override;

lldb/unittests/Symbol/TestTypeSystemSwiftTypeRef.cpp

@@ -264,6 +264,7 @@ TEST_F(TestTypeSystemSwiftTypeRef, Aggregate) {
     NodePointer n = b.GlobalType(b.Node(Node::Kind::Tuple));
     CompilerType tuple = GetCompilerType(b.Mangle(n));
     ASSERT_TRUE(tuple.IsAggregateType());
+    ASSERT_FALSE(tuple.IsScalarType());
     // Yes, Int is a struct.
     NodePointer int_node = b.GlobalTypeMangling(b.IntType());
     CompilerType int_type = GetCompilerType(b.Mangle(int_node));
@@ -289,7 +290,7 @@ TEST_F(TestTypeSystemSwiftTypeRef, Defined) {
   }
 }
 
-TEST_F(TestTypeSystemSwiftTypeRef, IntFloat) {
+TEST_F(TestTypeSystemSwiftTypeRef, Scalar) {
   using namespace swift::Demangle;
   Demangler dem;
   NodeBuilder b(dem);
@@ -303,6 +304,7 @@ TEST_F(TestTypeSystemSwiftTypeRef, IntFloat) {
     ASSERT_EQ(is_complex, false);
     bool is_signed = true;
     ASSERT_TRUE(int_type.IsIntegerType(is_signed));
+    ASSERT_TRUE(int_type.IsScalarType());
   }
   {
     NodePointer float_node = b.GlobalTypeMangling(b.FloatType());
@@ -314,5 +316,6 @@ TEST_F(TestTypeSystemSwiftTypeRef, IntFloat) {
     ASSERT_EQ(is_complex, false);
     bool is_signed = true;
     ASSERT_FALSE(float_type.IsIntegerType(is_signed));
+    ASSERT_TRUE(float_type.IsScalarType());
   }
 }