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

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

Browse Source 
[cxx-interop] Make sure interop does not trigger TBD validation errors
This commit is contained in:
Egor Zhdan
2023-04-06 14:30:31 +01:00
committed by GitHub
parent db058a4f9c 8f58eafbd3
commit 05bcc88c73
11 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Frontend/ArgsToFrontendOptionsConverter.cpp
View File

@@ -398,8 +398,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;
@@ -411,6 +412,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;
}
}