Fix up naming in some places that I missed.

Author: rudkx

lib/Sema/TypeCheckDecl.cpp

@@ -2098,11 +2098,11 @@ void TypeChecker::validateDecl(OperatorDecl *OD) {
 
   // Pre- or post-fix operator?
   if (!IOD) {
-    auto *protocol = OD->getDesignatedNominalType();
-    auto protocolId = OD->getDesignatedNominalTypeName();
-    if (!protocol && !protocolId.empty() && enableOperatorDesignatedTypes) {
-      auto protocolIdLoc = OD->getDesignatedNominalTypeNameLoc();
-      checkDesignatedTypes(OD, protocolId, protocolIdLoc, *this, Context);
+    auto *nominal = OD->getDesignatedNominalType();
+    auto nominalId = OD->getDesignatedNominalTypeName();
+    if (!nominal && !nominalId.empty() && enableOperatorDesignatedTypes) {
+      auto nominalIdLoc = OD->getDesignatedNominalTypeNameLoc();
+      checkDesignatedTypes(OD, nominalId, nominalIdLoc, *this, Context);
     }
     return;
   }
@@ -2120,15 +2120,15 @@ void TypeChecker::validateDecl(OperatorDecl *OD) {
     }
 
     auto secondId = IOD->getSecondIdentifier();
-    auto *protocol = IOD->getDesignatedNominalType();
-    if (!protocol && enableOperatorDesignatedTypes) {
+    auto *nominal = IOD->getDesignatedNominalType();
+    if (!nominal && enableOperatorDesignatedTypes) {
       auto secondIdLoc = IOD->getSecondIdentifierLoc();
       assert(secondId.empty() || !firstId.empty());
 
-      auto protocolId = group ? secondId : firstId;
-      auto protocolIdLoc = group ? secondIdLoc : firstIdLoc;
-      if (!protocolId.empty())
-        checkDesignatedTypes(IOD, protocolId, protocolIdLoc, *this, Context);
+      auto nominalId = group ? secondId : firstId;
+      auto nominalIdLoc = group ? secondIdLoc : firstIdLoc;
+      if (!nominalId.empty())
+        checkDesignatedTypes(IOD, nominalId, nominalIdLoc, *this, Context);
     }
 
     if (!group && !IOD->isInvalid()) {

lib/Serialization/Serialization.cpp

@@ -2878,11 +2878,11 @@ void Serializer::writeDecl(const Decl *D) {
     auto contextID = addDeclContextRef(op->getDeclContext());
     auto nameID = addDeclBaseNameRef(op->getName());
     auto groupID = addDeclRef(op->getPrecedenceGroup());
-    auto protoID = addDeclRef(op->getDesignatedNominalType());
+    auto nominalID = addDeclRef(op->getDesignatedNominalType());
 
     unsigned abbrCode = DeclTypeAbbrCodes[InfixOperatorLayout::Code];
     InfixOperatorLayout::emitRecord(Out, ScratchRecord, abbrCode, nameID,
-                                    contextID, groupID, protoID);
+                                    contextID, groupID, nominalID);
     break;
   }
 
@@ -2891,12 +2891,12 @@ void Serializer::writeDecl(const Decl *D) {
     verifyAttrSerializable(op);
 
     auto contextID = addDeclContextRef(op->getDeclContext());
-    auto protoID = addDeclRef(op->getDesignatedNominalType());
+    auto nominalID = addDeclRef(op->getDesignatedNominalType());
 
     unsigned abbrCode = DeclTypeAbbrCodes[PrefixOperatorLayout::Code];
     PrefixOperatorLayout::emitRecord(Out, ScratchRecord, abbrCode,
                                      addDeclBaseNameRef(op->getName()),
-                                     contextID, protoID);
+                                     contextID, nominalID);
     break;
   }
 
@@ -2905,12 +2905,12 @@ void Serializer::writeDecl(const Decl *D) {
     verifyAttrSerializable(op);
 
     auto contextID = addDeclContextRef(op->getDeclContext());
-    auto protoID = addDeclRef(op->getDesignatedNominalType());
+    auto nominalID = addDeclRef(op->getDesignatedNominalType());
 
     unsigned abbrCode = DeclTypeAbbrCodes[PostfixOperatorLayout::Code];
     PostfixOperatorLayout::emitRecord(Out, ScratchRecord, abbrCode,
                                       addDeclBaseNameRef(op->getName()),
-                                      contextID, protoID);
+                                      contextID, nominalID);
     break;
   }