Skip to content

Commit 032d50d

Browse files
authored
Merge pull request #60725 from apple/egorzhdan/cxx-module-interface-flag
[cxx-interop] Emit `-enable-experimental-cxx-interop` flag into the module interface
2 parents 609edfb + 0c35771 commit 032d50d

File tree

5 files changed

+13
-4
lines changed

5 files changed

+13
-4
lines changed

include/swift/Option/Options.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ def enable_experimental_concise_pound_file : Flag<["-"],
618618

619619
def enable_experimental_cxx_interop :
620620
Flag<["-"], "enable-experimental-cxx-interop">,
621-
Flags<[FrontendOption, HelpHidden]>,
621+
Flags<[FrontendOption, HelpHidden, ModuleInterfaceOption]>,
622622
HelpText<"Enable experimental C++ interop code generation and config directives">;
623623

624624
def experimental_cxx_stdlib :
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module Namespace {
1+
module Namespaces {
22
header "namespace.h"
33
requires cplusplus
44
}

test/Interop/Cxx/modules/Inputs/namespace-extension-lib.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Namespace
1+
import Namespaces
22

33
extension Namespace.Parent {
44
public static func test() -> Int { 42 }
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// RUN: %empty-directory(%t)
2+
// RUN: %target-swift-emit-module-interface(%t/UsesCxxStruct.swiftinterface) %s -I %S/Inputs -enable-library-evolution -swift-version 5 -enable-experimental-cxx-interop %S/Inputs/namespace-extension-lib.swift
3+
// RUN: %target-swift-typecheck-module-from-interface(%t/UsesCxxStruct.swiftinterface) -I %S/Inputs
4+
// RUN: %FileCheck --input-file=%t/UsesCxxStruct.swiftinterface %s
5+
// CHECK: -enable-experimental-cxx-interop
6+
7+
import Namespaces
8+
9+
var x: Namespace.Parent? = nil

test/Interop/Cxx/modules/use-namespace-extension-lib.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// XFAIL: OS=windows-msvc
1010

1111
import StdlibUnittest
12-
import Namespace
12+
import Namespaces
1313
import NamespaceExtensionLib
1414

1515
var NamespacesTestSuite = TestSuite("Extension in library on namespace")

0 commit comments

Comments
 (0)