Merge pull request #34673 from xedin/rdar-71167129

[AST] Preserve l-valueness of covariant result type after replacement

Author: xedin

lib/AST/Type.cpp

@@ -809,13 +809,16 @@ Type TypeBase::getWithoutParens() {
 Type TypeBase::replaceCovariantResultType(Type newResultType,
                                           unsigned uncurryLevel) {
   if (uncurryLevel == 0) {
-    if (auto objectType = getOptionalObjectType()) {
+    bool isLValue = is<LValueType>();
+
+    auto loadedTy = getWithoutSpecifierType();
+    if (auto objectType = loadedTy->getOptionalObjectType()) {
       assert(!newResultType->getOptionalObjectType());
-      return OptionalType::get(
+      newResultType = OptionalType::get(
           objectType->replaceCovariantResultType(newResultType, uncurryLevel));
     }
 
-    return newResultType;
+    return isLValue ? LValueType::get(newResultType) : newResultType;
   }
 
   // Determine the input and result types of this function.

validation-test/Sema/type_checker_crashers_fixed/rdar71167129.swift

@@ -0,0 +1,12 @@
+// RUN: not %target-swift-frontend %s -typecheck
+
+final class Whatever {
+  static var instance: Self!
+
+  static var shared: Self {
+    return instance ?? {
+      instance = Self()
+      return instance
+    }
+  }
+}