Skip to content

Commit 839839f

Browse files
zoecarverzoecarver
committed
[cxx-interop] Rename enable-cxx-interop -> enable-experimental-cxx-interop.
Also removes the driver flag, this will now also always be guarded on `-Xfrontend`.
1 parent 27ad938 commit 839839f

File tree

241 files changed

+266
-270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

241 files changed

+266
-270
lines changed

Diff for: ‎SwiftCompilerSources/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function(add_swift_compiler_modules_library name)
7474

7575
set(swift_compile_options
7676
"-Xfrontend" "-validate-tbd-against-ir=none"
77-
"-Xfrontend" "-enable-cxx-interop"
77+
"-Xfrontend" "-enable-experimental-cxx-interop"
7878
"-Xcc" "-UIBOutlet" "-Xcc" "-UIBAction" "-Xcc" "-UIBInspectable")
7979

8080
if(CMAKE_BUILD_TYPE STREQUAL Debug)

Diff for: ‎benchmark/Package.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ targets.append(
118118
path: "utils",
119119
sources: ["main.swift"],
120120
swiftSettings: [.unsafeFlags(["-Xfrontend",
121-
"-enable-cxx-interop",
121+
"-enable-experimental-cxx-interop",
122122
"-I",
123123
"utils/CxxTests"])]))
124124

@@ -157,7 +157,7 @@ targets += cxxSingleSourceLibraries.map { name in
157157
path: "cxx-source",
158158
sources: ["\(name).swift"],
159159
swiftSettings: [.unsafeFlags(["-Xfrontend",
160-
"-enable-cxx-interop",
160+
"-enable-experimental-cxx-interop",
161161
"-I",
162162
"utils/CxxTests"])])
163163
}

Diff for: ‎benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

+3-3
Original file line numberDiff line numberDiff line change
@@ -478,10 +478,10 @@ function (swift_benchmark_compile_archopts)
478478
list(APPEND SWIFT_BENCH_OBJFILES "${objfile}")
479479
list(APPEND bench_library_swiftmodules "${swiftmodule}")
480480

481-
# Only set "enable-cxx-interop" for tests in the "cxx-source" directory.
481+
# Only set "enable-experimental-cxx-interop" for tests in the "cxx-source" directory.
482482
set(cxx_options "")
483483
if ("${module_name_path}" MATCHES ".*cxx-source/.*")
484-
list(APPEND cxx_options "-Xfrontend" "-enable-cxx-interop" "-I" "${srcdir}/utils/CxxTests/")
484+
list(APPEND cxx_options "-Xfrontend" "-enable-experimental-cxx-interop" "-I" "${srcdir}/utils/CxxTests/")
485485
endif()
486486

487487
if ("${bench_flags}" MATCHES "-whole-module.*")
@@ -590,7 +590,7 @@ function (swift_benchmark_compile_archopts)
590590
"-whole-module-optimization"
591591
"-emit-module" "-module-name" "${module_name}"
592592
"-I" "${objdir}"
593-
"-Xfrontend" "-enable-cxx-interop"
593+
"-Xfrontend" "-enable-experimental-cxx-interop"
594594
"-I" "${srcdir}/utils/CxxTests/"
595595
"-o" "${objdir}/${module_name}.o"
596596
"${source}")

