Skip to content

Commit 57f721a

Browse files
committed
[cxx-interop] Remove "enable-cxx-interop" flag again.
1 parent 9857464 commit 57f721a

File tree

4 files changed

+3
-9
lines changed

4 files changed

+3
-9
lines changed

SwiftCompilerSources/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ function(add_swift_compiler_modules_library name)
7575

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

8181
if(CMAKE_BUILD_TYPE STREQUAL Debug)

SwiftCompilerSources/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ private extension Target {
1717
static let defaultSwiftSettings: [SwiftSetting] = [
1818
.unsafeFlags([
1919
"-Xfrontend", "-validate-tbd-against-ir=none",
20-
"-Xfrontend", "-enable-cxx-interop",
20+
"-Xfrontend", "-enable-experimental-cxx-interop",
2121
// Bridging modules and headers
2222
"-Xcc", "-I", "-Xcc", "../include",
2323
"-cross-module-optimization"

include/swift/Option/FrontendOptions.td

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -831,11 +831,6 @@ def emit_sorted_sil : Flag<["-"], "emit-sorted-sil">,
831831
def emit_syntax : Flag<["-"], "emit-syntax">,
832832
HelpText<"Parse input file(s) and emit the Syntax tree(s) as JSON">, ModeOpt;
833833

834-
def enable_cxx_interop :
835-
Flag<["-"], "enable-cxx-interop">,
836-
HelpText<"Alias for -enable-experimental-cxx-interop">,
837-
Flags<[FrontendOption, HelpHidden]>;
838-
839834
def cxx_interop_getters_setters_as_properties :
840835
Flag<["-"], "cxx-interop-getters-setters-as-properties">,
841836
HelpText<"Import getters and setters as computed properties in Swift">,

lib/Frontend/CompilerInvocation.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -807,8 +807,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
807807
Opts.ClangTarget = llvm::Triple(A->getValue());
808808
}
809809

810-
Opts.EnableCXXInterop |= Args.hasArg(OPT_enable_experimental_cxx_interop) ||
811-
Args.hasArg(OPT_enable_cxx_interop);
810+
Opts.EnableCXXInterop |= Args.hasArg(OPT_enable_experimental_cxx_interop);
812811
Opts.EnableObjCInterop =
813812
Args.hasFlag(OPT_enable_objc_interop, OPT_disable_objc_interop,
814813
Target.isOSDarwin());

0 commit comments

Comments
 (0)