Skip to content

Commit 7c7f9fd

Browse files
authored
Merge pull request #78852 from swiftlang/egorzhdan/revert-simd
Revert "[cxx-interop] Workaround name lookup issues with namespace simd"
2 parents ab8e561 + 2a2856f commit 7c7f9fd

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

lib/ClangImporter/ImportDecl.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,14 +1166,6 @@ namespace {
11661166
decl->getOwningModule() &&
11671167
decl->getOwningModule()->getTopLevelModuleName() == "os")
11681168
return nullptr;
1169-
// Workaround for simd module declaring `namespace simd` on Darwin,
1170-
// causing name lookup issues. That namespace declares C++ overlays of
1171-
// types that are already refined for Swift, so let's not import the
1172-
// namespace (rdar://143007477).
1173-
if (decl->getIdentifier() && decl->getName() == "simd" &&
1174-
decl->getOwningModule() &&
1175-
decl->getOwningModule()->getTopLevelModuleName() == "simd")
1176-
return nullptr;
11771169
// If this is a top-level namespace, don't put it in the module we're
11781170
// importing, put it in the "__ObjC" module that is implicitly imported.
11791171
if (!decl->getParent()->isNamespace())

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

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)