Skip to content

Commit 4ce5a23

Browse files
committed
[cxx-interop] Allow Darwin overlay to be rebuilt with C++ interop enabled
This removes a workaround from the module interface loader, which was forcing Darwin to be rebuilt from their textual interfaces with C++ interop disabled, even if the current compilation explicitly enables it. See also 3791ccb. rdar://142961112
1 parent 95ea010 commit 4ce5a23

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

lib/Frontend/ModuleInterfaceLoader.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2102,11 +2102,9 @@ InterfaceSubContextDelegateImpl::runInSubCompilerInstance(StringRef moduleName,
21022102
BuildArgs.push_back("-module-name");
21032103
BuildArgs.push_back(moduleName);
21042104

2105-
// FIXME: Hack for Darwin.swiftmodule, which cannot be rebuilt with C++
2106-
// interop enabled by the Swift CI because it uses an old host SDK.
21072105
// FIXME: Hack for CoreGraphics.swiftmodule, which cannot be rebuilt because
21082106
// of a CF_OPTIONS bug (rdar://142762174).
2109-
if (moduleName == "Darwin" || moduleName == "CoreGraphics") {
2107+
if (moduleName == "CoreGraphics") {
21102108
subInvocation.getLangOptions().EnableCXXInterop = false;
21112109
subInvocation.getLangOptions().cxxInteropCompatVersion = {};
21122110
BuildArgs.erase(llvm::remove_if(BuildArgs,

0 commit comments

Comments
 (0)