Merge pull request #63396 from Azoy/fix-runtime-attrs-mangling

[Mangling] Fix Runtime Attribute mangling

Author: swift-ci

docs/ABI/Mangling.rst

@@ -348,7 +348,7 @@ Entities
   entity-spec ::= type 'fU' INDEX            // explicit anonymous closure expression
   entity-spec ::= type 'fu' INDEX            // implicit anonymous closure
   entity-spec ::= 'fA' INDEX                 // default argument N+1 generator
-  entity-spec ::= 'fa'                       // runtime discoverable attribute generator
+  entity-spec ::= entity 'fa'                // runtime discoverable attribute generator
   entity-spec ::= 'fi'                       // non-local variable initializer
   entity-spec ::= 'fP'                       // property wrapper backing initializer
   entity-spec ::= 'fW'                       // property wrapper init from projected value

lib/AST/ASTMangler.cpp

@@ -3952,8 +3952,13 @@ void ASTMangler::appendRuntimeAttributeGeneratorEntity(const ValueDecl *decl,
                                                        CustomAttr *attr) {
   auto *attrType = decl->getRuntimeDiscoverableAttrTypeDecl(attr);
 
-  appendEntity(decl, "vp", decl->isStatic());
+  appendContext(attrType, attrType->getAlternateModuleName());
+
+  if (auto dc = dyn_cast<DeclContext>(decl)) {
+    appendContext(dc, decl->getAlternateModuleName());
+  } else {
+    appendEntity(decl);
+  }
+
   appendOperator("fa");
-  appendContextOf(attrType);
-  appendDeclName(attrType);
 }

lib/Demangling/Demangler.cpp

@@ -3574,7 +3574,7 @@ NodePointer Demangler::demangleFunctionEntity() {
     TypeAndMaybePrivateName,
     TypeAndIndex,
     Index,
-    ContextAndName,
+    ContextArg,
   } Args;
 
   Node::Kind Kind = Node::Kind::EmptyList;
