[nfc][cxx-interop] Rename cxx-compatibility-mode -> cxx-interoperability-mode.

Author: zoecarver

docs/CppInteroperability/GettingStartedWithC++Interop.md

@@ -81,7 +81,7 @@ After creating your Swift package project, follow the steps [Creating a Module t
 - Swift code will be in `Sources/CxxInterop` called `main.swift`
 - 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)
 - Under targets, add the name of your C++ module and the directory containing the Swift code as a target.
-- 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 `-cxx-compatibility-mode=swift-5.7`
+- 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 `-cxx-interoperability-mode=swift-5.7`
 
 ```
 //In Package Manifest
@@ -111,7 +111,7 @@ let package = Package(
             sources: [ "main.swift" ],
             swiftSettings: [.unsafeFlags([
                 "-I", "Sources/CxxTest",
-                "-cxx-compatibility-mode=swift-5.7",
+                "-cxx-interoperability-mode=swift-5.7",
             ])]
         ),
     ]
@@ -144,7 +144,7 @@ After creating your project follow the steps [Creating a Module to contain your
 - Create a `CMakeLists.txt` file and configure for your project
 - In`add_library` invoke `cxx-support` with the path to the C++ implementation file
 - Add the `target_include_directories` with `cxx-support` and path to the C++ Module `${CMAKE_SOURCE_DIR}/Sources/CxxTest`
-- Add the `add_executable` to the specific files/directory you would like to generate source, with`SHELL:-cxx-compatibility-mode=swift-5.7`.
+- Add the `add_executable` to the specific files/directory you would like to generate source, with`SHELL:-cxx-interoperability-mode=swift-5.7`.
 - In the example below we will be following the file structure used in [Creating a Swift Package](#Creating-a-Swift-Package)
 
 ```
@@ -167,7 +167,7 @@ target_include_directories(cxx-support PUBLIC
 
 add_executable(CxxInterop ./Sources/CxxInterop/main.swift)
 target_compile_options(CxxInterop PRIVATE
-  "SHELL:-cxx-compatibility-mode=swift-5.7"
+  "SHELL:-cxx-interoperability-mode=swift-5.7"
 target_link_libraries(CxxInterop PRIVATE cxx-support)
 
 ```

include/swift/AST/DiagnosticsFrontend.def

@@ -516,18 +516,18 @@ WARNING(compiler_plugin_not_loaded,none,
 
 ERROR(dont_enable_interop_and_compat,none,
       "do not pass both -enable-experimental-cxx-interop and "
-      "-cxx-compatibility-mode. Remove -enable-experimental-cxx-interop.", ())
+      "-cxx-interoperability-mode. Remove -enable-experimental-cxx-interop.", ())
 
 ERROR(invalid_interop_compat_mode,none,
-      "invalid option passed to -cxx-compatibility-mode. Please select either "
+      "invalid option passed to -cxx-interoperability-mode. Please select either "
       "'off' or 'swift-5.7'.", ())
 NOTE(swift_will_maintain_compat,none,
      "Swift will maintain source compatibility for imported APIs based on the "
      "selected compatibility mode, so updating the Swift compiler will not "
      "change how APIs are imported.", ())
 WARNING(enable_interop_flag_deprecated,none,
         "the -enable-experimental-cxx-interop flag is deprecated. Please pass "
-        "'-cxx-compatibility-mode=' instead.", ())
+        "'-cxx-interoperability-mode=' instead.", ())
 
 #define UNDEFINE_DIAGNOSTIC_MACROS
 #include "DefineDiagnosticMacros.h"

include/swift/Option/Options.td

@@ -666,8 +666,8 @@ def enable_experimental_cxx_interop :
   Flags<[NoDriverOption, FrontendOption, HelpHidden, ModuleInterfaceOption]>,
   HelpText<"Enable experimental C++ interop code generation and config directives">;
 
-def cxx_compatibility_mode :
-  Joined<["-"], "cxx-compatibility-mode=">,
+def cxx_interoperability_mode :
+  Joined<["-"], "cxx-interoperability-mode=">,
   Flags<[FrontendOption, ModuleInterfaceOption]>,
   HelpText<"Enables C++ interoperability; requires compatbility version to be"
   "specified.">;

lib/Driver/ToolChains.cpp

@@ -305,7 +305,7 @@ void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
   inputArgs.AddLastArg(arguments, options::OPT_library_level);
   inputArgs.AddLastArg(arguments, options::OPT_enable_bare_slash_regex);
   inputArgs.AddLastArg(arguments, options::OPT_enable_experimental_cxx_interop);
-  inputArgs.AddLastArg(arguments, options::OPT_cxx_compatibility_mode);
+  inputArgs.AddLastArg(arguments, options::OPT_cxx_interoperability_mode);
   inputArgs.AddLastArg(arguments, options::OPT_load_plugin_library);
   inputArgs.AddLastArg(arguments, options::OPT_load_plugin_executable);
   inputArgs.AddLastArg(arguments, options::OPT_enable_builtin_module);

lib/Frontend/CompilerInvocation.cpp

@@ -913,7 +913,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
     Opts.ClangTarget = llvm::Triple(A->getValue());
   }
 
-  if (Arg *A = Args.getLastArg(OPT_cxx_compatibility_mode)) {    
+  if (Arg *A = Args.getLastArg(OPT_cxx_interoperability_mode)) {
     if (Args.hasArg(OPT_enable_experimental_cxx_interop)) {
       Diags.diagnose(SourceLoc(), diag::dont_enable_interop_and_compat);
     }

test/lit.cfg

@@ -727,8 +727,8 @@ elif swift_test_mode == 'with_cxx_interop':
     config.available_features.add("nonexecutable_test")
     config.available_features.add("executable_test")
     config.available_features.add("with_cxx_interop")
-    config.swift_frontend_test_options += ' -cxx-compatibility-mode=swift-5.7'
-    config.swift_driver_test_options += ' -cxx-compatibility-mode=swift-5.7'
+    config.swift_frontend_test_options += ' -cxx-interoperability-mode=swift-5.7'
+    config.swift_driver_test_options += ' -cxx-interoperability-mode=swift-5.7'
 else:
     lit_config.fatal("Unknown test mode %r" % swift_test_mode)
 
@@ -2381,7 +2381,7 @@ config.substitutions.insert(0, ('%check-cxx-header-in-clang',
 config.substitutions.append(('%env-', config.target_env_prefix))
 
 config.substitutions.append(('%target-clangxx', '%s -std=c++11' % config.target_clang))
-config.substitutions.append(('%target-swiftxx-frontend', '%s -cxx-compatibility-mode=swift-5.7' % config.target_swift_frontend))
+config.substitutions.append(('%target-swiftxx-frontend', '%s -cxx-interoperability-mode=swift-5.7' % config.target_swift_frontend))
 
 config.substitutions.append(('%target-runtime', config.target_runtime))