Merge pull request #5074 from milseman/import_name

[Clang Importer] Restore shouldIgnoreMacro API

Author: milseman

include/swift/ClangImporter/ClangImporter.h

@@ -231,6 +231,9 @@ class ClangImporter final : public ClangModuleLoader {
   /// Otherwise, return nullptr.
   Decl *importDeclCached(const clang::NamedDecl *ClangDecl);
 
+  // Returns true if it is expected that the macro is ignored.
+  bool shouldIgnoreMacro(StringRef Name, const clang::MacroInfo *Macro);
+
   /// Returns the name of the given enum element as it would be imported into
   /// Swift.
   ///

lib/ClangImporter/ImportName.cpp

@@ -1621,6 +1621,11 @@ static bool shouldIgnoreMacro(StringRef name, const clang::MacroInfo *macro) {
   return false;
 }
 
+bool ClangImporter::shouldIgnoreMacro(StringRef Name,
+                                      const clang::MacroInfo *Macro) {
+  return ::shouldIgnoreMacro(Name, Macro);
+}
+
 Identifier importer::importMacroName(
     const clang::IdentifierInfo *clangIdentifier, const clang::MacroInfo *macro,
     clang::ASTContext &clangCtx, ASTContext &SwiftContext) {