@@ -3592,7 +3592,7 @@ NodePointer Demangler::demangleFunctionEntity() {
     case 'u': Args = TypeAndIndex; Kind = Node::Kind::ImplicitClosure; break;
     case 'A': Args = Index; Kind = Node::Kind::DefaultArgumentInitializer; break;
     case 'a':
-      Args = ContextAndName;
+      Args = ContextArg;
       Kind = Node::Kind::RuntimeAttributeGenerator;
       break;
     case 'm': return demangleEntity(Node::Kind::Macro);
@@ -3610,7 +3610,7 @@ NodePointer Demangler::demangleFunctionEntity() {
   }
 
   NodePointer NameOrIndex = nullptr, ParamType = nullptr, LabelList = nullptr,
-              Context = nullptr, Id = nullptr;
+              Context = nullptr;
   switch (Args) {
     case None:
       break;
@@ -3626,9 +3626,8 @@ NodePointer Demangler::demangleFunctionEntity() {
     case Index:
       NameOrIndex = demangleIndexAsNode();
       break;
-    case ContextAndName:
-      Context = demangleOperator();
-      Id = demangleOperator();
+    case ContextArg:
+      Context = popNode();
       break;
   }
   NodePointer Entity = createWithChild(Kind, popContext());
@@ -3647,9 +3646,8 @@ NodePointer Demangler::demangleFunctionEntity() {
       Entity = addChild(Entity, NameOrIndex);
       Entity = addChild(Entity, ParamType);
       break;
-    case ContextAndName:
+    case ContextArg:
       Entity = addChild(Entity, Context);
-      Entity = addChild(Entity, Id);
       break;
   }
   return Entity;

lib/Demangling/NodePrinter.cpp

@@ -3113,11 +3113,14 @@ NodePointer NodePrinter::print(NodePointer Node, unsigned depth,
     Printer << "#_hasSymbol query for ";
     return nullptr;
   case Node::Kind::RuntimeAttributeGenerator:
-    printEntity(Node, depth, asPrefixContext, TypePrinting::NoType,
-                /*hasName*/ false,
-                "runtime attribute generator");
-    Printer << " for attribute = " << Node->getChild(1)->getText() << "."
-            << Node->getChild(2)->getText();
+    Printer << "runtime attribute generator of ";
+
+    print(Node->getChild(1), depth);
+
+    printEntity(Node, depth, asPrefixContext,
+                TypePrinting::NoType, /*hasName*/ false,
+                " for attribute");
+
     return nullptr;
   case Node::Kind::OpaqueReturnTypeIndex:
   case Node::Kind::OpaqueReturnTypeParent:

lib/Demangling/Remangler.cpp

@@ -3640,9 +3640,9 @@ ManglingError
 Remangler::mangleRuntimeAttributeGenerator(Node *node,
                                            unsigned depth) {
   RETURN_IF_ERROR(mangleChildNode(node, 0, depth + 1));
-  Buffer << "fa";
   RETURN_IF_ERROR(mangleChildNode(node, 1, depth + 1));
-  return mangleChildNode(node, 2, depth + 1);
+  Buffer << "fa";
+  return ManglingError::Success;
 }
 
 } // anonymous namespace

test/Demangle/Inputs/manglings.txt

@@ -444,12 +444,13 @@ $s7Library5KlassCTwS ---> #_hasSymbol query for Library.Klass
 $s14swift_ide_test14myColorLiteral3red5green4blue5alphaAA0E0VSf_S3ftcfm ---> swift_ide_test.myColorLiteral(red: Swift.Float, green: Swift.Float, blue: Swift.Float, alpha: Swift.Float) -> swift_ide_test.Color
 $s14swift_ide_test10myFilenamexfm ---> swift_ide_test.myFilename : A
 $s4main4FlagVHa ---> runtime discoverable attribute record for main.Flag
-$s4main4TestV11doSomethingyycvpfaAA4FlagHF ---> accessible function runtime record for runtime attribute generator of main.Test.doSomething : () -> () for attribute = main.Flag
-$s4main10globalTest1a_ySi_SStcvpfaAA4Flag ---> runtime attribute generator of main.globalTest : (a: Swift.Int, _: Swift.String) -> () for attribute = main.Flag
-$s4main4TestV11doSomethingyycvpfaAA4Flag ---> runtime attribute generator of main.Test.doSomething : () -> () for attribute = main.Flag
-$s4main4TestV11doSomethingyycvpZfaAA4Flag ---> runtime attribute generator of static main.Test.doSomething : () -> () for attribute = main.Flag
-$s4main4TestV1xSivpfaAA4Flag ---> runtime attribute generator of main.Test.x : Swift.Int for attribute = main.Flag
-$s4main4TestAaBVmvpfaAA9OtherFlag ---> runtime attribute generator of main.Test : main.Test.Type for attribute = main.OtherFlag
+$s4main4FlagVAA4TestV11doSomethingyycvpfaHF ---> accessible function runtime record for runtime attribute generator of main.Test.doSomething : () -> () for attribute of main.Flag
+$s4main4FlagVAA10globalTest1a_ySi_SStcvpfa ---> runtime attribute generator of main.globalTest : (a: Swift.Int, _: Swift.String) -> () for attribute of main.Flag
+$s4main4FlagVAA4TestV11doSomethingyycvpfa ---> runtime attribute generator of main.Test.doSomething : () -> () for attribute of main.Flag
+$s4main4FlagVAA4TestV11doSomethingyycvpZfa ---> runtime attribute generator of static main.Test.doSomething : () -> () for attribute of main.Flag
+$s4main4FlagVAA4TestV1xSivpfa ---> runtime attribute generator of main.Test.x : Swift.Int for attribute of main.Flag
+$s4main9OtherFlagVAA4TestVfa ---> runtime attribute generator of main.Test for attribute of main.OtherFlag
+$s4main4TestVAA3ABCV4hereyySiFfa ---> runtime attribute generator of main.ABC.here(Swift.Int) -> () for attribute of main.Test
 $s9MacroUser13testStringify1a1bySi_SitF9stringifyfMf1_ ---> freestanding macro expansion #3 of stringify in MacroUser.testStringify(a: Swift.Int, b: Swift.Int) -> ()
 $s9MacroUser016testFreestandingA9ExpansionyyF4Foo3L_V23bitwidthNumberedStructsfMf_6methodfMu0_ ---> unique name #2 of method in freestanding macro expansion #1 of bitwidthNumberedStructs in Foo3 #1 in MacroUser.testFreestandingMacroExpansion() -> ()
 @__swiftmacro_1a13testStringifyAA1bySi_SitF9stringifyfMf_  ---> freestanding macro expansion #1 of stringify in a.testStringify(a: Swift.Int, b: Swift.Int) -> ()