Skip to content

Commit 6d873db

Browse files
committed
[cxx-interop] Do not import std::__compressed_pair
This type is triggering modularization issues in libc++: ``` error: definition of '__builtin_new_deleter' must be imported from module 'std_private_memory_builtin_new_allocator' before it is required ``` This is a workaround to keep things building. rdar://142576799 (cherry picked from commit cb2bd32)
1 parent 1ac9fd8 commit 6d873db

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

lib/ClangImporter/ImportDecl.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2764,6 +2764,7 @@ namespace {
27642764
decl->getDeclContext()->getParent()->isStdNamespace() &&
27652765
decl->getIdentifier() &&
27662766
(decl->getName() == "tzdb" || decl->getName() == "time_zone_link" ||
2767+
decl->getName() == "__compressed_pair" ||
27672768
decl->getName() == "time_zone"))
27682769
return nullptr;
27692770

0 commit comments

Comments
 (0)