averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace nominal type descriptors with a hierarchy of context descriptors.

Browse Source 
This new format more efficiently represents existing information, while
more accurately encoding important information about nested generic
contexts with same-type and layout constraints that need to be evaluated
at runtime. It's also designed with an eye to forward- and
backward-compatible expansion for ABI stability with future Swift
versions.
This commit is contained in:
Joe Groff
2017-12-12 09:57:36 -08:00
parent 9ac1dc80b0
commit a7a3b17597
58 changed files with 3418 additions and 1291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
lib/Demangling/Demangler.cpp
View File

@@ -1285,10 +1285,60 @@ NodePointer Demangler::demangleMetatype() {
return createWithChild(Node::Kind::ReflectionMetadataSuperclassDescriptor,
Ty->getChild(0));
}
case 'X':
return demanglePrivateContextDescriptor();
default:
return nullptr;
}
}
NodePointer Demangler::demanglePrivateContextDescriptor() {
switch (nextChar()) {
case 'E': {
auto Extension = popContext();
if (!Extension)
return nullptr;
return createWithChild(Node::Kind::ExtensionDescriptor, Extension);
}
case 'M': {
auto Module = popModule();
if (!Module)
return nullptr;
return createWithChild(Node::Kind::ModuleDescriptor, Module);
}
case 'Y': {
auto Discriminator = popNode();
if (!Discriminator)
return nullptr;
auto Context = popContext();
if (!Context)
return nullptr;
auto node = createNode(Node::Kind::AnonymousDescriptor);
node->addChild(Context, *this);
node->addChild(Discriminator, *this);
return node;
}
case 'X': {
auto Context = popContext();
if (!Context)
return nullptr;
return createWithChild(Node::Kind::AnonymousDescriptor, Context);
}
case 'A': {
auto path = popAssocTypePath();
if (!path)
return nullptr;
auto base = popNode(Node::Kind::Type);
if (!base)
return nullptr;
return createWithChildren(Node::Kind::AssociatedTypeGenericParamRef,
base, path);
}
default:
return nullptr;
}
}
NodePointer Demangler::demangleArchetype() {
switch (nextChar()) {
@@ -1372,6 +1422,20 @@ NodePointer Demangler::popAssocTypeName() {
addChild(AssocTy, Proto);
return AssocTy;
}
NodePointer Demangler::popAssocTypePath() {
NodePointer AssocTypePath = createNode(Node::Kind::AssocTypePath);
bool firstElem = false;
do {
firstElem = (popNode(Node::Kind::FirstElementMarker) != nullptr);
NodePointer AssocTyName = popNode(isDeclName);
if (!AssocTyName)
return nullptr;
AssocTypePath->addChild(AssocTyName, *this);
} while (!firstElem);
AssocTypePath->reverseChildren();
return AssocTypePath;
}
NodePointer Demangler::getDependentGenericParamType(int depth, int index) {
if (depth < 0 || index < 0)
@@ -1842,16 +1906,7 @@ NodePointer Demangler::demangleWitness() {
}
case 'T': {
NodePointer ProtoTy = popNode(Node::Kind::Type);
NodePointer AssocTypePath = createNode(Node::Kind::AssocTypePath);
bool firstElem = false;
do {
firstElem = (popNode(Node::Kind::FirstElementMarker) != nullptr);
NodePointer AssocTyName = popNode(isDeclName);
if (!AssocTyName)
return nullptr;
AssocTypePath->addChild(AssocTyName, *this);
} while (!firstElem);
AssocTypePath->reverseChildren();
auto AssocTypePath = popAssocTypePath();
NodePointer Conf = popProtocolConformance();
return createWithChildren(Node::Kind::AssociatedTypeWitnessTableAccessor,
@@ -1998,6 +2053,18 @@ NodePointer Demangler::demangleSpecialType() {
}
return createType(boxTy);
}
case 'Y':
return demangleAnyGenericType(Node::Kind::OtherNominalType);
case 'Z': {
auto types = popTypeList();
auto name = popNode(Node::Kind::Identifier);
auto parent = popContext();
auto anon = createNode(Node::Kind::AnonymousContext);
anon->addChild(name, *this);
anon->addChild(parent, *this);
anon->addChild(types, *this);
return anon;
}
case 'e':
return createType(createNode(Node::Kind::ErrorType));
default: