averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2022-06-16 21:53:49 -07:00
parent 17775449f2 59a9e282cd
commit e0b07a15df
4 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SwiftCompilerSources/CMakeLists.txt
View File

@@ -75,7 +75,7 @@ function(add_swift_compiler_modules_library name)
set(swift_compile_options set(swift_compile_options
"-Xfrontend" "-validate-tbd-against-ir=none" "-Xfrontend" "-validate-tbd-against-ir=none"
"-Xfrontend" "-enable-cxx-interop" "-Xfrontend" "-enable-experimental-cxx-interop"
"-Xcc" "-UIBOutlet" "-Xcc" "-UIBAction" "-Xcc" "-UIBInspectable") "-Xcc" "-UIBOutlet" "-Xcc" "-UIBAction" "-Xcc" "-UIBInspectable")
if (NOT BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS") if (NOT BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")
list(APPEND swift_compile_options "-Xfrontend" "-disable-implicit-string-processing-module-import") list(APPEND swift_compile_options "-Xfrontend" "-disable-implicit-string-processing-module-import")

2
SwiftCompilerSources/Package.swift
View File

@@ -17,7 +17,7 @@ private extension Target {
static let defaultSwiftSettings: [SwiftSetting] = [ static let defaultSwiftSettings: [SwiftSetting] = [
.unsafeFlags([ .unsafeFlags([
"-Xfrontend", "-validate-tbd-against-ir=none", "-Xfrontend", "-validate-tbd-against-ir=none",
"-Xfrontend", "-enable-cxx-interop", "-Xfrontend", "-enable-experimental-cxx-interop",
// Bridging modules and headers // Bridging modules and headers
"-Xcc", "-I", "-Xcc", "../include", "-Xcc", "-I", "-Xcc", "../include",
"-cross-module-optimization" "-cross-module-optimization"

5
include/swift/Option/FrontendOptions.td
View File

@@ -835,11 +835,6 @@ def emit_sorted_sil : Flag<["-"], "emit-sorted-sil">,
def emit_syntax : Flag<["-"], "emit-syntax">, def emit_syntax : Flag<["-"], "emit-syntax">,
HelpText<"Parse input file(s) and emit the Syntax tree(s) as JSON">, ModeOpt; HelpText<"Parse input file(s) and emit the Syntax tree(s) as JSON">, ModeOpt;
def enable_cxx_interop :
Flag<["-"], "enable-cxx-interop">,
HelpText<"Alias for -enable-experimental-cxx-interop">,
Flags<[FrontendOption, HelpHidden]>;
def cxx_interop_getters_setters_as_properties : def cxx_interop_getters_setters_as_properties :
Flag<["-"], "cxx-interop-getters-setters-as-properties">, Flag<["-"], "cxx-interop-getters-setters-as-properties">,
HelpText<"Import getters and setters as computed properties in Swift">, HelpText<"Import getters and setters as computed properties in Swift">,

3
lib/Frontend/CompilerInvocation.cpp
View File

@@ -806,8 +806,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
Opts.ClangTarget = llvm::Triple(A->getValue()); Opts.ClangTarget = llvm::Triple(A->getValue());
} }
Opts.EnableCXXInterop |= Args.hasArg(OPT_enable_experimental_cxx_interop) || Opts.EnableCXXInterop |= Args.hasArg(OPT_enable_experimental_cxx_interop);
Args.hasArg(OPT_enable_cxx_interop);
Opts.EnableObjCInterop = Opts.EnableObjCInterop =
Args.hasFlag(OPT_enable_objc_interop, OPT_disable_objc_interop, Args.hasFlag(OPT_enable_objc_interop, OPT_disable_objc_interop,
Target.isOSDarwin()); Target.isOSDarwin());