Merge pull request #41419 from beccadax/not-enough-bits

[NFC] 32-bit-safe ImportDiagnosticTarget

Author: beccadax

include/swift/ClangImporter/ClangImporter.h

@@ -110,9 +110,12 @@ class DWARFImporterDelegate {
   virtual void anchor();
 };
 
+// ⚠️ DANGER ⚠️
+// Putting more than four types in this `PointerUnion` will break the build for
+// 32-bit hosts. If we need five or more types in the future, we'll need to
+// design a proper larger-than-word-sized type.
 typedef llvm::PointerUnion<const clang::Decl *, const clang::MacroInfo *,
-                           const clang::ModuleMacro *, const clang::Type *,
-                           const clang::Token *>
+                           const clang::Type *, const clang::Token *>
     ImportDiagnosticTarget;
 
 /// Class that imports Clang modules into Swift, mapping directly

lib/ClangImporter/ClangImporter.cpp

@@ -4221,9 +4221,6 @@ void ClangImporter::Implementation::diagnoseTargetDirectly(
   } else if (const clang::MacroInfo *macro =
                  target.dyn_cast<const clang::MacroInfo *>()) {
     Walker.VisitMacro(macro);
-  } else if (const clang::ModuleMacro *macro =
-                 target.dyn_cast<const clang::ModuleMacro *>()) {
-    Walker.VisitMacro(macro->getMacroInfo());
   }
 }
 
@@ -4237,7 +4234,7 @@ ClangImporter::Implementation::importDiagnosticTargetFromLookupTableEntry(
     return macro;
   } else if (const clang::ModuleMacro *macro =
                  entry.dyn_cast<clang::ModuleMacro *>()) {
-    return macro;
+    return macro->getMacroInfo();
   }
   llvm_unreachable("SwiftLookupTable::Single entry must be a NamedDecl, "
                    "MacroInfo or ModuleMacro pointer");