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

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift-ci
2018-07-16 18:48:54 -07:00
parent f92c53d847 e5ad88d31e
commit 9eb4e3a0a4
13 changed files with 128 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/swift/SIL/TypeSubstCloner.h
View File

@@ -172,9 +172,7 @@ protected:
ProtocolConformanceRef remapConformance(Type type,
ProtocolConformanceRef conf) {
return conf.subst(type,
QuerySubstitutionMap{SubsMap},
LookUpConformanceInSubstitutionMap(SubsMap));
return conf.subst(type, SubsMap);
}
SubstitutionMap remapSubstitutionMap(SubstitutionMap Subs) {