Narrow the Clang importer's importDeclName to just importIdentifier. NFC

We never used it for non-identifier names, and the former is somewhat
ambiguous with the new importFullName.

Author: DougGregor

lib/ClangImporter/ClangImporter.cpp

@@ -1489,22 +1489,22 @@ DeclName ClangImporter::Implementation::importFullName(
 }
 
 Identifier
-ClangImporter::Implementation::importDeclName(clang::DeclarationName name,
-                                              StringRef removePrefix) {
-  // FIXME: At some point, we'll be able to import operators as well.
-  if (!name || name.getNameKind() != clang::DeclarationName::Identifier)
-    return Identifier();
+ClangImporter::Implementation::importIdentifier(
+  const clang::IdentifierInfo *identifier,
+  StringRef removePrefix)
+{
+  if (!identifier) return Identifier();
 
-  StringRef nameStr = name.getAsIdentifierInfo()->getName();
+  StringRef name = identifier->getName();
   // Remove the prefix, if any.
   if (!removePrefix.empty()) {
-    if (nameStr.startswith(removePrefix)) {
-      nameStr = nameStr.slice(removePrefix.size(), nameStr.size());
+    if (name.startswith(removePrefix)) {
+      name = name.slice(removePrefix.size(), name.size());
     }
   }
 
   // Get the Swift identifier.
-  return SwiftContext.getIdentifier(nameStr);
+  return SwiftContext.getIdentifier(name);
 }
 
 Identifier
@@ -1518,7 +1518,7 @@ ClangImporter::Implementation::importName(const clang::NamedDecl *D,
     return Identifier();
   }
 
-  Identifier result = importDeclName(D->getDeclName(), removePrefix);
+  Identifier result = importIdentifier(D->getIdentifier(), removePrefix);
   if (result.empty())
     return result;
 
@@ -2820,7 +2820,7 @@ void ClangImporter::lookupVisibleDecls(VisibleDeclConsumer &Consumer) const {
     for (auto I = ClangPP.macro_begin(), E = ClangPP.macro_end(); I != E; ++I) {
       if (!I->first->hasMacroDefinition())
         continue;
-      auto Name = Impl.importDeclName(I->first);
+      auto Name = Impl.importIdentifier(I->first);
       if (Name.empty())
         continue;
       if (auto *Imported = Impl.importMacro(

lib/ClangImporter/ImportDecl.cpp

@@ -5108,7 +5108,7 @@ namespace {
                                    name,
                                    None);
       result->computeType();
-      addObjCAttribute(result, Impl.importDeclName(decl->getDeclName()));
+      addObjCAttribute(result, Impl.importIdentifier(decl->getIdentifier()));
 
       if (declaredNative)
         markMissingSwiftDecl(result);
@@ -5193,7 +5193,7 @@ namespace {
         result->setSuperclass(Type());
         result->setCheckedInheritanceClause();
         result->setAddedImplicitInitializers(); // suppress all initializers
-        addObjCAttribute(result, Impl.importDeclName(decl->getDeclName()));
+        addObjCAttribute(result, Impl.importIdentifier(decl->getIdentifier()));
         Impl.registerExternalDecl(result);
         return result;
       };
@@ -5262,7 +5262,7 @@ namespace {
       Impl.ImportedDecls[decl->getCanonicalDecl()] = result;
       result->setCircularityCheck(CircularityCheck::Checked);
       result->setAddedImplicitInitializers();
-      addObjCAttribute(result, Impl.importDeclName(decl->getDeclName()));
+      addObjCAttribute(result, Impl.importIdentifier(decl->getIdentifier()));
 
       if (declaredNative)
         markMissingSwiftDecl(result);

lib/ClangImporter/ImporterImpl.h

@@ -734,15 +734,15 @@ class LLVM_LIBRARY_VISIBILITY ClangImporter::Implementation
   /// \sa importName(clang::DeclarationName, StringRef)
   Identifier importName(const clang::NamedDecl *D, StringRef removePrefix = "");
 
-  /// \brief Import the given Clang name into Swift.
+  /// \brief Import the given Clang identifier into Swift.
   ///
-  /// \param name The Clang name to map into Swift.
+  /// \param identifier The Clang identifier to map into Swift.
   ///
   /// \param removePrefix The prefix to remove from the Clang name to produce
   /// the Swift name. If the Clang name does not start with this prefix,
   /// nothing is removed.
-  Identifier importDeclName(clang::DeclarationName name,
-                            StringRef removePrefix = "");
+  Identifier importIdentifier(const clang::IdentifierInfo *identifier,
+                              StringRef removePrefix = "");
 
   /// Import an Objective-C selector.
   ObjCSelector importSelector(clang::Selector selector);