Implement experimental module selectors (MyMod::someName) feature

include/swift/AST/ASTBridging.h

@@ -146,21 +146,29 @@ class BridgedDeclNameRef {
   BRIDGED_INLINE swift::DeclNameRef unbridged() const;
 };
 
-SWIFT_NAME("BridgedDeclNameRef.createParsed(_:baseName:argumentLabels:)")
-BridgedDeclNameRef BridgedDeclNameRef_createParsed(BridgedASTContext cContext,
-                                                   swift::DeclBaseName baseName,
-                                                   BridgedArrayRef cLabels);
+SWIFT_NAME("BridgedDeclNameRef.createParsed(_:moduleSelector:baseName:"
+           "argumentLabels:)")
+BridgedDeclNameRef
+BridgedDeclNameRef_createParsed(BridgedASTContext cContext,
+                                swift::Identifier cModuleSelector,
+                                swift::DeclBaseName cBaseName,
+                                BridgedArrayRef cLabels);
 
-SWIFT_NAME("BridgedDeclNameRef.createParsed(_:)")
+SWIFT_NAME("BridgedDeclNameRef.createParsed(_:moduleSelector:baseName:)")
 BridgedDeclNameRef
-BridgedDeclNameRef_createParsed(swift::DeclBaseName baseName);
+BridgedDeclNameRef_createParsed(BridgedASTContext cContext,
+                                swift::Identifier cModuleSelector,
+                                swift::DeclBaseName cBaseName);
 
 class BridgedDeclNameLoc {
   const void *_Nullable LocationInfo;
-  size_t NumArgumentLabels;
+  uint32_t NumArgumentLabels;
+  bool HasModuleSelectorLoc;
 
 public:
-  BridgedDeclNameLoc() : LocationInfo(nullptr), NumArgumentLabels(0) {}
+  BridgedDeclNameLoc()
+    : LocationInfo(nullptr), NumArgumentLabels(0), HasModuleSelectorLoc(false)
+  {}
 
   BRIDGED_INLINE BridgedDeclNameLoc(swift::DeclNameLoc loc);
 
@@ -941,11 +949,12 @@ BridgedDocumentationAttr BridgedDocumentationAttr_createParsed(
 
 SWIFT_NAME(
     "BridgedDynamicReplacementAttr.createParsed(_:atLoc:attrNameLoc:lParenLoc:"
-    "replacedFunction:rParenLoc:)")
+    "replacedFunction:replacedFunctionLoc:rParenLoc:)")
 BridgedDynamicReplacementAttr BridgedDynamicReplacementAttr_createParsed(
-    BridgedASTContext cContext, swift::SourceLoc atLoc,
-    swift::SourceLoc attrNameLoc, swift::SourceLoc lParenLoc,
-    BridgedDeclNameRef cReplacedFunction, swift::SourceLoc rParenLoc);
+    BridgedASTContext cContext, swift::SourceLoc cAtLoc,
+    swift::SourceLoc cAttrNameLoc, swift::SourceLoc cLParenLoc,
+    BridgedDeclNameRef cReplacedFunction,
+    BridgedDeclNameLoc cReplacedFunctionLoc, swift::SourceLoc cRParenLoc);
 
 SWIFT_NAME("BridgedEffectsAttr.createParsed(_:atLoc:range:effectKind:)")
 BridgedEffectsAttr BridgedEffectsAttr_createParsed(
@@ -1276,22 +1285,24 @@ enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedSpecializationKind : uint8_t {
 };
 
 SWIFT_NAME("BridgedSpecializeAttr.createParsed(_:atLoc:range:whereClause:"
-           "exported:kind:taretFunction:spiGroups:availableAttrs:)")
+           "exported:kind:targetFunction:targetFunctionLoc:spiGroups:"
+           "availableAttrs:)")
 BridgedSpecializeAttr BridgedSpecializeAttr_createParsed(
     BridgedASTContext cContext, swift::SourceLoc atLoc,
     swift::SourceRange range, BridgedNullableTrailingWhereClause cWhereClause,
     bool exported, BridgedSpecializationKind cKind,
-    BridgedDeclNameRef cTargetFunction, BridgedArrayRef cSPIGroups,
-    BridgedArrayRef cAvailableAttrs);
+    BridgedDeclNameRef cTargetFunction, BridgedDeclNameLoc cTargetFunctionLoc,
+    BridgedArrayRef cSPIGroups, BridgedArrayRef cAvailableAttrs);
 
 SWIFT_NAME("BridgedSpecializedAttr.createParsed(_:atLoc:range:whereClause:"
-           "exported:kind:taretFunction:spiGroups:availableAttrs:)")
+           "exported:kind:targetFunction:targetFunctionLoc:spiGroups:"
+           "availableAttrs:)")
 BridgedSpecializedAttr BridgedSpecializedAttr_createParsed(
     BridgedASTContext cContext, swift::SourceLoc atLoc,
     swift::SourceRange range, BridgedNullableTrailingWhereClause cWhereClause,
     bool exported, BridgedSpecializationKind cKind,
-    BridgedDeclNameRef cTargetFunction, BridgedArrayRef cSPIGroups,
-    BridgedArrayRef cAvailableAttrs);
+    BridgedDeclNameRef cTargetFunction, BridgedDeclNameLoc cTargetFunctionLoc,
+    BridgedArrayRef cSPIGroups, BridgedArrayRef cAvailableAttrs);
 
 SWIFT_NAME(
     "BridgedSPIAccessControlAttr.createParsed(_:atLoc:range:spiGroupName:)")
