Merge commit 'bbea9d7fa920' from swift/release/6.2 into stable/20240723

Author: git apple-llvm automerger

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

@@ -3057,9 +3057,8 @@ bool TypeSystemSwiftTypeRef::IsFunctionType(opaque_compiler_type_t type) {
     using namespace swift::Demangle;
     Demangler dem;
     NodePointer node = DemangleCanonicalOutermostType(dem, type);
-    // Note: There are a number of other candidates, and this list may need
-    // updating. Ex: `NoEscapeFunctionType`, `ThinFunctionType`, etc.
     return node && (node->getKind() == Node::Kind::FunctionType ||
+                    node->getKind() == Node::Kind::ThinFunctionType ||
                     node->getKind() == Node::Kind::NoEscapeFunctionType ||
                     node->getKind() == Node::Kind::ImplFunctionType);
   };

lldb/unittests/Symbol/TestTypeSystemSwiftTypeRef.cpp

@@ -148,6 +148,18 @@ TEST_F(TestTypeSystemSwiftTypeRef, Function) {
     ASSERT_TRUE(void_void.IsFunctionPointerType());
     ASSERT_EQ(void_void.GetNumberOfFunctionArguments(), 0UL);
   }
+  {
+    NodePointer n = b.GlobalType(
+        b.Node(Node::Kind::ThinFunctionType,
+               b.Node(Node::Kind::ArgumentTuple,
+                      b.Node(Node::Kind::Type, b.Node(Node::Kind::Tuple))),
+               b.Node(Node::Kind::ReturnType,
+                      b.Node(Node::Kind::Type, b.Node(Node::Kind::Tuple)))));
+    CompilerType void_void = GetCompilerType(b.Mangle(n));
+    ASSERT_TRUE(void_void.IsFunctionType());
+    ASSERT_TRUE(void_void.IsFunctionPointerType());
+    ASSERT_EQ(void_void.GetNumberOfFunctionArguments(), 0UL);
+  }
   {
     NodePointer n = b.GlobalType(
         b.Node(Node::Kind::ImplFunctionType, b.Node(Node::Kind::ImplEscaping),