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 remote-tracking branch 'origin/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2021-07-23 07:13:34 -07:00
parent b35453f787 03d8690ff6
commit fd87ebc401
83 changed files with 409 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Sema/CSStep.cpp
View File

@@ -555,9 +555,9 @@ bool IsDeclRefinementOfRequest::evaluate(Evaluator &evaluator,
// Substitute generic parameters with their archetypes in each generic function.
Type substTypeA = typeA->substGenericArgs(
genericSignatureA->getGenericEnvironment()->getForwardingSubstitutionMap());
genericSignatureA.getGenericEnvironment()->getForwardingSubstitutionMap());
Type substTypeB = typeB->substGenericArgs(
genericSignatureB->getGenericEnvironment()->getForwardingSubstitutionMap());
genericSignatureB.getGenericEnvironment()->getForwardingSubstitutionMap());
// Attempt to substitute archetypes from the second type with archetypes in the
// same structural position in the first type.
@@ -583,7 +583,7 @@ bool IsDeclRefinementOfRequest::evaluate(Evaluator &evaluator,
auto result = TypeChecker::checkGenericArguments(
declA->getDeclContext()->getParentModule(),
genericSignatureB->getRequirements(),
genericSignatureB.getRequirements(),
QueryTypeSubstitutionMap{ substMap });
if (result != RequirementCheckResult::Success)