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

[sil-combine] Fix a subtle bug in getConformanceAndConcreteType related to handling of inherited conformances

Browse Source 
This fixes a couple of tests and some of the compatibility suite projects.
rdar://problem/31815540, rdar://problem/31838976
This commit is contained in:
Roman Levenstein
2017-04-26 16:57:32 -07:00
parent b3053cffd7
commit 28d7f80c24
3 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/SILOptimizer/SILCombiner/SILCombinerApplyVisitors.cpp
View File

@@ -794,10 +794,13 @@ getConformanceAndConcreteType(FullApplySite AI,
if (Requirement->inheritsFrom(Protocol)) {
// If Requirement != Protocol, then the abstract conformance cannot be used
// as is and we need to create a proper conformance.
return std::make_tuple(Conformance.isAbstract()
? ProtocolConformanceRef(Protocol)
: Conformance,
ConcreteType, ConcreteTypeDef);
return std::make_tuple(
Conformance.isAbstract()
? ProtocolConformanceRef(Protocol)
: ProtocolConformanceRef(
Conformance.getConcrete()->getInheritedConformance(
Protocol)),
ConcreteType, ConcreteTypeDef);
}
}