Merge pull request #65007 from apple/egorzhdan/5.9-cxx-tbd-validation

🍒[cxx-interop] Make sure interop does not trigger TBD validation errors

Author: egorzhdan

lib/Frontend/ArgsToFrontendOptionsConverter.cpp

@@ -402,8 +402,9 @@ void ArgsToFrontendOptionsConverter::computeDebugTimeOptions() {
 
 void ArgsToFrontendOptionsConverter::computeTBDOptions() {
   using namespace options;
+  using Mode = FrontendOptions::TBDValidationMode;
+
   if (const Arg *A = Args.getLastArg(OPT_validate_tbd_against_ir_EQ)) {
-    using Mode = FrontendOptions::TBDValidationMode;
     StringRef value = A->getValue();
     if (value == "none") {
       Opts.ValidateTBDAgainstIR = Mode::None;
@@ -415,6 +416,16 @@ void ArgsToFrontendOptionsConverter::computeTBDOptions() {
       Diags.diagnose(SourceLoc(), diag::error_unsupported_option_argument,
                      A->getOption().getPrefixedName(), value);
     }
+  } else if (Args.hasArg(OPT_enable_experimental_cxx_interop) ||
+             Args.hasArg(OPT_cxx_interoperability_mode)) {
+    // TBD validation currently emits diagnostics when C++ interop is enabled,
+    // which is likely caused by IRGen incorrectly applying attributes to
+    // symbols, forcing the user to pass `-validate-tbd-against-ir=none`.
+    // If no explicit TBD validation mode was specified, disable it if C++
+    // interop is enabled.
+    // See https://github.com/apple/swift/issues/56458.
+    // FIXME: the TBD validation diagnostics are correct and should be enabled.
+    Opts.ValidateTBDAgainstIR = Mode::None;
   }
 }
 

test/Interop/Cxx/class/inline-function-codegen/static-var-init-calls-function-execution.swift

@@ -1,10 +1,7 @@
-// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop -Xfrontend -validate-tbd-against-ir=none)
+// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop)
 //
 // REQUIRES: executable_test
 
-// TODO: See why -validate-tbd-against-ir=none is needed here
-// (https://github.com/apple/swift/issues/56458).
-
 import StaticVarInitCallsFunction
 import StdlibUnittest
 

test/Interop/Cxx/class/inline-function-codegen/static-var-init-calls-function-irgen.swift

@@ -1,7 +1,4 @@
-// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-experimental-cxx-interop -validate-tbd-against-ir=none | %FileCheck %s
-
-// TODO: See why -validate-tbd-against-ir=none is needed here
-// (https://github.com/apple/swift/issues/56458).
+// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-experimental-cxx-interop | %FileCheck %s
 
 import StaticVarInitCallsFunction
 

test/Interop/Cxx/stdlib/overlay/custom-convertible-to-collection.swift

@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop -Xfrontend -validate-tbd-against-ir=none)
+// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop)
 //
 // REQUIRES: executable_test
 // REQUIRES: OS=macosx || OS=linux-gnu

test/Interop/Cxx/stdlib/overlay/std-string-overlay.swift

@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift(-Xfrontend -enable-experimental-cxx-interop -Xfrontend -validate-tbd-against-ir=none)
+// RUN: %target-run-simple-swift(-Xfrontend -enable-experimental-cxx-interop)
 //
 // REQUIRES: executable_test
 // REQUIRES: OS=macosx || OS=linux-gnu

test/Interop/Cxx/stdlib/use-std-map.swift

@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop -Xfrontend -validate-tbd-against-ir=none)
+// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop)
 //
 // REQUIRES: executable_test
 //

test/Interop/Cxx/stdlib/use-std-optional.swift

@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop -Xcc -std=c++17 -Xfrontend -validate-tbd-against-ir=none)
+// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop -Xcc -std=c++17)
 //
 // REQUIRES: executable_test
 // REQUIRES: OS=macosx

test/Interop/Cxx/stdlib/use-std-pair.swift

@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop -Xfrontend -validate-tbd-against-ir=none)
+// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop)
 //
 // REQUIRES: executable_test
 //

test/Interop/Cxx/stdlib/use-std-set.swift

@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop -Xfrontend -validate-tbd-against-ir=none)
+// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop)
 //
 // REQUIRES: executable_test
 //

test/Interop/Cxx/stdlib/use-std-string.swift

@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop -Xfrontend -validate-tbd-against-ir=none)
+// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-experimental-cxx-interop)
 //
 // REQUIRES: executable_test