Merge pull request #9977 from ahoppen/pdm-remove-get-name

Remove getName method from ValueDecl

Author: ahoppen

include/swift/AST/Decl.h

@@ -2121,13 +2121,13 @@ class ValueDecl : public Decl {
   }
 
   bool hasName() const { return bool(Name); }
-  /// TODO: Rename to getSimpleName?
-  Identifier getName() const { return Name.getBaseName(); }
   bool isOperator() const { return Name.isOperator(); }
 
   /// Returns the string for the base name, or "_" if this is unnamed.
   StringRef getNameStr() const {
-    return hasName() ? getName().str() : "_";
+    // TODO: Check if this function is called for special names
+    assert(!Name.isSpecial() && "Cannot get string for special names");
+    return hasName() ? Name.getBaseName().getIdentifier().str() : "_";
   }
 
   /// Retrieve the full name of the declaration.
@@ -2356,6 +2356,8 @@ class TypeDecl : public ValueDecl {
   }
 
 public:
+  Identifier getName() const { return getFullName().getBaseIdentifier(); }
+
   /// The type of this declaration's values. For the type of the
   /// declaration itself, use getInterfaceType(), which returns a
   /// metatype.
@@ -4348,6 +4350,8 @@ class VarDecl : public AbstractStorageDecl {
 
   SourceRange getSourceRange() const;
 
+  Identifier getName() const { return getFullName().getBaseIdentifier(); }
+
   TypeLoc &getTypeLoc() { return typeLoc; }
   TypeLoc getTypeLoc() const { return typeLoc; }
 
@@ -4817,6 +4821,8 @@ class AbstractFunctionDecl : public ValueDecl, public GenericContext {
   }
 
 public:
+  Identifier getName() const { return getFullName().getBaseIdentifier(); }
+
   /// \brief Should this declaration be treated as if annotated with transparent
   /// attribute.
   bool isTransparent() const;
@@ -5446,6 +5452,8 @@ class EnumElementDecl : public ValueDecl {
     EnumElementDeclBits.HasArgumentType = HasArgumentType;
   }
 
+  Identifier getName() const { return getFullName().getBaseIdentifier(); }
+
   /// \returns false if there was an error during the computation rendering the
   /// EnumElementDecl invalid, true otherwise.
   bool computeType();

lib/IRGen/IRGenDebugInfo.cpp

@@ -400,7 +400,9 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
         }
 
         SmallVector<char, 64> Buf;
-        StringRef Name = (VD->getName().str() + Twine(Kind)).toStringRef(Buf);
+        // TODO: Handle special names
+        StringRef Name = (VD->getBaseName().getIdentifier().str() +
+                          Twine(Kind)).toStringRef(Buf);
         return BumpAllocatedString(Name);
       }
 

lib/Parse/Parser.cpp

@@ -770,7 +770,7 @@ void Parser::diagnoseRedefinition(ValueDecl *Prev, ValueDecl *New) {
   assert(New != Prev && "Cannot conflict with self");
   diagnose(New->getLoc(), diag::decl_redefinition, New->isDefinition());
   diagnose(Prev->getLoc(), diag::previous_decldef, Prev->isDefinition(),
-           Prev->getName());
+           Prev->getBaseName());
 }
 
 struct ParserUnit::Implementation {

lib/Sema/CSDiag.cpp

@@ -4950,7 +4950,7 @@ static bool diagnoseTupleParameterMismatch(CalleeCandidateInfo &CCI,
           // Constructors/descructors and subscripts don't really have names.
           if (!(isa<ConstructorDecl>(decl) || isa<DestructorDecl>(decl) ||
                 isa<SubscriptDecl>(decl))) {
-            name = decl->getName();
+            name = decl->getBaseName().getIdentifier();
           }
 
           TC.diagnose(argExpr->getLoc(), diag::single_tuple_parameter_mismatch,

lib/Sema/TypeCheckProtocol.cpp

@@ -1391,7 +1391,7 @@ bool WitnessChecker::findBestWitness(
 
       auto lookupOptions = defaultUnqualifiedLookupOptions;
       lookupOptions |= NameLookupFlags::KnownPrivate;
-      auto lookup = TC.lookupUnqualified(overlay, requirement->getName(),
+      auto lookup = TC.lookupUnqualified(overlay, requirement->getBaseName(),
                                          SourceLoc(), lookupOptions);
       for (auto candidate : lookup)
         witnesses.push_back(candidate.Decl);