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

[CSStep] Modify selectDisjunction to return favored choices directly

Browse Source 
This is currently unused because current mechanism set favored choices
directly but it would be utilized by the disjunction optimizer.

(cherry picked from commit e404ed722a)
This commit is contained in:
Pavel Yaskevich
2023-02-10 14:54:06 -08:00
parent c18c626a0f
commit 1b2ba7e059
4 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Sema/CSStep.cpp
View File

@@ -272,7 +272,7 @@ StepResult ComponentStep::take(bool prevFailed) {
}
});
auto *disjunction = CS.selectDisjunction();
auto disjunction = CS.selectDisjunction();
auto *conjunction = CS.selectConjunction();
if (CS.isDebugMode()) {
@@ -315,7 +315,8 @@ StepResult ComponentStep::take(bool prevFailed) {
// Bindings usually happen first, but sometimes we want to prioritize a
// disjunction or conjunction.
if (bestBindings) {
if (disjunction && !bestBindings->favoredOverDisjunction(disjunction))
if (disjunction &&
!bestBindings->favoredOverDisjunction(disjunction->first))
return StepKind::Disjunction;
if (conjunction && !bestBindings->favoredOverConjunction(conjunction))
@@ -338,9 +339,9 @@ StepResult ComponentStep::take(bool prevFailed) {
return suspend(
std::make_unique<TypeVariableStep>(*bestBindings, Solutions));
case StepKind::Disjunction: {
CS.retireConstraint(disjunction);
CS.retireConstraint(disjunction->first);
return suspend(
std::make_unique<DisjunctionStep>(CS, disjunction, Solutions));
std::make_unique<DisjunctionStep>(CS, *disjunction, Solutions));
}
case StepKind::Conjunction: {
CS.retireConstraint(conjunction);