Sema: Clean up getMemberReferenceTypeFromOpenedType()

Author: slavapestov

lib/Sema/CSApply.cpp

@@ -2073,9 +2073,7 @@ namespace {
 
       Type refTySelf = refTy, adjustedRefTySelf = adjustedRefTy;
 
-      auto *func = dyn_cast<FuncDecl>(member);
-      if (func && func->getResultInterfaceType()->hasDynamicSelfType()) {
-        ASSERT(refTy->hasDynamicSelfType());
+      if (refTy->hasDynamicSelfType()) {
         refTySelf = refTy->replaceDynamicSelfType(containerTy);
         adjustedRefTySelf = adjustedRefTy->replaceDynamicSelfType(
             containerTy);
@@ -2177,11 +2175,8 @@ namespace {
             const Type replacementTy = getDynamicSelfReplacementType(
                 baseTy, member, memberLocator.getBaseLocator());
             if (!replacementTy->isEqual(containerTy)) {
-              if (isa<ConstructorDecl>(member)) {
-                adjustedRefTy = adjustedRefTy->withCovariantResultType();
-              } else {
-                ASSERT(adjustedRefTy->hasDynamicSelfType());
-              }
+              ASSERT(adjustedRefTy->hasDynamicSelfType());
+
               Type conversionTy =
                   adjustedRefTy->replaceDynamicSelfType(replacementTy);
               if (isSuperPartialApplication) {
@@ -2605,8 +2600,9 @@ namespace {
 
       // Wrap in covariant `Self` return if needed.
       if (ref.getDecl()->getDeclContext()->getSelfClassDecl()) {
-        auto covariantTy = resultTy->withCovariantResultType()
-          ->replaceDynamicSelfType(cs.getType(base)->getWithoutSpecifierType());
+        ASSERT(resultTy->hasDynamicSelfType());
+        auto covariantTy = resultTy->replaceDynamicSelfType(
+            cs.getType(base)->getWithoutSpecifierType());
         if (!covariantTy->isEqual(resultTy))
           ctorRef = cs.cacheType(
                new (ctx) CovariantFunctionConversionExpr(ctorRef, covariantTy));

lib/Sema/TypeOfReference.cpp

@@ -1555,19 +1555,9 @@ Type ConstraintSystem::getMemberReferenceTypeFromOpenedType(
     Type &openedType, Type baseObjTy, ValueDecl *value, DeclContext *outerDC,
     ConstraintLocator *locator, bool hasAppliedSelf, bool isDynamicLookup,
     ArrayRef<OpenedType> replacements) {
-  Type type = openedType;
-
-  // Cope with dynamic 'Self'.
   if (outerDC->getSelfClassDecl()) {
     if (isa<ConstructorDecl>(value)) {
-      type = type->withCovariantResultType();
-    }
-
-    if (type->hasDynamicSelfType()) {
-      auto replacementTy = getDynamicSelfReplacementType(
-          baseObjTy, value, locator);
-
-      type = type->replaceDynamicSelfType(replacementTy);
+      openedType = openedType->withCovariantResultType();
     }
   }
 
@@ -1593,13 +1583,19 @@ Type ConstraintSystem::getMemberReferenceTypeFromOpenedType(
                                  fnTy->getExtInfo());
       };
 
-      // FIXME: Refactor 'replaceCovariantResultType' not to rely on the passed
-      // uncurry level.
-      //
-      // This is done after handling dynamic 'Self' to make
-      // 'replaceCovariantResultType' work, so we have to transform both types.
       openedType = applyOptionality(openedType->castTo<FunctionType>());
-      type = applyOptionality(type->castTo<FunctionType>());
+    }
+  }
+
+  Type type = openedType;
+
+  // Cope with dynamic 'Self'.
+  if (outerDC->getSelfClassDecl()) {
+    if (type->hasDynamicSelfType()) {
+      auto replacementTy = getDynamicSelfReplacementType(
+          baseObjTy, value, locator);
+
+      type = type->replaceDynamicSelfType(replacementTy);
     }
   }