Merge pull request #61940 from xedin/fix-early-return-from-binding

xedin · web-flow · commit 938036b91bf1 · 2022-11-07T09:54:17.000-08:00
[CSBindings] Fix early return condition in `TypeVariableBinding::attempt`
diff --git a/lib/Sema/CSBindings.cpp b/lib/Sema/CSBindings.cpp
@@ -2208,8 +2208,9 @@ bool TypeVariableBinding::attempt(ConstraintSystem &cs) const {
   if (Binding.isDefaultableBinding()) {
     cs.DefaultedConstraints.insert(srcLocator);
 
+    // Fail if hole reporting fails.
     if (type->isPlaceholder() && reportHole())
-      return true;
+      return false;
   }
 
   if (cs.simplify())

Original file line number	Diff line number	Diff line change
`@@ -2208,8 +2208,9 @@ bool TypeVariableBinding::attempt(ConstraintSystem &cs) const {`
`2208`	`2208`	`if (Binding.isDefaultableBinding()) {`
`2209`	`2209`	`cs.DefaultedConstraints.insert(srcLocator);`
`2210`	`2210`
	`2211`	`+ // Fail if hole reporting fails.`
`2211`	`2212`	`if (type->isPlaceholder() && reportHole())`
`2212`		`- return true;`
	`2213`	`+ return false;`
`2213`	`2214`	`}`
`2214`	`2215`
`2215`	`2216`	`if (cs.simplify())`