@@ -2544,9 +2555,10 @@ BridgedOpaqueReturnTypeOfTypeAttr_createParsed(
 // MARK: TypeReprs
 //===----------------------------------------------------------------------===//
 
-SWIFT_NAME("BridgedUnqualifiedIdentTypeRepr.createParsed(_:loc:name:)")
+SWIFT_NAME("BridgedUnqualifiedIdentTypeRepr.createParsed(_:name:loc:)")
 BridgedUnqualifiedIdentTypeRepr BridgedUnqualifiedIdentTypeRepr_createParsed(
-    BridgedASTContext cContext, swift::SourceLoc loc, swift::Identifier id);
+    BridgedASTContext cContext, BridgedDeclNameRef cName,
+    BridgedDeclNameLoc cLoc);
 
 SWIFT_NAME(
     "BridgedArrayTypeRepr.createParsed(_:base:leftSquareLoc:rightSquareLoc:)")
@@ -2580,8 +2592,8 @@ BridgedCompileTimeLiteralTypeRepr_createParsed(BridgedASTContext cContext,
 SWIFT_NAME("BridgedDeclRefTypeRepr.createParsed(_:base:name:nameLoc:"
            "genericArguments:angleRange:)")
 BridgedDeclRefTypeRepr BridgedDeclRefTypeRepr_createParsed(
-    BridgedASTContext cContext, BridgedTypeRepr cBase, swift::Identifier name,
-    swift::SourceLoc loc, BridgedArrayRef cGenericArguments,
+    BridgedASTContext cContext, BridgedTypeRepr cBase, BridgedDeclNameRef cName,
+    BridgedDeclNameLoc cLoc, BridgedArrayRef cGenericArguments,
     swift::SourceRange angleRange);
 
 SWIFT_NAME("BridgedDictionaryTypeRepr.createParsed(_:leftSquareLoc:keyType:"
@@ -2606,8 +2618,8 @@ BridgedFunctionTypeRepr BridgedFunctionTypeRepr_createParsed(
 SWIFT_NAME("BridgedUnqualifiedIdentTypeRepr.createParsed(_:name:nameLoc:"
            "genericArgs:leftAngleLoc:rightAngleLoc:)")
 BridgedUnqualifiedIdentTypeRepr BridgedUnqualifiedIdentTypeRepr_createParsed(
-    BridgedASTContext cContext, swift::Identifier name,
-    swift::SourceLoc nameLoc, BridgedArrayRef genericArgs,
+    BridgedASTContext cContext, BridgedDeclNameRef cName,
+    BridgedDeclNameLoc cNameLoc, BridgedArrayRef genericArgs,
     swift::SourceLoc lAngleLoc, swift::SourceLoc rAngleLoc);
 
 SWIFT_NAME("BridgedOptionalTypeRepr.createParsed(_:base:questionLoc:)")

include/swift/AST/ASTBridgingImpl.h

@@ -60,10 +60,12 @@ swift::DeclNameRef BridgedDeclNameRef::unbridged() const {
 
 BridgedDeclNameLoc::BridgedDeclNameLoc(swift::DeclNameLoc loc)
     : LocationInfo(loc.LocationInfo),
-      NumArgumentLabels(loc.NumArgumentLabels) {}
+      NumArgumentLabels(loc.NumArgumentLabels),
+      HasModuleSelectorLoc(loc.HasModuleSelectorLoc) {}
 
 swift::DeclNameLoc BridgedDeclNameLoc::unbridged() const {
-  return swift::DeclNameLoc(LocationInfo, NumArgumentLabels);
+  return swift::DeclNameLoc(LocationInfo, NumArgumentLabels,
+                            HasModuleSelectorLoc);
 }
 
 //===----------------------------------------------------------------------===//

include/swift/AST/Attr.h

@@ -1253,19 +1253,22 @@ class DynamicReplacementAttr final
   friend class DynamicallyReplacedDeclRequest;
 
   DeclNameRef ReplacedFunctionName;
+  DeclNameLoc ReplacedFunctionNameLoc;
   LazyMemberLoader *Resolver = nullptr;
   uint64_t ResolverContextData;
 
   /// Create an @_dynamicReplacement(for:) attribute written in the source.
   DynamicReplacementAttr(SourceLoc atLoc, SourceRange baseRange,
                          DeclNameRef replacedFunctionName,
+                         DeclNameLoc replacedFunctionNameLoc,
                          SourceRange parenRange);
 
   DynamicReplacementAttr(DeclNameRef name, AbstractFunctionDecl *f)
       : DeclAttribute(DeclAttrKind::DynamicReplacement, SourceLoc(),
                       SourceRange(),
                       /*Implicit=*/false),
-        ReplacedFunctionName(name), Resolver(nullptr), ResolverContextData(0) {
+        ReplacedFunctionName(name), ReplacedFunctionNameLoc(),
+        Resolver(nullptr), ResolverContextData(0) {
     Bits.DynamicReplacementAttr.HasTrailingLocationInfo = false;
   }
 
@@ -1274,8 +1277,8 @@ class DynamicReplacementAttr final
       : DeclAttribute(DeclAttrKind::DynamicReplacement, SourceLoc(),
                       SourceRange(),
                       /*Implicit=*/false),
-        ReplacedFunctionName(name), Resolver(Resolver),
-        ResolverContextData(Data) {
+        ReplacedFunctionName(name), ReplacedFunctionNameLoc(),
+        Resolver(Resolver), ResolverContextData(Data) {
     Bits.DynamicReplacementAttr.HasTrailingLocationInfo = false;
   }
 
@@ -1296,7 +1299,8 @@ class DynamicReplacementAttr final
 public:
   static DynamicReplacementAttr *
   create(ASTContext &Context, SourceLoc AtLoc, SourceLoc DynReplLoc,
-         SourceLoc LParenLoc, DeclNameRef replacedFunction, SourceLoc RParenLoc);
+         SourceLoc LParenLoc, DeclNameRef replacedFunction,
+         DeclNameLoc replacedFunctionNameLoc, SourceLoc RParenLoc);
 
   static DynamicReplacementAttr *create(ASTContext &ctx,
                                         DeclNameRef replacedFunction,
@@ -1311,6 +1315,10 @@ class DynamicReplacementAttr final
     return ReplacedFunctionName;
   }
 
+  DeclNameLoc getReplacedFunctionNameLoc() const {
+    return ReplacedFunctionNameLoc;
+  }
+
   /// Retrieve the location of the opening parentheses, if there is one.
   SourceLoc getLParenLoc() const;
 
@@ -1800,6 +1808,7 @@ class AbstractSpecializeAttr
   GenericSignature specializedSignature;
 
   DeclNameRef targetFunctionName;
+  DeclNameLoc targetFunctionNameLoc;
   LazyMemberLoader *resolver = nullptr;
   uint64_t resolverContextData;
   size_t numSPIGroups;
@@ -1812,7 +1821,9 @@ class AbstractSpecializeAttr
                  TrailingWhereClause *clause,
                  bool exported,
                  SpecializationKind kind, GenericSignature specializedSignature,
-                 DeclNameRef targetFunctionName, ArrayRef<Identifier> spiGroups,
+                 DeclNameRef targetFunctionName,
+                 DeclNameLoc targetFunctionNameLoc,
+                 ArrayRef<Identifier> spiGroups,
                  ArrayRef<AvailableAttr *> availabilityAttrs,
                  size_t typeErasedParamsCount);
 
@@ -1896,6 +1907,10 @@ class AbstractSpecializeAttr
     return targetFunctionName;
   }
 
+  DeclNameLoc getTargetFunctionNameLoc() const {
+    return targetFunctionNameLoc;
+  }
+
   /// \p forDecl is the value decl that the attribute belongs to.
   ValueDecl *getTargetFunctionDecl(const ValueDecl *forDecl) const;
 
@@ -1925,19 +1940,23 @@ class SpecializeAttr final : public AbstractSpecializeAttr,
                  TrailingWhereClause *clause,
                  bool exported,
                  SpecializationKind kind, GenericSignature specializedSignature,
-                 DeclNameRef targetFunctionName, ArrayRef<Identifier> spiGroups,
+                 DeclNameRef targetFunctionName,
+                 DeclNameLoc targetFunctionNameLoc,
+                 ArrayRef<Identifier> spiGroups,
                  ArrayRef<AvailableAttr *> availabilityAttrs,
                  size_t typeErasedParamsCount) :
     AbstractSpecializeAttr(DeclAttrKind::Specialize, atLoc, Range, clause,
                    exported, kind, specializedSignature, targetFunctionName,
-                   spiGroups, availabilityAttrs, typeErasedParamsCount) {}
+                   targetFunctionNameLoc, spiGroups, availabilityAttrs,
+                   typeErasedParamsCount) {}
 
 public:
   static SpecializeAttr *
   create(ASTContext &Ctx, SourceLoc atLoc, SourceRange Range,
          TrailingWhereClause *clause, bool exported,
          SpecializationKind kind,
-         DeclNameRef targetFunctionName, ArrayRef<Identifier> spiGroups,
+         DeclNameRef targetFunctionName, DeclNameLoc targetFunctionNameLoc,
+         ArrayRef<Identifier> spiGroups,
          ArrayRef<AvailableAttr *> availabilityAttrs,
          GenericSignature specializedSignature = nullptr);
 
@@ -1981,19 +2000,23 @@ class SpecializedAttr final : public AbstractSpecializeAttr ,
                  TrailingWhereClause *clause,
                  bool exported,
                  SpecializationKind kind, GenericSignature specializedSignature,
-                 DeclNameRef targetFunctionName, ArrayRef<Identifier> spiGroups,
+                 DeclNameRef targetFunctionName,
+                 DeclNameLoc targetFunctionNameLoc,
+                 ArrayRef<Identifier> spiGroups,
                  ArrayRef<AvailableAttr *> availabilityAttrs,
                  size_t typeErasedParamsCount) :
     AbstractSpecializeAttr(DeclAttrKind::Specialized, atLoc, Range, clause,
                    exported, kind, specializedSignature, targetFunctionName,
-                   spiGroups, availabilityAttrs, typeErasedParamsCount) {}
+                   targetFunctionNameLoc, spiGroups, availabilityAttrs,
+                   typeErasedParamsCount) {}
 
 public:
   static SpecializedAttr *
   create(ASTContext &Ctx, SourceLoc atLoc, SourceRange Range,
          TrailingWhereClause *clause, bool exported,
          SpecializationKind kind,
-         DeclNameRef targetFunctionName, ArrayRef<Identifier> spiGroups,
+         DeclNameRef targetFunctionName, DeclNameLoc targetFunctionNameLoc,
+         ArrayRef<Identifier> spiGroups,
          ArrayRef<AvailableAttr *> availabilityAttrs,
          GenericSignature specializedSignature = nullptr);
 

include/swift/AST/Decl.h

@@ -3038,11 +3038,10 @@ class ValueDecl : public Decl {
     return Name.getBaseIdentifier();
   }
 
-  /// Generates a DeclNameRef referring to this declaration with as much
-  /// specificity as possible.
-  DeclNameRef createNameRef() const {
-    return DeclNameRef(Name);
-  }
+  /// Generates a DeclNameRef referring to this declaration.
+  ///
+  /// \param moduleSelector If true, the name ref includes the module name.
+  DeclNameRef createNameRef(bool moduleSelector = false) const;
 
   /// Retrieve the C declaration name that names this function, or empty
   /// string if it has none.