Merge pull request #63845 from LucianoPAlmeida/variable-question-condition

[Sema] Fix variable invalid optional chaining in if context diagnostic

Author: xedin

lib/Sema/CSSimplify.cpp

@@ -5920,7 +5920,7 @@ bool ConstraintSystem::repairFailures(
 
     if (repairViaOptionalUnwrap(*this, lhs, rhs, matchKind, conversionsOrFixes,
                                 locator))
-      break;
+      return true;
 
     // Let's wait until both sides are of the same optionality before
     // attempting `.rawValue` fix.
@@ -5967,7 +5967,7 @@ bool ConstraintSystem::repairFailures(
 
         if (repairViaOptionalUnwrap(*this, lhs, rhs, matchKind,
                                     conversionsOrFixes, locator))
-          break;
+          return true;
 
         conversionsOrFixes.push_back(
             IgnoreContextualType::create(*this, lhs, rhs, locator));
@@ -6193,7 +6193,7 @@ bool ConstraintSystem::repairFailures(
   case ConstraintLocator::Condition: {
     if (repairViaOptionalUnwrap(*this, lhs, rhs, matchKind, conversionsOrFixes,
                                 locator))
-      break;
+      return true;
 
     conversionsOrFixes.push_back(IgnoreContextualType::create(
         *this, lhs, rhs, getConstraintLocator(locator)));
@@ -6218,7 +6218,7 @@ bool ConstraintSystem::repairFailures(
 
     if (repairViaOptionalUnwrap(*this, lhs, rhs, matchKind, conversionsOrFixes,
                                 locator))
-      break;
+      return true;
 
     if (repairByTreatingRValueAsLValue(lhs, rhs))
       break;

test/Constraints/if_expr.swift

@@ -567,3 +567,9 @@ func builderInClosure() {
     }
   }
 }
+
+// https://github.com/apple/swift/issues/63796
+func testInvalidOptionalChainingInIfContext() {
+  let v63796 = 1
+  if v63796? {} // expected-error{{cannot use optional chaining on non-optional value of type 'Int'}}
+}