Merge pull request #78683 from porglezomp-misc/6.1-workaround-simd-quatf

🍒6.1 [cxx-interop] Workaround name lookup issues with namespace simd

Author: porglezomp

lib/ClangImporter/ImportDecl.cpp

@@ -1155,6 +1155,14 @@ namespace {
           decl->getOwningModule() &&
           decl->getOwningModule()->getTopLevelModuleName() == "os")
         return nullptr;
+      // Workaround for simd module declaring `namespace simd` on Darwin,
+      // causing name lookup issues. That namespace declares C++ overlays of
+      // types that are already refined for Swift, so let's not import the
+      // namespace (rdar://143007477).
+      if (decl->getIdentifier() && decl->getName() == "simd" &&
+          decl->getOwningModule() &&
+          decl->getOwningModule()->getTopLevelModuleName() == "simd")
+        return nullptr;
       // If this is a top-level namespace, don't put it in the module we're
       // importing, put it in the "__ObjC" module that is implicitly imported.
       if (!decl->getParent()->isNamespace())

test/Interop/Cxx/objc-correctness/simd_quatf.swift

@@ -0,0 +1,8 @@
+// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default %s
+
+// REQUIRES: objc_interop
+// REQUIRES: VENDOR=apple
+
+import simd
+
+var _: simd.simd_quatf! = nil