Merge pull request #1488 from adrian-prantl/should-treat-scalar-next

Hoist SwiftASTContext::IsScalarType into TypeSystemSwift (NFC)

Author: adrian-prantl

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

@@ -5077,12 +5077,6 @@ bool SwiftASTContext::IsPointerOrReferenceType(opaque_compiler_type_t type,
          IsReferenceType(type, pointee_type, nullptr);
 }
 
-bool SwiftASTContext::ShouldTreatScalarValueAsAddress(
-    opaque_compiler_type_t type) {
-  return Flags(GetTypeInfo(type, nullptr))
-      .AnySet(eTypeInstanceIsPointer | eTypeIsReference);
-}
-
 bool SwiftASTContext::IsReferenceType(opaque_compiler_type_t type,
                                       CompilerType *pointee_type,
                                       bool *is_rvalue) {

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

@@ -720,9 +720,6 @@ class SwiftASTContext : public TypeSystemSwift {
   bool IsReferenceType(lldb::opaque_compiler_type_t type,
                        CompilerType *pointee_type, bool *is_rvalue) override;
 
-  bool
-  ShouldTreatScalarValueAsAddress(lldb::opaque_compiler_type_t type) override;
-
   uint32_t GetNumPointeeChildren(lldb::opaque_compiler_type_t type);
 
   bool IsImportedType(lldb::opaque_compiler_type_t type,

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

@@ -88,3 +88,9 @@ bool TypeSystemSwift::IsScalarType(opaque_compiler_type_t type) {
 
   return (GetTypeInfo(type, nullptr) & eTypeIsScalar) != 0;
 }
+
+bool TypeSystemSwift::ShouldTreatScalarValueAsAddress(
+    opaque_compiler_type_t type) {
+  return Flags(GetTypeInfo(type, nullptr))
+      .AnySet(eTypeInstanceIsPointer | eTypeIsReference);
+}

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

@@ -202,6 +202,8 @@ class TypeSystemSwift : public TypeSystem {
                              size_t idx, uint32_t *bit_offset_ptr) override {
     return {};
   }
+  bool
+  ShouldTreatScalarValueAsAddress(lldb::opaque_compiler_type_t type) override;
   /// \}
 protected:
   /// Used in the logs.

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

@@ -1770,8 +1770,3 @@ bool TypeSystemSwiftTypeRef::IsReferenceType(opaque_compiler_type_t type,
   VALIDATE_AND_RETURN(impl, IsReferenceType, type,
                       (ReconstructType(type), pointee_type, is_rvalue));
 }
-bool TypeSystemSwiftTypeRef::ShouldTreatScalarValueAsAddress(
-    opaque_compiler_type_t type) {
-  return m_swift_ast_context->ShouldTreatScalarValueAsAddress(
-      ReconstructType(type));
-}

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

@@ -226,8 +226,6 @@ class TypeSystemSwiftTypeRef : public TypeSystemSwift {
                                          uint32_t *bit_offset_ptr) override;
   bool IsReferenceType(lldb::opaque_compiler_type_t type,
                        CompilerType *pointee_type, bool *is_rvalue) override;
-  bool
-  ShouldTreatScalarValueAsAddress(lldb::opaque_compiler_type_t type) override;
 
   // Swift-specific methods.
   lldb::TypeSP GetCachedType(ConstString mangled) override;

lldb/unittests/Symbol/TestTypeSystemSwiftTypeRef.cpp

@@ -319,3 +319,30 @@ TEST_F(TestTypeSystemSwiftTypeRef, Scalar) {
     ASSERT_TRUE(float_type.IsScalarType());
   }
 }
+
+TEST_F(TestTypeSystemSwiftTypeRef, ScalarAddress) {
+  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_FALSE(int_type.ShouldTreatScalarValueAsAddress());
+  }
+  {
+    NodePointer n = b.GlobalType(b.Node(
+        Node::Kind::InOut,
+        b.Node(Node::Kind::Structure,
+               b.Node(Node::Kind::Module, swift::STDLIB_NAME),
+               b.Node(Node::Kind::Identifier, swift::BUILTIN_TYPE_NAME_INT))));
+    CompilerType r = GetCompilerType(b.Mangle(n));
+    ASSERT_TRUE(r.ShouldTreatScalarValueAsAddress());
+  }
+  {
+    NodePointer n =
+        b.GlobalType(b.Node(Node::Kind::Class, b.Node(Node::Kind::Module, "M"),
+                            b.Node(Node::Kind::Identifier, "C")));
+    CompilerType c = GetCompilerType(b.Mangle(n));
+    ASSERT_TRUE(c.ShouldTreatScalarValueAsAddress());
+  }
+}