Merge pull request #5677 from milseman/import_name_cleanup

[Import Name] Cleanup some needless parameters

Author: milseman

lib/ClangImporter/ImportName.cpp

@@ -793,9 +793,10 @@ static StringRef determineSwiftNewtypeBaseName(StringRef baseName,
   return baseName;
 }
 
-EffectiveClangContext NameImporter::determineEffectiveContext(
-    const clang::NamedDecl *decl, const clang::DeclContext *dc,
-    ImportNameOptions options, clang::Sema &clangSema) {
+EffectiveClangContext
+NameImporter::determineEffectiveContext(const clang::NamedDecl *decl,
+                                        const clang::DeclContext *dc,
+                                        ImportNameOptions options) {
   EffectiveClangContext res;
 
   // Enumerators can end up within their enclosing enum or in the global
@@ -841,8 +842,7 @@ EffectiveClangContext NameImporter::determineEffectiveContext(
 
 bool NameImporter::hasNamingConflict(const clang::NamedDecl *decl,
                                      const clang::IdentifierInfo *proposedName,
-                                     const clang::TypedefNameDecl *cfTypedef,
-                                     clang::Sema &clangSema) {
+                                     const clang::TypedefNameDecl *cfTypedef) {
   // Test to see if there is a value with the same name as 'proposedName'
   // in the same module as the decl
   // FIXME: This will miss macros.
@@ -1101,7 +1101,7 @@ ImportedName NameImporter::importNameImpl(const clang::NamedDecl *D,
 
   // Compute the effective context.
   auto dc = const_cast<clang::DeclContext *>(D->getDeclContext());
-  auto effectiveCtx = determineEffectiveContext(D, dc, options, clangSema);
+  auto effectiveCtx = determineEffectiveContext(D, dc, options);
   if (!effectiveCtx)
     return {};
   result.EffectiveContext = effectiveCtx;
@@ -1455,8 +1455,7 @@ ImportedName NameImporter::importNameImpl(const clang::NamedDecl *D,
   SmallString<16> baseNameWithProtocolSuffix;
   if (auto objcProto = dyn_cast<clang::ObjCProtocolDecl>(D)) {
     if (objcProto->hasDefinition()) {
-      if (hasNamingConflict(D, objcProto->getIdentifier(), nullptr,
-                            clangSema)) {
+      if (hasNamingConflict(D, objcProto->getIdentifier(), nullptr)) {
         baseNameWithProtocolSuffix = baseName;
         baseNameWithProtocolSuffix += SWIFT_PROTOCOL_SUFFIX;
         baseName = baseNameWithProtocolSuffix;
@@ -1472,7 +1471,7 @@ ImportedName NameImporter::importNameImpl(const clang::NamedDecl *D,
       auto swiftName = getCFTypeName(typedefNameDecl);
       if (!swiftName.empty() &&
           !hasNamingConflict(D, &clangCtx.Idents.get(swiftName),
-                             typedefNameDecl, clangSema)) {
+                             typedefNameDecl)) {
         // Adopt the requested name.
         baseName = swiftName;
       }

lib/ClangImporter/ImportName.h

@@ -226,8 +226,7 @@ class NameImporter {
   /// the same module as the decl
   bool hasNamingConflict(const clang::NamedDecl *decl,
                          const clang::IdentifierInfo *proposedName,
-                         const clang::TypedefNameDecl *cfTypedef,
-                         clang::Sema &clangSema);
+                         const clang::TypedefNameDecl *cfTypedef);
 
   Optional<ImportedErrorInfo>
   considerErrorImport(const clang::ObjCMethodDecl *clangDecl,
@@ -241,8 +240,7 @@ class NameImporter {
 
   EffectiveClangContext determineEffectiveContext(const clang::NamedDecl *,
                                                   const clang::DeclContext *,
-                                                  ImportNameOptions options,
-                                                  clang::Sema &clangSema);
+                                                  ImportNameOptions options);
 
   ImportedName importNameImpl(const clang::NamedDecl *,
                               ImportNameOptions options);