[CSFix] NFC: Fix a typo orRValueBase -> onRValueBase

Author: xedin

lib/Sema/CSFix.cpp

@@ -644,16 +644,16 @@ bool SkipUnhandledConstructInFunctionBuilder::diagnose(Expr *root,
   return failure.diagnose(asNote);
 }
 
-bool AllowMutatingMemberOrRValueBase::diagnose(Expr *root, bool asNote) const {
+bool AllowMutatingMemberOnRValueBase::diagnose(Expr *root, bool asNote) const {
   auto &cs = getConstraintSystem();
   MutatingMemberRefOnImmutableBase failure(root, cs, getMember(), getLocator());
   return failure.diagnose(asNote);
 }
 
-AllowMutatingMemberOrRValueBase *
-AllowMutatingMemberOrRValueBase::create(ConstraintSystem &cs, Type baseType,
+AllowMutatingMemberOnRValueBase *
+AllowMutatingMemberOnRValueBase::create(ConstraintSystem &cs, Type baseType,
                                         ValueDecl *member, DeclName name,
                                         ConstraintLocator *locator) {
   return new (cs.getAllocator())
-      AllowMutatingMemberOrRValueBase(cs, baseType, member, name, locator);
+      AllowMutatingMemberOnRValueBase(cs, baseType, member, name, locator);
 }

lib/Sema/CSFix.h

@@ -182,7 +182,7 @@ enum class FixKind : uint8_t {
 
   /// Allow invalid reference to a member declared as `mutating`
   /// when base is an r-value type.
-  AllowMutatingMemberOrRValueBase,
+  AllowMutatingMemberOnRValueBase,
 };
 
 class ConstraintFix {
@@ -862,11 +862,11 @@ class AllowInvalidInitRef final : public ConstraintFix {
                                      ConstraintLocator *locator);
 };
 
-class AllowMutatingMemberOrRValueBase final : public AllowInvalidMemberRef {
-  AllowMutatingMemberOrRValueBase(ConstraintSystem &cs, Type baseType,
+class AllowMutatingMemberOnRValueBase final : public AllowInvalidMemberRef {
+  AllowMutatingMemberOnRValueBase(ConstraintSystem &cs, Type baseType,
                                   ValueDecl *member, DeclName name,
                                   ConstraintLocator *locator)
-      : AllowInvalidMemberRef(cs, FixKind::AllowMutatingMemberOrRValueBase,
+      : AllowInvalidMemberRef(cs, FixKind::AllowMutatingMemberOnRValueBase,
                               baseType, member, name, locator) {}
 
 public:
@@ -876,7 +876,7 @@ class AllowMutatingMemberOrRValueBase final : public AllowInvalidMemberRef {
 
   bool diagnose(Expr *root, bool asNote = false) const override;
 
-  static AllowMutatingMemberOrRValueBase *
+  static AllowMutatingMemberOnRValueBase *
   create(ConstraintSystem &cs, Type baseType, ValueDecl *member, DeclName name,
          ConstraintLocator *locator);
 };

lib/Sema/CSSimplify.cpp

@@ -4763,7 +4763,7 @@ fixMemberRef(ConstraintSystem &cs, Type baseTy,
     case MemberLookupResult::UR_MutatingMemberOnRValue:
     case MemberLookupResult::UR_MutatingGetterOnRValue: {
       return choice.isDecl()
-                 ? AllowMutatingMemberOrRValueBase::create(
+                 ? AllowMutatingMemberOnRValueBase::create(
                        cs, baseTy, choice.getDecl(), memberName, locator)
                  : nullptr;
     }
@@ -6935,7 +6935,7 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyFixConstraint(
   case FixKind::AllowInvalidRefInKeyPath:
   case FixKind::ExplicitlySpecifyGenericArguments:
   case FixKind::GenericArgumentsMismatch:
-  case FixKind::AllowMutatingMemberOrRValueBase:
+  case FixKind::AllowMutatingMemberOnRValueBase:
     llvm_unreachable("handled elsewhere");
   }