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

[CS] Bail from conjunction for non-zero SK_Hole

Browse Source 
Previously we would only do this for `SK_Fix`, do the same for `SK_Hole`
since otherwise the score clearing logic for the conjunction could
result in losing the hole score.
This commit is contained in:
Hamish Knight
2025-09-14 11:33:29 +01:00
parent be1f82e36b
commit 63d63d8c60
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Sema/CSStep.cpp
View File

@@ -887,24 +887,25 @@ StepResult ConjunctionStep::resume(bool prevFailed) {
if (Solutions.size() > 1) if (Solutions.size() > 1)
filterSolutions(Solutions, /*minimize=*/true); filterSolutions(Solutions, /*minimize=*/true);
// In diagnostic mode we need to stop a conjunction // In diagnostic mode we need to stop a conjunction but consider it
// but consider it successful if there are: // successful if there are:
// //
// - More than one solution for this element. Ambiguity // - More than one solution for this element. Ambiguity needs to get
// needs to get propagated back to the outer context // propagated back to the outer context to be diagnosed.
// to be diagnosed. // - A single solution that requires one or more fixes or holes, since
// - A single solution that requires one or more fixes, // continuing would result in more errors associated with the failed
// continuing would result in more errors associated // element, and we don't preserve scores across elements.
// with the failed element.
if (CS.shouldAttemptFixes()) { if (CS.shouldAttemptFixes()) {
if (Solutions.size() > 1) if (Solutions.size() > 1)
Producer.markExhausted(); Producer.markExhausted();
if (Solutions.size() == 1) { if (Solutions.size() == 1) {
auto score = Solutions.front().getFixedScore(); auto score = Solutions.front().getFixedScore();
if (score.Data[SK_Fix] > 0 && !CS.isForCodeCompletion()) if (!CS.isForCodeCompletion()) {
if (score.Data[SK_Fix] > 0 || score.Data[SK_Hole] > 0)
Producer.markExhausted(); Producer.markExhausted();
} }
}
} else if (Solutions.size() != 1) { } else if (Solutions.size() != 1) {
return failConjunction(); return failConjunction();
} }
@@ -1053,7 +1054,7 @@ void ConjunctionStep::SolverSnapshot::replaySolution(const Solution &solution) {
// If inference succeeded, we are done. // If inference succeeded, we are done.
auto score = solution.getFixedScore(); auto score = solution.getFixedScore();
if (score.Data[SK_Fix] == 0) if (score.Data[SK_Fix] == 0 && score.Data[SK_Hole] == 0)
return; return;
// If this conjunction represents a closure and inference // If this conjunction represents a closure and inference

2
validation-test/compiler_crashers_2/2d5e95ea862946ed.swift → validation-test/compiler_crashers_2_fixed/2d5e95ea862946ed.swift
View File

@@ -1,5 +1,5 @@
// {"kind":"typecheck","signature":"(anonymous namespace)::ExprWalker::walkToExprPost(swift::Expr*)","signatureAssert":"Assertion failed: (Ptr && \"Cannot dereference a null Type!\"), function operator->"} // {"kind":"typecheck","signature":"(anonymous namespace)::ExprWalker::walkToExprPost(swift::Expr*)","signatureAssert":"Assertion failed: (Ptr && \"Cannot dereference a null Type!\"), function operator->"}
// RUN: not --crash %target-swift-frontend -typecheck %s // RUN: not %target-swift-frontend -typecheck %s
func a { func a {
{ {
\ b() a \ b() a