Merge pull request #2055 from adrian-prantl/70734497-next

Various GetTypeInfo improvements

Author: adrian-prantl

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

@@ -720,6 +720,21 @@ swift::Demangle::NodePointer TypeSystemSwiftTypeRef::GetDemangleTreeForPrinting(
   return canonical;
 }
 
+/// Determine wether this demangle tree contains an unresolved type alias.
+static bool ContainsGenericTypeParameter(swift::Demangle::NodePointer node) {
+  if (!node)
+    return false;
+
+  if (node->getKind() == swift::Demangle::Node::Kind::DependentGenericParamType)
+    return true;
+
+  for (swift::Demangle::NodePointer child : *node)
+    if (ContainsGenericTypeParameter(child))
+      return true;
+
+  return false;
+}
+
 /// Collect TypeInfo flags from a demangle tree. For most attributes
 /// this can stop scanning at the outmost type, however in order to
 /// determine whether a node is generic or not, it needs to visit all
@@ -770,7 +785,6 @@ static uint32_t collectTypeInfo(SwiftASTContext *module_holder,
     }
   else
     switch (node->getKind()) {
-
     case Node::Kind::SugaredOptional:
       swift_flags |= eTypeIsGeneric | eTypeIsBound | eTypeHasChildren |
                      eTypeHasValue | eTypeIsEnumeration;
@@ -818,8 +832,8 @@ static uint32_t collectTypeInfo(SwiftASTContext *module_holder,
                  node->getText() == swift::BUILTIN_TYPE_NAME_UNKNOWNOBJECT)
           swift_flags |=
               eTypeHasChildren | eTypeIsPointer | eTypeIsScalar | eTypeIsObjC;
-        else if (node->getText() == swift::BUILTIN_TYPE_NAME_FLOAT ||
-                 node->getText() == swift::BUILTIN_TYPE_NAME_FLOAT_PPC)
+        else if (node->getText().startswith(swift::BUILTIN_TYPE_NAME_FLOAT) ||
+                 node->getText().startswith(swift::BUILTIN_TYPE_NAME_FLOAT_PPC))
           swift_flags |= eTypeIsFloat | eTypeIsScalar;
         else if (node->getText().startswith(swift::BUILTIN_TYPE_NAME_VEC))
           swift_flags |= eTypeHasChildren | eTypeIsVector;
@@ -841,8 +855,7 @@ static uint32_t collectTypeInfo(SwiftASTContext *module_holder,
       if (node->getNumChildren() != 2)
         break;
       // Bug-for-bug compatibility.
-      if (!(collectTypeInfo(module_holder, dem, node->getChild(1)) &
-            eTypeIsGenericTypeParam))
+      if (!ContainsGenericTypeParameter(node->getChild(1)))
         swift_flags |= eTypeHasValue | eTypeHasChildren;
       auto module = node->getChild(0);
       if (module->hasText() &&

lldb/unittests/Symbol/TestTypeSystemSwiftTypeRef.cpp

@@ -196,6 +196,49 @@ TEST_F(TestTypeSystemSwiftTypeRef, Function) {
   }
 }
 
+TEST_F(TestTypeSystemSwiftTypeRef, GetTypeInfo) {
+  using namespace swift::Demangle;
+  Demangler dem;
+  NodeBuilder b(dem);
+  {
+    std::string float32;
+    llvm::raw_string_ostream(float32) << swift::BUILTIN_TYPE_NAME_FLOAT << "32";
+    NodePointer n = b.GlobalType(b.Node(Node::Kind::BuiltinTypeName, float32));
+    CompilerType p = GetCompilerType(b.Mangle(n));
+    ASSERT_EQ(p.GetTypeInfo() & (eTypeIsFloat | eTypeIsScalar),
+              eTypeIsFloat | eTypeIsScalar);
+  }
+  {
+    NodePointer n = b.GlobalType(b.Node(
+        Node::Kind::BoundGenericEnum,
+        b.Node(Node::Kind::Type,
+               b.Node(Node::Kind::Enum,
+                      b.Node(Node::Kind::Module, swift::STDLIB_NAME),
+                      b.Node(Node::Kind::Identifier, "Optional"))),
+        b.Node(
+            Node::Kind::TypeList,
+            b.Node(
+                Node::Kind::Type,
+                b.Node(
+                    Node::Kind::BoundGenericStructure,
+                    b.Node(
+                        Node::Kind::Type,
+                        b.Node(Node::Kind::Structure,
+                               b.Node(Node::Kind::Module, swift::STDLIB_NAME),
+                               b.Node(Node::Kind::Identifier,
+                                      "UnsafeMutablePointer"))),
+                    b.Node(Node::Kind::TypeList,
+                           b.Node(Node::Kind::Type,
+                                  b.Node(Node::Kind::DependentGenericParamType,
+                                         b.NodeWithIndex(Node::Kind::Index, 0),
+                                         b.NodeWithIndex(Node::Kind::Index,
+                                                         0)))))))));
+    CompilerType p = GetCompilerType(b.Mangle(n));
+    ASSERT_EQ(p.GetTypeInfo(), (eTypeIsEnumeration | eTypeIsSwift |
+                                eTypeIsGeneric | eTypeIsBound));
+  }
+}
+
 TEST_F(TestTypeSystemSwiftTypeRef, Pointer) {
   using namespace swift::Demangle;
   Demangler dem;