Skip to content

Commit 0ab131c

Browse files
committed
[Mangling] NFC: Remove mangling logic and Ha postfix used by @runtimeMetadata records
1 parent b37cebb commit 0ab131c

File tree

7 files changed

+1
-67
lines changed

7 files changed

+1
-67
lines changed

docs/ABI/Mangling.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ Globals
150150
#endif
151151
global ::= protocol-conformance 'Hc' // protocol conformance runtime record
152152
global ::= global 'HF' // accessible function runtime record
153-
global ::= global 'Ha' // runtime discoverable attribute record
154153

155154
global ::= nominal-type 'Mo' // class metadata immediate member base offset
156155

include/swift/Demangling/DemangleNodes.def

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,6 @@ NODE(SymbolicExtendedExistentialType)
365365
// Added in Swift 5.8
366366
NODE(MetatypeParamsRemoved)
367367
NODE(HasSymbolQuery)
368-
NODE(RuntimeDiscoverableAttributeRecord)
369-
CONTEXT_NODE(RuntimeAttributeGenerator)
370368
NODE(OpaqueReturnTypeIndex)
371369
NODE(OpaqueReturnTypeParent)
372370

lib/Demangling/Demangler.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ bool swift::Demangle::isFunctionAttr(Node::Kind kind) {
151151
case Node::Kind::BackDeploymentThunk:
152152
case Node::Kind::BackDeploymentFallback:
153153
case Node::Kind::HasSymbolQuery:
154-
case Node::Kind::RuntimeDiscoverableAttributeRecord:
155154
return true;
156155
default:
157156
return false;
@@ -947,7 +946,6 @@ NodePointer Demangler::demangleOperator() {
947946
case 'H':
948947
switch (char c2 = nextChar()) {
949948
case 'A': return demangleDependentProtocolConformanceAssociated();
950-
case 'a': return createNode(Node::Kind::RuntimeDiscoverableAttributeRecord);
951949
case 'C': return demangleConcreteProtocolConformance();
952950
case 'D': return demangleDependentProtocolConformanceRoot();
953951
case 'I': return demangleDependentProtocolConformanceInherited();
@@ -1948,7 +1946,6 @@ bool Demangle::nodeConsumesGenericArgs(Node *node) {
19481946
case Node::Kind::PropertyWrapperBackingInitializer:
19491947
case Node::Kind::PropertyWrapperInitFromProjectedValue:
19501948
case Node::Kind::Static:
1951-
case Node::Kind::RuntimeAttributeGenerator:
19521949
return false;
19531950
default:
19541951
return true;
@@ -3765,10 +3762,6 @@ NodePointer Demangler::demangleFunctionEntity() {
37653762
case 'U': Args = TypeAndIndex; Kind = Node::Kind::ExplicitClosure; break;
37663763
case 'u': Args = TypeAndIndex; Kind = Node::Kind::ImplicitClosure; break;
37673764
case 'A': Args = Index; Kind = Node::Kind::DefaultArgumentInitializer; break;
3768-
case 'a':
3769-
Args = ContextArg;
3770-
Kind = Node::Kind::RuntimeAttributeGenerator;
3771-
break;
37723765
case 'm': return demangleEntity(Node::Kind::Macro);
37733766
case 'M': return demangleMacroExpansion();
37743767
case 'p': return demangleEntity(Node::Kind::GenericTypeParamDecl);

lib/Demangling/NodePrinter.cpp

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -625,8 +625,6 @@ class NodePrinter {
625625
case Node::Kind::NonUniqueExtendedExistentialTypeShapeSymbolicReference:
626626
case Node::Kind::SymbolicExtendedExistentialType:
627627
case Node::Kind::HasSymbolQuery:
628-
case Node::Kind::RuntimeDiscoverableAttributeRecord:
629-
case Node::Kind::RuntimeAttributeGenerator:
630628
return false;
631629
}
632630
printer_unreachable("bad node kind");
@@ -2244,11 +2242,6 @@ NodePointer NodePrinter::print(NodePointer Node, unsigned depth,
22442242
Printer << "accessible function runtime record for ";
22452243
}
22462244
return nullptr;
2247-
case Node::Kind::RuntimeDiscoverableAttributeRecord:
2248-
if (!Options.ShortenThunk) {
2249-
Printer << "runtime discoverable attribute record for ";
2250-
}
2251-
return nullptr;
22522245
case Node::Kind::DynamicallyReplaceableFunctionKey:
22532246
if (!Options.ShortenThunk) {
22542247
Printer << "dynamically replaceable key for ";
@@ -3217,16 +3210,6 @@ NodePointer NodePrinter::print(NodePointer Node, unsigned depth,
32173210
case Node::Kind::HasSymbolQuery:
32183211
Printer << "#_hasSymbol query for ";
32193212
return nullptr;
3220-
case Node::Kind::RuntimeAttributeGenerator:
3221-
Printer << "runtime attribute generator of ";
3222-
3223-
print(Node->getChild(1), depth);
3224-
3225-
printEntity(Node, depth, asPrefixContext,
3226-
TypePrinting::NoType, /*hasName*/ false,
3227-
" for attribute");
3228-
3229-
return nullptr;
32303213
case Node::Kind::OpaqueReturnTypeIndex:
32313214
case Node::Kind::OpaqueReturnTypeParent:
32323215
return nullptr;
@@ -3363,8 +3346,7 @@ NodePointer NodePrinter::printEntity(NodePointer Entity, unsigned depth,
33633346
if (Entity->getKind() == Node::Kind::DefaultArgumentInitializer ||
33643347
Entity->getKind() == Node::Kind::Initializer ||
33653348
Entity->getKind() == Node::Kind::PropertyWrapperBackingInitializer ||
3366-
Entity->getKind() == Node::Kind::PropertyWrapperInitFromProjectedValue ||
3367-
Entity->getKind() == Node::Kind::RuntimeAttributeGenerator) {
3349+
Entity->getKind() == Node::Kind::PropertyWrapperInitFromProjectedValue) {
33683350
Printer << " of ";
33693351
} else {
33703352
Printer << " in ";

lib/Demangling/OldRemangler.cpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2972,16 +2972,3 @@ ManglingError Remangler::mangleHasSymbolQuery(Node *node, unsigned depth) {
29722972
Buffer << "TwS";
29732973
return ManglingError::Success;
29742974
}
2975-
2976-
ManglingError
2977-
Remangler::mangleRuntimeDiscoverableAttributeRecord(Node *node,
2978-
unsigned depth) {
2979-
Buffer << "Ha";
2980-
return ManglingError::Success;
2981-
}
2982-
2983-
ManglingError Remangler::mangleRuntimeAttributeGenerator(Node *node,
2984-
EntityContext &ctx,
2985-
unsigned depth) {
2986-
return mangleSimpleEntity(node, 'I', "a", ctx, depth + 1);
2987-
}

lib/Demangling/Remangler.cpp

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,6 @@ ManglingError Remangler::mangleGenericArgs(Node *node, char &Separator,
575575
case Node::Kind::PropertyWrapperBackingInitializer:
576576
case Node::Kind::PropertyWrapperInitFromProjectedValue:
577577
case Node::Kind::Static:
578-
case Node::Kind::RuntimeAttributeGenerator:
579578
if (!fullSubstitutionMap)
580579
break;
581580

@@ -1711,7 +1710,6 @@ ManglingError Remangler::mangleGlobal(Node *node, unsigned depth) {
17111710
case Node::Kind::BackDeploymentThunk:
17121711
case Node::Kind::BackDeploymentFallback:
17131712
case Node::Kind::HasSymbolQuery:
1714-
case Node::Kind::RuntimeDiscoverableAttributeRecord:
17151713
mangleInReverseOrder = true;
17161714
break;
17171715
default:
@@ -3708,22 +3706,6 @@ mangleNonUniqueExtendedExistentialTypeShapeSymbolicReference(Node *node,
37083706
return MANGLING_ERROR(ManglingError::UnsupportedNodeKind, node);
37093707
}
37103708

3711-
ManglingError
3712-
Remangler::mangleRuntimeDiscoverableAttributeRecord(Node *node,
3713-
unsigned depth) {
3714-
Buffer << "Ha";
3715-
return ManglingError::Success;
3716-
}
3717-
3718-
ManglingError
3719-
Remangler::mangleRuntimeAttributeGenerator(Node *node,
3720-
unsigned depth) {
3721-
RETURN_IF_ERROR(mangleChildNode(node, 0, depth + 1));
3722-
RETURN_IF_ERROR(mangleChildNode(node, 1, depth + 1));
3723-
Buffer << "fa";
3724-
return ManglingError::Success;
3725-
}
3726-
37273709
} // anonymous namespace
37283710

37293711
/// The top-level interface to the remangler.
@@ -3799,7 +3781,6 @@ bool Demangle::isSpecialized(Node *node) {
37993781
case Node::Kind::PropertyWrapperBackingInitializer:
38003782
case Node::Kind::PropertyWrapperInitFromProjectedValue:
38013783
case Node::Kind::DefaultArgumentInitializer:
3802-
case Node::Kind::RuntimeAttributeGenerator:
38033784
case Node::Kind::Getter:
38043785
case Node::Kind::Setter:
38053786
case Node::Kind::WillSet:
@@ -3845,7 +3826,6 @@ ManglingErrorOr<NodePointer> Demangle::getUnspecialized(Node *node,
38453826
case Node::Kind::PropertyWrapperBackingInitializer:
38463827
case Node::Kind::PropertyWrapperInitFromProjectedValue:
38473828
case Node::Kind::DefaultArgumentInitializer:
3848-
case Node::Kind::RuntimeAttributeGenerator:
38493829
case Node::Kind::Static:
38503830
NumToCopy = node->getNumChildren();
38513831
LLVM_FALLTHROUGH;

lib/IDE/ExprContextAnalysis.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,11 +1234,6 @@ class ExprContextAnalyzer {
12341234
recordPossibleType(AFD->mapTypeIntoContext(var->getInterfaceType()));
12351235
break;
12361236
}
1237-
1238-
case InitializerKind::RuntimeAttribute: {
1239-
// This never appears in AST.
1240-
break;
1241-
}
12421237
}
12431238
}
12441239

0 commit comments

Comments
 (0)