Merge pull request #35291 from xedin/sr-13951-followup

[Diagnostics] Attempt `.rawValue` fix only if both types are equally …

Author: xedin

lib/Sema/CSSimplify.cpp

@@ -4269,13 +4269,18 @@ bool ConstraintSystem::repairFailures(
       break;
     }
 
-    if (repairByUsingRawValueOfRawRepresentableType(lhs, rhs))
-      break;
-
     if (repairViaOptionalUnwrap(*this, lhs, rhs, matchKind, conversionsOrFixes,
                                 locator))
       break;
 
+    // Let's wait until both sides are of the same optionality before
+    // attempting `.rawValue` fix.
+    if (hasConversionOrRestriction(ConversionRestrictionKind::ValueToOptional))
+      break;
+
+    if (repairByUsingRawValueOfRawRepresentableType(lhs, rhs))
+      break;
+
     // If there are any restrictions here we need to wait and let
     // `simplifyRestrictedConstraintImpl` handle them.
     if (llvm::any_of(conversionsOrFixes,

test/Constraints/sr13951.swift

@@ -29,8 +29,16 @@ func aTransformer(input: Int) -> TheEnum {
 func theProblem(input: Int?) {
   var enumValue: TheEnum?
 
+  func test_arg_position(_: TheEnum?) {}
+
   if let input = input {
     enumValue = aTransformer(input: input) // Ok
+    let _: TheEnum? = enumValue // Ok
+    let _: TheEnum? = aTransformer(input: input)  // Ok
+    let _: TheEnum?? = enumValue // Ok
+    let _: TheEnum?? = aTransformer(input: input)  // Ok
+    test_arg_position(aTransformer(input: input)) // Ok
+    test_arg_position(enumValue) // Ok
   }
 
   _ = enumValue // To silence the warning