Clang importer: convert more importName callers over to importFullNam…

…e. NFC

The sole remaining caller to importName is for enumerators, which may
have prefixes that need stripping. That refactor will come in a
subsequent commit.

lib/ClangImporter/ClangImporter.cpp

@@ -743,8 +743,7 @@ bool ClangImporter::Implementation::importHeader(
 
         if (UseSwiftLookupTables) {
           if (auto named = dyn_cast<clang::NamedDecl>(D)) {
-            bool hasCustomName;
-            if (DeclName name = importFullName(named, hasCustomName))
+            if (DeclName name = importFullName(named))
               BridgingHeaderLookupTable.addEntry(name, named);
           }
         }

lib/ClangImporter/ImportDecl.cpp

@@ -1064,12 +1064,16 @@ makeBitFieldAccessors(ClangImporter::Implementation &Impl,
 /// generated name will most likely be unique.
 static Identifier getClangDeclName(ClangImporter::Implementation &Impl,
                                    const clang::TagDecl *decl) {
-  if (decl->getDeclName() || decl->hasAttr<clang::SwiftNameAttr>())
-    return Impl.importName(decl);
-  else if (auto *typedefForAnon = decl->getTypedefNameForAnonDecl())
-    return Impl.importName(typedefForAnon);
-
-  Identifier name;
+  // Import the name of this declaration.
+  Identifier name = Impl.importFullName(decl).getBaseName();
+  if (!name.empty()) return name;
+
+  // If that didn't succeed, check whether this is an anonymous tag declaration
+  // with a corresponding typedef-name declaration.
+  if (decl->getDeclName().isEmpty()) {
+    if (auto *typedefForAnon = decl->getTypedefNameForAnonDecl())
+      return Impl.importFullName(typedefForAnon).getBaseName();
+  }
 
   if (!decl->isRecord())
     return name;
@@ -1518,7 +1522,7 @@ namespace {
     }
 
     Decl *VisitTypedefNameDecl(const clang::TypedefNameDecl *Decl) {
-      auto Name = Impl.importName(Decl);
+      auto Name = Impl.importFullName(Decl).getBaseName();
       if (Name.empty())
         return nullptr;
 
@@ -2684,7 +2688,7 @@ namespace {
             return nullptr;
         }
       }
-      auto name = Impl.importName(decl);
+      auto name = Impl.importFullName(decl).getBaseName();
       if (name.empty())
         return nullptr;
 
@@ -2790,7 +2794,7 @@ namespace {
 
     Decl *VisitFieldDecl(const clang::FieldDecl *decl) {
       // Fields are imported as variables.
-      auto name = Impl.importName(decl);
+      auto name = Impl.importFullName(decl).getBaseName();
       if (name.empty())
         return nullptr;
 
@@ -2836,7 +2840,7 @@ namespace {
         return nullptr;
 
       // Variables are imported as... variables.
-      auto name = Impl.importName(decl);
+      auto name = Impl.importFullName(decl).getBaseName();
       if (name.empty())
         return nullptr;
 
@@ -5019,7 +5023,7 @@ namespace {
     }
 
     Decl *VisitObjCProtocolDecl(const clang::ObjCProtocolDecl *decl) {
-      Identifier name = Impl.importName(decl);
+      Identifier name = Impl.importFullName(decl).getBaseName();
       if (name.empty())
         return nullptr;
 
@@ -5173,7 +5177,7 @@ namespace {
     }
 
     Decl *VisitObjCInterfaceDecl(const clang::ObjCInterfaceDecl *decl) {
-      auto name = Impl.importName(decl);
+      auto name = Impl.importFullName(decl).getBaseName();
       if (name.empty())
         return nullptr;
 
@@ -5389,7 +5393,7 @@ namespace {
 
     Decl *VisitObjCPropertyDecl(const clang::ObjCPropertyDecl *decl,
                                 DeclContext *dc) {
-      auto name = Impl.importName(decl);
+      auto name = Impl.importFullName(decl).getBaseName();
       if (name.empty())
         return nullptr;
 

lib/ClangImporter/ImportType.cpp

@@ -1425,7 +1425,7 @@ Type ClangImporter::Implementation::importFunctionType(
     }
 
     // Figure out the name for this parameter.
-    Identifier bodyName = importName(param);
+    Identifier bodyName = importFullName(param).getBaseName();
 
     // Retrieve the argument name.
     Identifier name;
@@ -2427,7 +2427,7 @@ Type ClangImporter::Implementation::importMethodType(
     }
 
     // Figure out the name for this parameter.
-    Identifier bodyName = importName(param);
+    Identifier bodyName = importFullName(param).getBaseName();
 
     // Figure out the name for this argument, which comes from the method name.
     Identifier name;

lib/ClangImporter/ImporterImpl.h

@@ -718,6 +718,15 @@ class LLVM_LIBRARY_VISIBILITY ClangImporter::Implementation
   /// \brief Converts the given Swift identifier for Clang.
   clang::DeclarationName exportName(Identifier name);
 
+  /// Imports the full name of the given Clang declaration into Swift.
+  ///
+  /// Note that this may result in a name very different from the Clang name,
+  /// so it should not be used when referencing Clang symbols.
+  DeclName importFullName(const clang::NamedDecl *D) {
+    bool hasCustomName;
+    return importFullName(D, hasCustomName);
+  }
+
   /// Imports the full name of the given Clang declaration into Swift.
   ///
   /// Note that this may result in a name very different from the Clang name,

test/IDE/Inputs/swift_name.h

@@ -13,5 +13,12 @@ struct SNSomeStruct SNMakeSomeStruct(double X, double Y) SWIFT_NAME(makeSomeStru
 
 struct SNSomeStruct SNMakeSomeStructForX(double X) SWIFT_NAME(makeSomeStruct(x:));
 
+// Renaming typedefs.
+typedef int SNIntegerType SWIFT_NAME(MyInt);
+
 // swift_private attribute
 void SNTransposeInPlace(struct SNSomeStruct *value) __attribute__((swift_private));
+
+typedef struct {
+  double x, y, z;
+} SNPoint SWIFT_NAME(Point);

test/IDE/dump_swift_lookup_tables.swift

@@ -3,13 +3,19 @@
 
 // CHECK:      Base -> full name mappings:
 // CHECK-NEXT:   Bar --> Bar
+// CHECK-NEXT:   MyInt --> MyInt
+// CHECK-NEXT:   Point --> Point
 // CHECK-NEXT:   SomeStruct --> SomeStruct
 // CHECK-NEXT:   __SNTransposeInPlace --> __SNTransposeInPlace
 // CHECK-NEXT:   makeSomeStruct --> makeSomeStruct(x:y:), makeSomeStruct(x:)
 
 // CHECK:      Full name -> entry mappings:
 // CHECK-NEXT:   Bar:
 // CHECK-NEXT:     TU: SNFoo
+// CHECK-NEXT:   MyInt:
+// CHECK-NEXT:     TU: SNIntegerType
+// CHECK-NEXT:   Point:
+// CHECK-NEXT:     TU: SNPoint
 // CHECK-NEXT:   SomeStruct:
 // CHECK-NEXT:     TU: SNSomeStruct
 // CHECK-NEXT:   __SNTransposeInPlace: