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

Reflection: ProtocolTypeRefs now store a mangled name

Browse Source 
This is better for field metadata lookups. Clients that want the
module name and decl name can demangle, just like they do with
NominalTypeRefs.
This commit is contained in:
Slava Pestov
2016-04-25 14:56:50 -07:00
parent 00e0c89b30
commit c0c02a3148
6 changed files with 50 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/swift/Remote/MetadataReader.h
View File

@@ -120,7 +120,17 @@ class TypeDecoder {
case NodeKind::Protocol: {
auto moduleName = Node->getChild(0)->getText();
auto name = Node->getChild(1)->getText();
return Builder.createProtocolType(moduleName, name);
// Consistent handling of protocols and protocol compositions
auto protocolList = Demangle::NodeFactory::create(NodeKind::ProtocolList);
auto typeList = Demangle::NodeFactory::create(NodeKind::TypeList);
auto type = Demangle::NodeFactory::create(NodeKind::Type);
type->addChild(Node);
typeList->addChild(type);
protocolList->addChild(typeList);
auto mangledName = Demangle::mangleNode(protocolList);
return Builder.createProtocolType(mangledName, moduleName, name);
}
case NodeKind::DependentGenericParamType: {
auto depth = Node->getChild(0)->getIndex();