Merge pull request swiftlang#32907 from xedin/rdar-56400265

[ConstraintSystem] Preserve l-valueness of the result after implicit …

Author: xedin

lib/Sema/CSApply.cpp

@@ -5398,7 +5398,7 @@ Expr *ExprRewriter::coerceOptionalToOptional(Expr *expr, Type toType,
 
 Expr *ExprRewriter::coerceImplicitlyUnwrappedOptionalToValue(Expr *expr, Type objTy) {
   auto optTy = cs.getType(expr);
-  // Coerce to an r-value.
+  // Preserve l-valueness of the result.
   if (optTy->is<LValueType>())
     objTy = LValueType::get(objTy);
 

lib/Sema/ConstraintSystem.h

@@ -3966,8 +3966,13 @@ class ConstraintSystem {
     auto resultTy = fnTy->getResult();
     if (auto *resultFnTy = resultTy->getAs<AnyFunctionType>())
       resultTy = replaceFinalResultTypeWithUnderlying(resultFnTy);
-    else
-      resultTy = resultTy->getWithoutSpecifierType()->getOptionalObjectType();
+    else {
+      auto objType =
+          resultTy->getWithoutSpecifierType()->getOptionalObjectType();
+      // Preserve l-value through force operation.
+      resultTy =
+          resultTy->is<LValueType>() ? LValueType::get(objType) : objType;
+    }
 
     assert(resultTy);
 

test/Constraints/iuo_objc.swift

@@ -56,3 +56,10 @@ extension X where Self : OptionalRequirements {
     let _ = self.name
   }
 }
+
+func rdar61337704() {
+  func setColor(v: ColorDescriptor) { }
+
+  let descriptor = PaletteDescriptor()
+  setColor(v: descriptor.colors[0]) // Ok
+}

test/Inputs/clang-importer-sdk/usr/include/Foundation.h

@@ -1181,3 +1181,15 @@ void takeNullableId(_Nullable id);
 @interface IUOProperty
 @property (readonly) id<OptionalRequirements> iuo;
 @end
+
+@interface ColorDescriptor : NSObject <NSCopying>
+@end
+
+@interface ColorArray : NSObject
+- (ColorDescriptor *)objectAtIndexedSubscript:(NSUInteger)attachmentIndex;
+- (void)setObject:(nullable ColorDescriptor *)attachment atIndexedSubscript:(NSUInteger)attachmentIndex;
+@end
+
+@interface PaletteDescriptor : NSObject <NSCopying>
+@property (readonly, nonnull) ColorArray *colors;
+@end