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

Merge pull request #22072 from jckarter/opaque-type-runtime

Browse Source 
Opaque types with resilience
This commit is contained in:
Joe Groff
2019-04-18 14:52:31 -07:00
committed by GitHub
parent fa43e3b9a1 b87a5664d9
commit a8c2b50bd8
143 changed files with 4501 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Sema/CSSolver.cpp
View File

@@ -1118,6 +1118,11 @@ ConstraintSystem::solveImpl(Expr *&expr,
// constraint.
if (convertType) {
auto constraintKind = ConstraintKind::Conversion;
if (getContextualTypePurpose() == CTP_ReturnStmt
&& Options.contains(ConstraintSystemFlags::UnderlyingTypeForOpaqueReturnType))
constraintKind = ConstraintKind::OpaqueUnderlyingType;
if (getContextualTypePurpose() == CTP_CallArgument)
constraintKind = ConstraintKind::ArgumentConversion;
@@ -1513,7 +1518,8 @@ void ConstraintSystem::ArgumentInfoCollector::walk(Type argType) {
case ConstraintKind::ArgumentConversion:
case ConstraintKind::Conversion:
case ConstraintKind::BridgingConversion:
case ConstraintKind::BindParam: {
case ConstraintKind::BindParam:
case ConstraintKind::OpaqueUnderlyingType: {
auto secondTy = constraint->getSecondType();
if (secondTy->is<TypeVariableType>()) {
auto otherRep =