[NFC] Serialize module selector fields

Author: beccadax

lib/Serialization/Deserialization.cpp

@@ -4528,15 +4528,18 @@ llvm::Error DeclDeserializer::deserializeDeclCommon() {
         serialization::decls_block::DynamicReplacementDeclAttrLayout::
             readRecord(scratch, isImplicit, replacedFunID, numArgs, rawPieceIDs);
 
-        auto baseName = MF.getDeclBaseName(rawPieceIDs[0]);
+        auto moduleSelector = MF.getIdentifier(rawPieceIDs[0]);
+        auto baseName = MF.getDeclBaseName(rawPieceIDs[1]);
         SmallVector<Identifier, 4> pieces;
-        for (auto pieceID : rawPieceIDs.slice(1))
+        for (auto pieceID : rawPieceIDs.slice(2))
           pieces.push_back(MF.getIdentifier(pieceID));
 
+        DeclNameRef replacedFunName(ctx, moduleSelector, baseName, pieces);
+
         assert(numArgs != 0);
         assert(!isImplicit && "Need to update for implicit");
-        Attr = DynamicReplacementAttr::create(
-            ctx, DeclNameRef({ ctx, baseName, pieces }), &MF, replacedFunID);
+        Attr = DynamicReplacementAttr::create(ctx, replacedFunName, &MF,
+                                              replacedFunID);
         break;
       }
 
@@ -4630,6 +4633,7 @@ llvm::Error DeclDeserializer::deserializeDeclCommon() {
 
       case decls_block::Derivative_DECL_ATTR: {
         bool isImplicit;
+        uint64_t origModuleSelectorId;
         uint64_t origNameId;
         bool hasAccessorKind;
         uint64_t rawAccessorKind;
@@ -4638,8 +4642,9 @@ llvm::Error DeclDeserializer::deserializeDeclCommon() {
         ArrayRef<uint64_t> parameters;
 
         serialization::decls_block::DerivativeDeclAttrLayout::readRecord(
-            scratch, isImplicit, origNameId, hasAccessorKind, rawAccessorKind,
-            origDeclId, rawDerivativeKind, parameters);
+            scratch, isImplicit, origModuleSelectorId, origNameId,
+            hasAccessorKind, rawAccessorKind, origDeclId, rawDerivativeKind,
+            parameters);
 
         Optional<AccessorKind> accessorKind = None;
         if (hasAccessorKind) {
@@ -4649,8 +4654,12 @@ llvm::Error DeclDeserializer::deserializeDeclCommon() {
           accessorKind = *maybeAccessorKind;
         }
 
-        DeclNameRefWithLoc origName{DeclNameRef(MF.getDeclBaseName(origNameId)),
-                                    DeclNameLoc(), accessorKind};
+        Identifier origModuleSelector = MF.getIdentifier(origModuleSelectorId);
+        DeclBaseName origBaseName = MF.getDeclBaseName(origNameId);
+        DeclNameRef origName(ctx, origModuleSelector, origBaseName);
+        DeclNameRefWithLoc origNameWithLoc{origName, DeclNameLoc(),
+                                           accessorKind};
+
         auto derivativeKind =
             getActualAutoDiffDerivativeFunctionKind(rawDerivativeKind);
         if (!derivativeKind)
@@ -4662,7 +4671,8 @@ llvm::Error DeclDeserializer::deserializeDeclCommon() {
 
         auto *derivativeAttr =
             DerivativeAttr::create(ctx, isImplicit, SourceLoc(), SourceRange(),
-                                   /*baseType*/ nullptr, origName, indices);
+                                   /*baseType*/ nullptr, origNameWithLoc,
+                                   indices);
         derivativeAttr->setOriginalFunctionResolver(&MF, origDeclId);
         derivativeAttr->setDerivativeKind(*derivativeKind);
         Attr = derivativeAttr;

lib/Serialization/ModuleFormat.h

@@ -56,7 +56,7 @@ const uint16_t SWIFTMODULE_VERSION_MAJOR = 0;
 /// describe what change you made. The content of this comment isn't important;
 /// it just ensures a conflict if two people change the module format.
 /// Don't worry about adhering to the 80-column limit for this line.
-const uint16_t SWIFTMODULE_VERSION_MINOR = 623; // remove designated types
+const uint16_t SWIFTMODULE_VERSION_MINOR = 624; // DeclNameRef ModuleSelector fields
 
 /// A standard hash seed used for all string hashes in a serialized module.
 ///
@@ -1931,6 +1931,7 @@ namespace decls_block {
   using DerivativeDeclAttrLayout = BCRecordLayout<
     Derivative_DECL_ATTR,
     BCFixed<1>, // Implicit flag.
+    IdentifierIDField, // Original module selector.
     IdentifierIDField, // Original name.
     BCFixed<1>, // Has original accessor kind?
     AccessorKindField, // Original accessor kind.
@@ -1958,7 +1959,7 @@ namespace decls_block {
     DynamicReplacement_DECL_ATTR,
     BCFixed<1>, // implicit flag
     DeclIDField, // replaced function
-    BCVBR<4>,   // # of arguments (+1) or zero if no name
+    BCVBR<4>,   // # of arguments (+2) or zero if no name
     BCArray<IdentifierIDField>
   >;
 

lib/Serialization/Serialization.cpp

@@ -2564,6 +2564,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
       auto theAttr = cast<DynamicReplacementAttr>(DA);
       auto replacedFun = theAttr->getReplacedFunctionName();
       SmallVector<IdentifierID, 4> pieces;
+      pieces.push_back(S.addDeclBaseNameRef(replacedFun.getModuleSelector()));
       pieces.push_back(S.addDeclBaseNameRef(replacedFun.getBaseName()));
       for (auto argName : replacedFun.getArgumentNames())
         pieces.push_back(S.addDeclBaseNameRef(argName));
@@ -2634,7 +2635,10 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
              "`@derivative` attribute should have original declaration set "
              "during construction or parsing");
       auto origDeclNameRef = attr->getOriginalFunctionName();
+      auto origModuleSelector = origDeclNameRef.Name.getModuleSelector();
       auto origName = origDeclNameRef.Name.getBaseName();
+      IdentifierID origModuleSelectorId =
+          S.addDeclBaseNameRef(origModuleSelector);
       IdentifierID origNameId = S.addDeclBaseNameRef(origName);
       DeclID origDeclID = S.addDeclRef(attr->getOriginalFunction(ctx));
       auto derivativeKind =
@@ -2649,9 +2653,9 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
       for (unsigned i : range(parameterIndices->getCapacity()))
         paramIndicesVector.push_back(parameterIndices->contains(i));
       DerivativeDeclAttrLayout::emitRecord(
-          S.Out, S.ScratchRecord, abbrCode, attr->isImplicit(), origNameId,
-          origAccessorKind.hasValue(), rawAccessorKind, origDeclID,
-          derivativeKind, paramIndicesVector);
+          S.Out, S.ScratchRecord, abbrCode, attr->isImplicit(),
+          origModuleSelectorId, origNameId, origAccessorKind.hasValue(),
+          rawAccessorKind, origDeclID, derivativeKind, paramIndicesVector);
       return;
     }