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

Include protocols in DependentMemberTypeRef

Browse Source 
This is necessary for proper uniquing when looking up associated
types.
This commit is contained in:
David Farler
2016-03-10 14:27:59 -08:00
parent 579ce977f0
commit be34129c43
7 changed files with 58 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/AST/Mangle.cpp
View File

@@ -847,7 +847,6 @@ void Mangler::mangleAssociatedTypeName(DependentMemberType *dmt,
if (tryMangleSubstitution(assocTy))
return;
// If the base type is known to have a single protocol conformance
// in the current generic context, then we don't need to disambiguate the
// associated type name by protocol.
@@ -1356,7 +1355,7 @@ void Mangler::mangleType(Type type, unsigned uncurryLevel) {
if (auto gpBase = dyn_cast<GenericTypeParamType>(base)) {
Buffer << 'w';
mangleGenericParamIndex(gpBase);
mangleAssociatedTypeName(memTy, /*canAbbreviate*/ true);
mangleAssociatedTypeName(memTy, OptimizeProtocolNames);
return;
}
@@ -1372,7 +1371,7 @@ void Mangler::mangleType(Type type, unsigned uncurryLevel) {
Buffer << 'W';
mangleGenericParamIndex(gpRoot);
for (auto *member : reversed(path)) {
mangleAssociatedTypeName(member, /*canAbbreviate*/ true);
mangleAssociatedTypeName(member, OptimizeProtocolNames);
}
Buffer << '_';
return;
@@ -1383,7 +1382,7 @@ void Mangler::mangleType(Type type, unsigned uncurryLevel) {
// we may still want to mangle them for debugging or indexing purposes.
Buffer << 'q';
mangleType(memTy->getBase(), 0);
mangleAssociatedTypeName(memTy, /*canAbbreviate*/false);
mangleAssociatedTypeName(memTy, OptimizeProtocolNames);
return;
}