Merge pull request #61330 from al45tair/eng/PR-100424460

[Demangler] Fix isThunkSymbol() to handle continuations.

Author: al45tair

lib/Demangling/Context.cpp

@@ -94,9 +94,24 @@ static llvm::StringRef stripSuffix(llvm::StringRef Name) {
   return Name;
 }
 
+// Removes a 'TQ<index>' or 'TY<index>' from \p Name.
+static llvm::StringRef stripAsyncContinuation(llvm::StringRef Name) {
+  if (!Name.endswith("_"))
+    return Name;
+
+  StringRef Stripped = Name.drop_back();
+  while (!Stripped.empty() && swift::Mangle::isDigit(Stripped.back()))
+    Stripped = Stripped.drop_back();
+
+  if (Stripped.endswith("TQ") || Stripped.endswith("TY"))
+    return Stripped.drop_back(2);
+
+  return Name;
+}
+
 bool Context::isThunkSymbol(llvm::StringRef MangledName) {
   if (isMangledName(MangledName)) {
-    MangledName = stripSuffix(MangledName);
+    MangledName = stripAsyncContinuation(stripSuffix(MangledName));
     // First do a quick check
     if (MangledName.endswith("TA") ||  // partial application forwarder
         MangledName.endswith("Ta") ||  // ObjC partial application forwarder
@@ -152,6 +167,9 @@ std::string Context::getThunkTarget(llvm::StringRef MangledName) {
     if (stripSuffix(MangledName) != MangledName)
       return std::string();
 
+    // Ignore any async continuation suffix
+    MangledName = stripAsyncContinuation(MangledName);
+
     // The targets of those thunks not derivable from the mangling.
     if (MangledName.endswith("TR") ||
         MangledName.endswith("Tr") ||

test/Demangle/Inputs/manglings.txt

@@ -434,3 +434,8 @@ $s4test3fooyyAA1P_pSS1TAaCPRts_Si1UAERtsXPF ---> test.foo(any test.P<Self.test.P
 $s4test3FooVAAyyAA1P_pF ---> test.Foo.test(test.P) -> ()
 $sxxxIxzCXxxxesy -> $sxxxIxzCXxxxesy
 $Sxxx_x_xxIxzCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC$x -> $Sxxx_x_xxIxzCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC$x
+$sxIeghHr_xs5Error_pIegHrzo_s8SendableRzs5NeverORs_r0_lTRTATQ0_ ---> {T:$sxIeghHr_xs5Error_pIegHrzo_s8SendableRzs5NeverORs_r0_lTR} (1) await resume partial function for partial apply forwarder for reabstraction thunk helper <A, B where A: Swift.Sendable, B == Swift.Never> from @escaping @callee_guaranteed @Sendable @async () -> (@out A) to @escaping @callee_guaranteed @async () -> (@out A, @error @owned Swift.Error)
+$sxIeghHr_xs5Error_pIegHrzo_s8SendableRzs5NeverORs_r0_lTRTQ0_ ---> {T:} (1) await resume partial function for reabstraction thunk helper <A, B where A: Swift.Sendable, B == Swift.Never> from @escaping @callee_guaranteed @Sendable @async () -> (@out A) to @escaping @callee_guaranteed @async () -> (@out A, @error @owned Swift.Error)
+$sxIeghHr_xs5Error_pIegHrzo_s8SendableRzs5NeverORs_r0_lTRTY0_ ---> {T:} (1) suspend resume partial function for reabstraction thunk helper <A, B where A: Swift.Sendable, B == Swift.Never> from @escaping @callee_guaranteed @Sendable @async () -> (@out A) to @escaping @callee_guaranteed @async () -> (@out A, @error @owned Swift.Error)
+$sxIeghHr_xs5Error_pIegHrzo_s8SendableRzs5NeverORs_r0_lTRTY_ ---> {T:} (0) suspend resume partial function for reabstraction thunk helper <A, B where A: Swift.Sendable, B == Swift.Never> from @escaping @callee_guaranteed @Sendable @async () -> (@out A) to @escaping @callee_guaranteed @async () -> (@out A, @error @owned Swift.Error)
+$sxIeghHr_xs5Error_pIegHrzo_s8SendableRzs5NeverORs_r0_lTRTQ12_ ---> {T:} (13) await resume partial function for reabstraction thunk helper <A, B where A: Swift.Sendable, B == Swift.Never> from @escaping @callee_guaranteed @Sendable @async () -> (@out A) to @escaping @callee_guaranteed @async () -> (@out A, @error @owned Swift.Error)