Sema: Move call to getRValueType inside of getBaseType

Author: sl

lib/Sema/CSDiag.cpp

@@ -757,8 +757,8 @@ void FailureDiagnosis::diagnoseUnviableLookupResults(
       break;
 
     case MemberLookupResult::UR_UnavailableInExistential: {
-      InvalidMemberRefOnExistential failure(baseExpr, CS, instanceTy, memberName,
-                                            CS.getConstraintLocator(E));
+      InvalidMemberRefOnExistential failure(
+          baseExpr, CS, instanceTy, memberName, CS.getConstraintLocator(E));
       failure.diagnoseAsError();
       return;
     }

lib/Sema/CSDiagnostics.cpp

@@ -1978,7 +1978,7 @@ bool InvalidMemberRefOnExistential::diagnoseAsError() {
   }
 
   emitDiagnostic(getAnchor()->getLoc(),
-                 diag::could_not_use_member_on_existential, getBaseType()->getRValueType(),
+                 diag::could_not_use_member_on_existential, getBaseType(),
                  getName())
       .highlight(nameLoc.getSourceRange())
       .highlight(baseExpr->getSourceRange());

lib/Sema/CSDiagnostics.h

@@ -765,13 +765,13 @@ class SubscriptMisuseFailure final : public FailureDiagnostic {
 class InvalidMemberRefFailure : public FailureDiagnostic {
   Type BaseType;
   DeclName Name;
-  
+
 public:
   InvalidMemberRefFailure(Expr *root, ConstraintSystem &cs, Type baseType,
                           DeclName memberName, ConstraintLocator *locator)
-          : FailureDiagnostic(root, cs, locator),
-            BaseType(baseType), Name(memberName) {}
-            
+      : FailureDiagnostic(root, cs, locator), BaseType(baseType->getRValueType()),
+        Name(memberName) {}
+
 protected:
   Type getBaseType() const { return BaseType; }
   DeclName getName() const { return Name; }
@@ -815,9 +815,8 @@ class MissingMemberFailure final : public InvalidMemberRefFailure {
 /// ```
 class InvalidMemberRefOnExistential final : public InvalidMemberRefFailure {
 public:
-  InvalidMemberRefOnExistential(Expr *root, ConstraintSystem &cs,
-                                Type baseType, DeclName memberName,
-                                ConstraintLocator *locator)
+  InvalidMemberRefOnExistential(Expr *root, ConstraintSystem &cs, Type baseType,
+                                DeclName memberName, ConstraintLocator *locator)
       : InvalidMemberRefFailure(root, cs, baseType, memberName, locator) {}
 
   bool diagnoseAsError() override;

lib/Sema/CSFix.cpp

@@ -285,8 +285,8 @@ DefineMemberBasedOnUse::create(ConstraintSystem &cs, Type baseType,
 
 AllowMemberRefOnExistential *
 AllowMemberRefOnExistential::create(ConstraintSystem &cs, Type baseType,
-                                ValueDecl *member, DeclName memberName,
-                                ConstraintLocator *locator) {
+                                    ValueDecl *member, DeclName memberName,
+                                    ConstraintLocator *locator) {
   return new (cs.getAllocator())
       AllowMemberRefOnExistential(cs, baseType, memberName, member, locator);
 }

lib/Sema/CSFix.h

@@ -603,8 +603,8 @@ class AllowMemberRefOnExistential final : public ConstraintFix {
   DeclName Name;
 
   AllowMemberRefOnExistential(ConstraintSystem &cs, Type baseType,
-                          DeclName memberName, ValueDecl *member,
-                          ConstraintLocator *locator)
+                              DeclName memberName, ValueDecl *member,
+                              ConstraintLocator *locator)
       : ConstraintFix(cs, FixKind::AllowMemberRefOnExistential, locator),
         BaseType(baseType), Name(memberName) {}
 
@@ -618,9 +618,10 @@ class AllowMemberRefOnExistential final : public ConstraintFix {
 
   bool diagnose(Expr *root, bool asNote = false) const override;
 
-  static AllowMemberRefOnExistential *create(ConstraintSystem &cs, Type baseType,
-                                         ValueDecl *member, DeclName memberName,
-                                         ConstraintLocator *locator);
+  static AllowMemberRefOnExistential *create(ConstraintSystem &cs,
+                                             Type baseType, ValueDecl *member,
+                                             DeclName memberName,
+                                             ConstraintLocator *locator);
 };
 
 class AllowTypeOrInstanceMember final : public ConstraintFix {

lib/Sema/CSSimplify.cpp

@@ -4531,8 +4531,8 @@ fixMemberRef(ConstraintSystem &cs, Type baseTy,
 
     case MemberLookupResult::UR_UnavailableInExistential: {
       return choice.isDecl()
-                 ? AllowMemberRefOnExistential::create(cs, baseTy, choice.getDecl(),
-                                                   memberName, locator)
+                 ? AllowMemberRefOnExistential::create(
+                       cs, baseTy, choice.getDecl(), memberName, locator)
                  : nullptr;
     }