Diff for: ‎docs/CppInteroperability/GettingStartedWithC++Interop.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ module Cxx {
3434
Add the C++ module to the include path and enable C++ interop:
3535
- Navigate to your project directory
3636
- In `Project` navigate to `Build Settings` -> `Swift Compiler`
37-
- Under `Custom Flags` -> `Other Swift Flags` add`-Xfrontend -enable-cxx-interop`
37+
- Under `Custom Flags` -> `Other Swift Flags` add`-Xfrontend -enable-experimental-cxx-interop`
3838
- Under `Search Paths` -> `Import Paths` add your search path to the C++ module (i.e, `./ProjectName/Cxx`). Repeat this step in `Other Swift Flags`
3939

4040
```
4141
//Add to Other Swift Flags and Import Paths respectively
42-
-Xfrontend -enable-cxx-interop
42+
-Xfrontend -enable-experimental-cxx-interop
4343
-I./ProjectName/Cxx
4444
```
4545

@@ -88,7 +88,7 @@ After creating your Swift package project, follow the steps [Creating a Module t
8888
- Swift code will be in `Sources/CxxInterop` called `main.swift`
8989
- C++ source code follows the example shown in [Creating a Module to contain your C++ source code](#creating-a-module-to-contain-your-c-source-code)
9090
- Under targets, add the name of your C++ module and the directory containing the Swift code as a target.
91-
- In the target defining your Swift target, add a`dependencies` to the C++ Module, the `path`, `source`, and `swiftSettings` with `unsafeFlags` with the source to the C++ Module, and enable `-enable-cxx-interop`
91+
- In the target defining your Swift target, add a`dependencies` to the C++ Module, the `path`, `source`, and `swiftSettings` with `unsafeFlags` with the source to the C++ Module, and enable `-enable-experimental-cxx-interop`
9292

9393
```
9494
//In Package Manifest
@@ -118,7 +118,7 @@ let package = Package(
118118
sources: [ "main.swift" ],
119119
swiftSettings: [.unsafeFlags([
120120
"-I", "Sources/Cxx",
121-
"-Xfrontend", "-enable-cxx-interop",
121+
"-Xfrontend", "-enable-experimental-cxx-interop",
122122
])]
123123
),
124124
]
@@ -151,7 +151,7 @@ After creating your project follow the steps [Creating a Module to contain your
151151
- Create a `CMakeLists.txt` file and configure for your project
152152
- In`add_library` invoke `cxx-support` with the path to the C++ implementation file
153153
- Add the `target_include_directories` with `cxx-support` and path to the C++ Module `${CMAKE_SOURCE_DIR}/Sources/Cxx`
154-
- Add the `add_executable` to the specific files/directory you would like to generate source, with`SHELL:-Xfrontend -enable-cxx-interop`.
154+
- Add the `add_executable` to the specific files/directory you would like to generate source, with`SHELL:-Xfrontend -enable-experimental-cxx-interop`.
155155
- In the example below we will be following the file structure used in [Creating a Swift Package](#Creating-a-Swift-Package)
156156

157157
```
@@ -176,7 +176,7 @@ target_include_directories(cxx-support PUBLIC
176176
177177
add_executable(CxxInterop ./Sources/CxxInterop/main.swift)
178178
target_compile_options(CxxInterop PRIVATE
179-
"SHELL:-Xfrontend -enable-cxx-interop"
179+
"SHELL:-Xfrontend -enable-experimental-cxx-interop"
180180
target_link_libraries(CxxInterop PRIVATE cxx-support)
181181
182182
```

Diff for: ‎include/swift/Option/FrontendOptions.td

+2-2
Original file line numberDiff line numberDiff line change
@@ -823,8 +823,8 @@ def emit_sorted_sil : Flag<["-"], "emit-sorted-sil">,
823823
def emit_syntax : Flag<["-"], "emit-syntax">,
824824
HelpText<"Parse input file(s) and emit the Syntax tree(s) as JSON">, ModeOpt;
825825

826-
def enable_cxx_interop :
827-
Flag<["-"], "enable-cxx-interop">,
826+
def enable_experimental_cxx_interop :
827+
Flag<["-"], "enable-experimental-cxx-interop">,
828828
HelpText<"Enable C++ interop code generation and config directives">,
829829
Flags<[FrontendOption, HelpHidden]>;
830830

Diff for: ‎include/swift/Option/Options.td

-4
Original file line numberDiff line numberDiff line change
@@ -608,10 +608,6 @@ def enable_experimental_concise_pound_file : Flag<["-"],
608608
Flags<[FrontendOption, ModuleInterfaceOption]>,
609609
HelpText<"Enable experimental concise '#file' identifier">;
610610

611-
def enable_experimental_cxx_interop :
612-
Flag<["-"], "enable-experimental-cxx-interop">,
613-
HelpText<"Allow importing C++ modules into Swift (experimental feature)">;
614-
615611
def experimental_cxx_stdlib :
616612
Separate<["-"], "experimental-cxx-stdlib">,
617613
HelpText<"C++ standard library to use; forwarded to Clang's -stdlib flag">;

Diff for: ‎lib/Driver/ToolChains.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
190190

191191
// Add flags for C++ interop.
192192
if (inputArgs.hasArg(options::OPT_enable_experimental_cxx_interop)) {
193-
arguments.push_back("-enable-cxx-interop");
193+
arguments.push_back("-enable-experimental-cxx-interop");
194194
}
195195
if (const Arg *arg =
196196
inputArgs.getLastArg(options::OPT_experimental_cxx_stdlib)) {

Diff for: ‎lib/Frontend/CompilerInvocation.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
757757
Opts.ClangTarget = llvm::Triple(A->getValue());
758758
}
759759

760-
Opts.EnableCXXInterop |= Args.hasArg(OPT_enable_cxx_interop);
760+
Opts.EnableCXXInterop |= Args.hasArg(OPT_enable_experimental_cxx_interop);
761761
Opts.EnableObjCInterop =
762762
Args.hasFlag(OPT_enable_objc_interop, OPT_disable_objc_interop,
763763
Target.isOSDarwin());

Diff for: ‎test/Driver/cxx_interop.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s -enable-experimental-cxx-interop 2>^1 | %FileCheck -check-prefix ENABLE %s
1+
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s -Xfrontend -enable-experimental-cxx-interop 2>^1 | %FileCheck -check-prefix ENABLE %s
22

3-
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s -enable-experimental-cxx-interop -experimental-cxx-stdlib libc++ 2>^1 | %FileCheck -check-prefix STDLIB %s
3+
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s -Xfrontend -enable-experimental-cxx-interop -experimental-cxx-stdlib libc++ 2>^1 | %FileCheck -check-prefix STDLIB %s
44

55
// ENABLE: swift
6-
// ENABLE: -enable-cxx-interop
6+
// ENABLE: -enable-experimental-cxx-interop
77

88
// STDLIB: swift
9-
// STDLIB-DAG: -enable-cxx-interop
9+
// STDLIB-DAG: -enable-experimental-cxx-interop
1010
// STDLIB-DAG: -Xcc -stdlib=libc++

Diff for: ‎test/Driver/linker.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@
452452
// IOS-no-cxx-interop-NOT: -lc++
453453

454454
// IOS-cxx-interop-libcxx: swift
455-
// IOS-cxx-interop-libcxx-DAG: -enable-cxx-interop
455+
// IOS-cxx-interop-libcxx-DAG: -enable-experimental-cxx-interop
456456
// IOS-cxx-interop-libcxx-DAG: -o [[OBJECTFILE:.*]]
457457

458458
// IOS-cxx-interop-libcxx: {{(bin/)?}}ld{{"? }}
@@ -465,7 +465,7 @@
465465
// LINUX-cxx-interop-NOT: -stdlib
466466

467467
// LINUX-cxx-interop-libcxx: swift
468-
// LINUX-cxx-interop-libcxx-DAG: -enable-cxx-interop
468+
// LINUX-cxx-interop-libcxx-DAG: -enable-experimental-cxx-interop
469469
// LINUX-cxx-interop-libcxx-DAG: -o [[OBJECTFILE:.*]]
470470

471471
// LINUX-cxx-interop-libcxx: clang++{{(\.exe)?"? }}
@@ -476,7 +476,7 @@
476476
// WINDOWS-cxx-interop-NOT: -stdlib
477477

478478
// WINDOWS-cxx-interop-libcxx: swift
479-
// WINDOWS-cxx-interop-libcxx-DAG: -enable-cxx-interop
479+
// WINDOWS-cxx-interop-libcxx-DAG: -enable-experimental-cxx-interop
480480
// WINDOWS-cxx-interop-libcxx-DAG: -o [[OBJECTFILE:.*]]
481481

482482
// WINDOWS-cxx-interop-libcxx: clang++{{(\.exe)?"? }}

Diff for: ‎test/Interop/Cxx/apinotes/apinotes-objcxx-smoke.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %target-swift-ide-test -print-module -module-to-print=SomeModule -I %S/Inputs -source-filename=x -enable-cxx-interop -enable-objc-interop | %FileCheck -check-prefix=CHECK-IDE-TEST %s
2-
// RUN: %swift-frontend -c -enable-cxx-interop -enable-objc-interop -I %S/Inputs %s -o - -emit-sil | %FileCheck %s
1+
// RUN: %target-swift-ide-test -print-module -module-to-print=SomeModule -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop -enable-objc-interop | %FileCheck -check-prefix=CHECK-IDE-TEST %s
2+
// RUN: %swift-frontend -c -enable-experimental-cxx-interop -enable-objc-interop -I %S/Inputs %s -o - -emit-sil | %FileCheck %s
33

44
import SomeModule
55

Diff for: ‎test/Interop/Cxx/class/access-specifiers-module-interface.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Test module interface produced for C++ access specifiers test.
22
// In particular, we don't want any of the private members showing up here.
33

4-
// RUN: %target-swift-ide-test -print-module -module-to-print=AccessSpecifiers -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
4+
// RUN: %target-swift-ide-test -print-module -module-to-print=AccessSpecifiers -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
55

66
// CHECK: struct PublicPrivate {
77
// CHECK-NEXT: init()

Diff for: ‎test/Interop/Cxx/class/access-specifiers-typechecker.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Test that C++ access specifiers are honored, i.e. private members aren't
22
// imported.
33

4-
// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -enable-cxx-interop
4+
// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -enable-experimental-cxx-interop
55

66
import AccessSpecifiers
77

Diff for: ‎test/Interop/Cxx/class/class-protocol-name-clash.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend %s -c -enable-cxx-interop -I %S/Inputs
1+
// RUN: %target-swift-frontend %s -c -enable-experimental-cxx-interop -I %S/Inputs
22
//
33
// REQUIRES: objc_interop
44

Diff for: ‎test/Interop/Cxx/class/constructors-copy-irgen.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Target-specific tests for C++ copy constructor code generation.
22

3-
// RUN: %swift -module-name Swift -target x86_64-apple-macosx10.9 -dump-clang-diagnostics -I %S/Inputs -enable-cxx-interop -emit-ir %s -parse-stdlib -parse-as-library -disable-legacy-type-info | %FileCheck %s -check-prefix=ITANIUM_X64
4-
// RUN: %swift -module-name Swift -target armv7-none-linux-androideabi -dump-clang-diagnostics -I %S/Inputs -enable-cxx-interop -emit-ir %s -parse-stdlib -parse-as-library -disable-legacy-type-info | %FileCheck %s -check-prefix=ITANIUM_ARM
5-
// RUN: %swift -module-name Swift -target x86_64-unknown-windows-msvc -dump-clang-diagnostics -I %S/Inputs -enable-cxx-interop -emit-ir %s -parse-stdlib -parse-as-library -disable-legacy-type-info | %FileCheck %s -check-prefix=MICROSOFT_X64
3+
// RUN: %swift -module-name Swift -target x86_64-apple-macosx10.9 -dump-clang-diagnostics -I %S/Inputs -enable-experimental-cxx-interop -emit-ir %s -parse-stdlib -parse-as-library -disable-legacy-type-info | %FileCheck %s -check-prefix=ITANIUM_X64
4+
// RUN: %swift -module-name Swift -target armv7-none-linux-androideabi -dump-clang-diagnostics -I %S/Inputs -enable-experimental-cxx-interop -emit-ir %s -parse-stdlib -parse-as-library -disable-legacy-type-info | %FileCheck %s -check-prefix=ITANIUM_ARM
5+
// RUN: %swift -module-name Swift -target x86_64-unknown-windows-msvc -dump-clang-diagnostics -I %S/Inputs -enable-experimental-cxx-interop -emit-ir %s -parse-stdlib -parse-as-library -disable-legacy-type-info | %FileCheck %s -check-prefix=MICROSOFT_X64
66

77
import Constructors
88
import TypeClassification

Diff for: ‎test/Interop/Cxx/class/constructors-copy-module-interface.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-ide-test -print-module -module-to-print=Constructors -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
1+
// RUN: %target-swift-ide-test -print-module -module-to-print=Constructors -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
22

33
// Make sure we don't import non-copyable types because we will have no way to
44
// represent and copy/move these in swift with correct semantics.

Diff for: ‎test/Interop/Cxx/class/constructors-executable.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-cxx-interop)
1+
// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-experimental-cxx-interop)
22
//
33
// REQUIRES: executable_test
44

Diff for: ‎test/Interop/Cxx/class/constructors-irgen.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Target-specific tests for C++ constructor call code generation.
22

3-
// RUN: %swift -module-name Swift -target x86_64-apple-macosx10.9 -dump-clang-diagnostics -I %S/Inputs -enable-cxx-interop -emit-ir %s -parse-stdlib -parse-as-library -disable-legacy-type-info | %FileCheck %s -check-prefix=ITANIUM_X64
4-
// RUN: %swift -module-name Swift -target armv7-unknown-linux-androideabi -dump-clang-diagnostics -I %S/Inputs -enable-cxx-interop -emit-ir %s -parse-stdlib -parse-as-library -disable-legacy-type-info | %FileCheck %s -check-prefix=ITANIUM_ARM
5-
// RUN: %swift -module-name Swift -target x86_64-unknown-windows-msvc -dump-clang-diagnostics -I %S/Inputs -enable-cxx-interop -emit-ir %s -parse-stdlib -parse-as-library -disable-legacy-type-info | %FileCheck %s -check-prefix=MICROSOFT_X64
3+
// RUN: %swift -module-name Swift -target x86_64-apple-macosx10.9 -dump-clang-diagnostics -I %S/Inputs -enable-experimental-cxx-interop -emit-ir %s -parse-stdlib -parse-as-library -disable-legacy-type-info | %FileCheck %s -check-prefix=ITANIUM_X64
4+
// RUN: %swift -module-name Swift -target armv7-unknown-linux-androideabi -dump-clang-diagnostics -I %S/Inputs -enable-experimental-cxx-interop -emit-ir %s -parse-stdlib -parse-as-library -disable-legacy-type-info | %FileCheck %s -check-prefix=ITANIUM_ARM
5+
// RUN: %swift -module-name Swift -target x86_64-unknown-windows-msvc -dump-clang-diagnostics -I %S/Inputs -enable-experimental-cxx-interop -emit-ir %s -parse-stdlib -parse-as-library -disable-legacy-type-info | %FileCheck %s -check-prefix=MICROSOFT_X64
66

77
import Constructors
88
import TypeClassification

Diff for: ‎test/Interop/Cxx/class/constructors-module-interface.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-ide-test -print-module -module-to-print=Constructors -I %S/Inputs/ -source-filename=x -enable-cxx-interop | %FileCheck %s
1+
// RUN: %target-swift-ide-test -print-module -module-to-print=Constructors -I %S/Inputs/ -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
22

33
// CHECK: struct ExplicitDefaultConstructor {
44
// CHECK-NEXT: init()

Diff for: ‎test/Interop/Cxx/class/constructors-objc-irgen.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs -enable-cxx-interop -emit-ir %s | %FileCheck %s
1+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs -enable-experimental-cxx-interop -emit-ir %s | %FileCheck %s
22

33
// REQUIRES: CPU=x86_64
44
// REQUIRES: objc_interop

Diff for: ‎test/Interop/Cxx/class/constructors-objc-module-interface.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Test that Objective-C types passed to a C++ constructor are bridged
22
// correctly.
33

4-
// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -print-module -module-to-print=ConstructorsObjC -I %S/Inputs/ -source-filename=x -enable-cxx-interop | %FileCheck %s
4+
// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -print-module -module-to-print=ConstructorsObjC -I %S/Inputs/ -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
55

66
// REQUIRES: objc_interop
77

Diff for: ‎test/Interop/Cxx/class/constructors-objc-silgen.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs -enable-cxx-interop -emit-sil %s | %FileCheck %s
1+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs -enable-experimental-cxx-interop -emit-sil %s | %FileCheck %s
22

33
// REQUIRES: objc_interop
44
import Foundation

Diff for: ‎test/Interop/Cxx/class/constructors-typechecker.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -enable-cxx-interop
1+
// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -enable-experimental-cxx-interop
22

33
import Constructors
44

Diff for: ‎test/Interop/Cxx/class/destructors-correct-abi-irgen.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %swift -I %S/Inputs -enable-cxx-interop -emit-ir %s | %FileCheck %s
1+
// RUN: %swift -I %S/Inputs -enable-experimental-cxx-interop -emit-ir %s | %FileCheck %s
22

33
import Destructors
44

Diff for: ‎test/Interop/Cxx/class/destructors-non-trivial-implicit-irgen.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend -enable-cxx-interop -I %S/Inputs %s -emit-ir | %FileCheck %s
1+
// RUN: %target-swift-frontend -enable-experimental-cxx-interop -I %S/Inputs %s -emit-ir | %FileCheck %s
22

33
import Destructors
44

Diff for: ‎test/Interop/Cxx/class/dictionary-of-nsstrings-module-interface.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-ide-test -print-module -module-to-print=DictionaryOfNSStrings -I %S/Inputs/ -source-filename=x -enable-cxx-interop | %FileCheck %s
1+
// RUN: %target-swift-ide-test -print-module -module-to-print=DictionaryOfNSStrings -I %S/Inputs/ -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
22

33
// REQUIRES: objc_interop
44

Diff for: ‎test/Interop/Cxx/class/extensions-executable.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-cxx-interop)
1+
// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-experimental-cxx-interop)
22
// REQUIRES: executable_test
33

44
import StdlibUnittest

Diff for: ‎test/Interop/Cxx/class/extensions-irgen.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
1+
// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-experimental-cxx-interop | %FileCheck %s
22

33
import Extensions
44

Diff for: ‎test/Interop/Cxx/class/extensions-typechecker.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-typecheck-verify-swift -I %S/Inputs -enable-cxx-interop
1+
// RUN: %target-typecheck-verify-swift -I %S/Inputs -enable-experimental-cxx-interop
22

33
import Extensions
44

Diff for: ‎test/Interop/Cxx/class/inheritance/fields-module-interface.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-ide-test -print-module -module-to-print=Fields -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
1+
// RUN: %target-swift-ide-test -print-module -module-to-print=Fields -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
22

33
// CHECK: struct HasThreeFields {
44
// CHECK-NEXT: init()

Diff for: ‎test/Interop/Cxx/class/inheritance/fields.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-cxx-interop)
1+
// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-experimental-cxx-interop)
22
//
33
// REQUIRES: executable_test
44
//

Diff for: ‎test/Interop/Cxx/class/inheritance/functions-module-interface.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-ide-test -print-module -module-to-print=Functions -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
1+
// RUN: %target-swift-ide-test -print-module -module-to-print=Functions -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
22

33
// CHECK: struct NonTrivial {
44
// CHECK-NEXT: init()

Diff for: ‎test/Interop/Cxx/class/inheritance/functions.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-cxx-interop)
1+
// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-experimental-cxx-interop)
22
//
33
// REQUIRES: executable_test
44

Diff for: ‎test/Interop/Cxx/class/inheritance/sub-types-module-interface.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-ide-test -print-module -module-to-print=SubTypes -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
1+
// RUN: %target-swift-ide-test -print-module -module-to-print=SubTypes -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
22

33
// CHECK: struct Base {
44
// CHECK-NEXT: init()

Diff for: ‎test/Interop/Cxx/class/inheritance/type-aliases-module-interface.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-ide-test -print-module -module-to-print=TypeAliases -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
1+
// RUN: %target-swift-ide-test -print-module -module-to-print=TypeAliases -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
22

33
// CHECK: struct Base {
44
// CHECK-NEXT: init()

Diff for: ‎test/Interop/Cxx/class/inline-function-codegen/constructor-calls-function-execution.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-cxx-interop)
1+
// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop)
22
//
33
// REQUIRES: executable_test
44

Diff for: ‎test/Interop/Cxx/class/inline-function-codegen/constructor-calls-function-from-nested-calls-execution.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-cxx-interop)
1+
// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop)
22
//
33
// REQUIRES: executable_test
44

0 commit comments

Comments
 (0)