Merge pull request #71658 from rjmccall/isolated-any-mangling

Fix and test the mangling of @isolated(any) function types

Author: rjmccall

include/swift/AST/ExtInfo.h

@@ -127,7 +127,7 @@ class FunctionTypeIsolation {
 enum class SILFunctionTypeIsolation {
   /// We don't normally record isolation in SIL function types,
   /// so the empty case here is "unknown".
-  Unknown, 
+  Unknown,
 
   /// The isolation of the function has been statically erased.
   /// This corresponds to @isolated(any).

lib/AST/ASTMangler.cpp

@@ -2840,9 +2840,20 @@ void ASTMangler::appendFunctionSignature(AnyFunctionType *fn,
     break;
   }
 
-  if (Type globalActor = fn->getGlobalActor()) {
-    appendType(globalActor, sig);
+  auto isolation = fn->getIsolation();
+  switch (isolation.getKind()) {
+  case FunctionTypeIsolation::Kind::NonIsolated:
+    break;
+  case FunctionTypeIsolation::Kind::Parameter:
+    // Parameter isolation is already mangled in the parameters.
+    break;
+  case FunctionTypeIsolation::Kind::GlobalActor:
+    appendType(isolation.getGlobalActorType(), sig);
     appendOperator("Yc");
+    break;
+  case FunctionTypeIsolation::Kind::Erased:
+    appendOperator("YA");
+    break;
   }
 
   if (auto *afd = dyn_cast_or_null<AbstractFunctionDecl>(forDecl)) {

lib/Demangling/NodePrinter.cpp

@@ -885,7 +885,7 @@ class NodePrinter {
     }
     if (node->getChild(startIndex)->getKind()
             == Node::Kind::IsolatedAnyFunctionType) {
-      Printer << "@isolated(any) ";
+      print(node->getChild(startIndex), depth + 1);
       ++startIndex;
     }
     if (node->getChild(startIndex)->getKind() ==

test/Demangle/Inputs/manglings.txt

@@ -453,8 +453,9 @@ $s9MacroUser016testFreestandingA9ExpansionyyF4Foo3L_V23bitwidthNumberedStructsfM
 @__swiftmacro_9MacroUser16MemberNotCoveredV33_4361AD9339943F52AE6186DD51E04E91Ll0dE0fMf0_ ---> freestanding macro expansion #2 of NotCovered(in _4361AD9339943F52AE6186DD51E04E91) in MacroUser.MemberNotCovered
 $sxSo8_NSRangeVRlzCRl_Cr0_llySo12ModelRequestCyxq_GIsPetWAlYl_TC ---> coroutine continuation prototype for @escaping @convention(thin) @convention(witness_method) @yield_once <A, B where A: AnyObject, B: AnyObject> @substituted <A> (@inout A) -> (@yields @inout __C._NSRange) for <__C.ModelRequest<A, B>>
 $SyyySGSS_IIxxxxx____xsIyFSySIxx_@xIxx____xxI ---> $SyyySGSS_IIxxxxx____xsIyFSySIxx_@xIxx____xxI
-$s12typed_throws15rethrowConcreteyyAA7MyErrorOYKF --> typed_throws.rethrowConcrete() throws(typed_throws.MyError) -> ()
+$s12typed_throws15rethrowConcreteyyAA7MyErrorOYKF ---> typed_throws.rethrowConcrete() throws(typed_throws.MyError) -> ()
 $s28implicit_lifetime_dependence10BufferViewVyA2ChYlscfC ---> {T:$s28implicit_lifetime_dependence10BufferViewVyA2ChYlscfc} implicit_lifetime_dependence.BufferView.init(lifetime dependence: scope __shared implicit_lifetime_dependence.BufferView) -> implicit_lifetime_dependence.BufferView
 $s28implicit_lifetime_dependence10BufferViewVyA2CYlicfC ---> {T:$s28implicit_lifetime_dependence10BufferViewVyA2CYlicfc} implicit_lifetime_dependence.BufferView.init(lifetime dependence: inherit implicit_lifetime_dependence.BufferView) -> implicit_lifetime_dependence.BufferView
 $s28implicit_lifetime_dependence7WrapperV8getView1AA10BufferViewVyYLsF ---> implicit_lifetime_dependence.Wrapper.getView1(self lifetime dependence: scope) () -> implicit_lifetime_dependence.BufferView
 $s28implicit_lifetime_dependence7WrapperV8getView2AA10BufferViewVyYLiF ---> implicit_lifetime_dependence.Wrapper.getView2(self lifetime dependence: inherit) () -> implicit_lifetime_dependence.BufferView
+$s3red3use2fnySiyYAXE_tF ---> red.use(fn: @isolated(any) () -> Swift.Int) -> ()