diff --git a/include/swift/Basic/DiagnosticOptions.h b/include/swift/Basic/DiagnosticOptions.h index 2be70d7e1a43a..4cb38215e85b5 100644 --- a/include/swift/Basic/DiagnosticOptions.h +++ b/include/swift/Basic/DiagnosticOptions.h @@ -41,6 +41,11 @@ class DiagnosticOptions { /// \c VerifyMode is not \c NoVerify. bool VerifyIgnoreUnknown = false; + /// Indicates whether to allow diagnostics for locations outside files parsed + /// for 'expected' diagnostics if \c VerifyMode is not \c NoVerify. Does not + /// allow diagnostics at , that is controlled by VerifyIgnoreUnknown. + bool VerifyIgnoreUnrelated = false; + /// Indicates whether diagnostic passes should be skipped. bool SkipDiagnosticPasses = false; diff --git a/include/swift/Frontend/DiagnosticVerifier.h b/include/swift/Frontend/DiagnosticVerifier.h index b254692486880..8cd5ad1a03d0d 100644 --- a/include/swift/Frontend/DiagnosticVerifier.h +++ b/include/swift/Frontend/DiagnosticVerifier.h @@ -99,6 +99,7 @@ class DiagnosticVerifier : public DiagnosticConsumer { ArrayRef AdditionalFilePaths; bool AutoApplyFixes; bool IgnoreUnknown; + bool IgnoreUnrelated; bool UseColor; ArrayRef AdditionalExpectedPrefixes; @@ -106,11 +107,11 @@ class DiagnosticVerifier : public DiagnosticConsumer { explicit DiagnosticVerifier(SourceManager &SM, ArrayRef BufferIDs, ArrayRef AdditionalFilePaths, bool AutoApplyFixes, bool IgnoreUnknown, - bool UseColor, + bool IgnoreUnrelated, bool UseColor, ArrayRef AdditionalExpectedPrefixes) : SM(SM), BufferIDs(BufferIDs), AdditionalFilePaths(AdditionalFilePaths), AutoApplyFixes(AutoApplyFixes), IgnoreUnknown(IgnoreUnknown), - UseColor(UseColor), + IgnoreUnrelated(IgnoreUnrelated), UseColor(UseColor), AdditionalExpectedPrefixes(AdditionalExpectedPrefixes) {} virtual void handleDiagnostic(SourceManager &SM, @@ -131,6 +132,11 @@ class DiagnosticVerifier : public DiagnosticConsumer { void printDiagnostic(const llvm::SMDiagnostic &Diag) const; + /// Check whether there were any diagnostics in files without expected + /// diagnostics + bool verifyUnrelated( + std::vector &CapturedDiagnostics) const; + bool verifyUnknown(std::vector &CapturedDiagnostics) const; diff --git a/include/swift/Option/FrontendOptions.td b/include/swift/Option/FrontendOptions.td index 3d034ee45263c..7eeb2c11b69c2 100644 --- a/include/swift/Option/FrontendOptions.td +++ b/include/swift/Option/FrontendOptions.td @@ -165,6 +165,8 @@ def verify_apply_fixes : Flag<["-"], "verify-apply-fixes">, HelpText<"Like -verify, but updates the original source file">; def verify_ignore_unknown: Flag<["-"], "verify-ignore-unknown">, HelpText<"Allow diagnostics for '' location in verify mode">; +def verify_ignore_unrelated: Flag<["-"], "verify-ignore-unrelated">, + HelpText<"Allow diagnostics in files outside those with expected diagnostics in verify mode">; def verify_generic_signatures : Separate<["-"], "verify-generic-signatures">, MetaVarName<"">, HelpText<"Verify the generic signatures in the given module">; diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index ab67d57abfda6..3dfdbdd618293 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -2588,6 +2588,7 @@ static bool ParseDiagnosticArgs(DiagnosticOptions &Opts, ArgList &Args, if (Args.hasArg(OPT_verify_apply_fixes)) Opts.VerifyMode = DiagnosticOptions::VerifyAndApplyFixes; Opts.VerifyIgnoreUnknown |= Args.hasArg(OPT_verify_ignore_unknown); + Opts.VerifyIgnoreUnrelated |= Args.hasArg(OPT_verify_ignore_unrelated); Opts.SkipDiagnosticPasses |= Args.hasArg(OPT_disable_diagnostic_passes); Opts.ShowDiagnosticsAfterFatalError |= Args.hasArg(OPT_show_diagnostics_after_fatal); diff --git a/lib/Frontend/DiagnosticVerifier.cpp b/lib/Frontend/DiagnosticVerifier.cpp index 768ef5d374edf..6c53d5dffb145 100644 --- a/lib/Frontend/DiagnosticVerifier.cpp +++ b/lib/Frontend/DiagnosticVerifier.cpp @@ -400,6 +400,48 @@ bool DiagnosticVerifier::verifyUnknown( auto diag = SM.GetMessage({}, llvm::SourceMgr::DK_Error, Message, {}, {}); printDiagnostic(diag); } + + if (HadError) { + auto NoteMessage = "use '-verify-ignore-unknown' to " + "ignore diagnostics at this location"; + auto noteDiag = + SM.GetMessage({}, llvm::SourceMgr::DK_Note, NoteMessage, {}, {}); + printDiagnostic(noteDiag); + } + return HadError; +} + +bool DiagnosticVerifier::verifyUnrelated( + std::vector &CapturedDiagnostics) const { + bool HadError = false; + for (unsigned i = 0, e = CapturedDiagnostics.size(); i != e; ++i) { + SourceLoc Loc = CapturedDiagnostics[i].Loc; + if (!Loc.isValid()) + // checked by verifyUnknown + continue; + + HadError = true; + std::string Message = + ("unexpected " + + getDiagKindString(CapturedDiagnostics[i].Classification) + + " produced: " + CapturedDiagnostics[i].Message) + .str(); + + auto diag = SM.GetMessage(Loc, llvm::SourceMgr::DK_Error, Message, {}, {}); + printDiagnostic(diag); + + auto FileName = SM.getIdentifierForBuffer(SM.findBufferContainingLoc(Loc)); + auto NoteMessage = ("file '" + FileName + + "' is not parsed for 'expected' statements. Use " + "'-verify-additional-file " + + FileName + + "' to enable, or '-verify-ignore-unrelated' to " + "ignore diagnostics in this file"); + auto noteDiag = + SM.GetMessage(Loc, llvm::SourceMgr::DK_Note, NoteMessage, {}, {}); + printDiagnostic(noteDiag); + } + return HadError; } @@ -1519,6 +1561,11 @@ bool DiagnosticVerifier::finishProcessing() { // For , all errors are unexpected. Result.HadUnexpectedDiag |= HadError; } + if (!IgnoreUnrelated) { + bool HadError = verifyUnrelated(CapturedDiagnostics); + Result.HadError |= HadError; + Result.HadUnexpectedDiag |= HadError; + } if (Result.HadUnexpectedDiag) printRemainingDiagnostics(); diff --git a/lib/Frontend/Frontend.cpp b/lib/Frontend/Frontend.cpp index 8e51227a5359a..159e312732fd3 100644 --- a/lib/Frontend/Frontend.cpp +++ b/lib/Frontend/Frontend.cpp @@ -434,8 +434,8 @@ bool CompilerInstance::setupDiagnosticVerifierIfNeeded() { DiagVerifier = std::make_unique( SourceMgr, InputSourceCodeBufferIDs, diagOpts.AdditionalVerifierFiles, diagOpts.VerifyMode == DiagnosticOptions::VerifyAndApplyFixes, - diagOpts.VerifyIgnoreUnknown, diagOpts.UseColor, - diagOpts.AdditionalDiagnosticVerifierPrefixes); + diagOpts.VerifyIgnoreUnknown, diagOpts.VerifyIgnoreUnrelated, + diagOpts.UseColor, diagOpts.AdditionalDiagnosticVerifierPrefixes); addDiagnosticConsumer(DiagVerifier.get()); } diff --git a/test/APINotes/basic.swift b/test/APINotes/basic.swift index 61e1193b03e09..3a6310463f368 100644 --- a/test/APINotes/basic.swift +++ b/test/APINotes/basic.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -I %S/Inputs/custom-modules -F %S/Inputs/custom-frameworks +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %S/Inputs/custom-modules -F %S/Inputs/custom-frameworks import APINotesTest import APINotesFrameworkTest diff --git a/test/APINotes/broken-swift-name.swift b/test/APINotes/broken-swift-name.swift index d866edd20efdc..d3d46baa2e91d 100644 --- a/test/APINotes/broken-swift-name.swift +++ b/test/APINotes/broken-swift-name.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -I %S/Inputs/broken-modules +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %S/Inputs/broken-modules import BrokenAPINotes func testBrokenSwiftName(x: inout ZXSpectrum) { diff --git a/test/APINotes/obsoleted.swift b/test/APINotes/obsoleted.swift index 8a16502924a68..b484b7cf639fb 100644 --- a/test/APINotes/obsoleted.swift +++ b/test/APINotes/obsoleted.swift @@ -1,6 +1,6 @@ -// RUN: not %target-swift-frontend -typecheck -verify -I %S/Inputs/custom-modules -F %S/Inputs/custom-frameworks -swift-version 4 %s -// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs/custom-modules -F %S/Inputs/custom-frameworks -swift-version 4.2 %s -// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs/custom-modules -F %S/Inputs/custom-frameworks -swift-version 5 %s +// RUN: not %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs/custom-modules -F %S/Inputs/custom-frameworks -swift-version 4 %s +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs/custom-modules -F %S/Inputs/custom-frameworks -swift-version 4.2 %s +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs/custom-modules -F %S/Inputs/custom-frameworks -swift-version 5 %s // REQUIRES: objc_interop import ObsoletedAPINotesTest diff --git a/test/AssociatedTypeInference/missing_conformance.swift b/test/AssociatedTypeInference/missing_conformance.swift index 690b79bd2ff05..ed74447b751a4 100644 --- a/test/AssociatedTypeInference/missing_conformance.swift +++ b/test/AssociatedTypeInference/missing_conformance.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated // Test candidates for witnesses that are missing conformances // in various ways. diff --git a/test/AssociatedTypeInference/type_witness_from_parameterized_protocol.swift b/test/AssociatedTypeInference/type_witness_from_parameterized_protocol.swift index b1cfa3a3d52d8..81aff5087217a 100644 --- a/test/AssociatedTypeInference/type_witness_from_parameterized_protocol.swift +++ b/test/AssociatedTypeInference/type_witness_from_parameterized_protocol.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated protocol P { associatedtype A // expected-note {{multiple matching types named 'A'}} diff --git a/test/AutoDiff/Sema/DerivativeRegistrationCrossModule/main.swift b/test/AutoDiff/Sema/DerivativeRegistrationCrossModule/main.swift index d58879a8292af..068879ba43086 100644 --- a/test/AutoDiff/Sema/DerivativeRegistrationCrossModule/main.swift +++ b/test/AutoDiff/Sema/DerivativeRegistrationCrossModule/main.swift @@ -2,7 +2,7 @@ // RUN: %target-swift-frontend -emit-module -primary-file %S/Inputs/a.swift -emit-module-path %t/a.swiftmodule // RUN: %target-swift-frontend -emit-module -primary-file %S/Inputs/b.swift -emit-module-path %t/b.swiftmodule -I %t // "-verify-ignore-unknown" is for ":0: note: 'init()' declared here" -// RUN: %target-swift-frontend-typecheck -verify -verify-ignore-unknown -I %t %s +// RUN: %target-swift-frontend-typecheck -verify -verify-ignore-unrelated -verify-ignore-unknown -I %t %s // https://github.com/apple/swift/issues/54969 // Fix cross-module deserialization crash involving `@derivative` attribute. diff --git a/test/AutoDiff/Sema/DerivedConformances/class_differentiable.swift b/test/AutoDiff/Sema/DerivedConformances/class_differentiable.swift index 11c65fb6e22b8..c524050345e71 100644 --- a/test/AutoDiff/Sema/DerivedConformances/class_differentiable.swift +++ b/test/AutoDiff/Sema/DerivedConformances/class_differentiable.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck -verify -primary-file %s %S/Inputs/class_differentiable_other_module.swift +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -primary-file %s %S/Inputs/class_differentiable_other_module.swift import _Differentiation diff --git a/test/AutoDiff/Sema/DerivedConformances/struct_differentiable.swift b/test/AutoDiff/Sema/DerivedConformances/struct_differentiable.swift index 0dbb0c16ef610..c5b27df87a278 100644 --- a/test/AutoDiff/Sema/DerivedConformances/struct_differentiable.swift +++ b/test/AutoDiff/Sema/DerivedConformances/struct_differentiable.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck -verify -primary-file %s %S/Inputs/struct_differentiable_other_module.swift +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -primary-file %s %S/Inputs/struct_differentiable_other_module.swift import _Differentiation diff --git a/test/AutoDiff/Sema/derivative_attr_type_checking.swift b/test/AutoDiff/Sema/derivative_attr_type_checking.swift index 4fdebeddd5276..89508ff0cec1f 100644 --- a/test/AutoDiff/Sema/derivative_attr_type_checking.swift +++ b/test/AutoDiff/Sema/derivative_attr_type_checking.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend-typecheck -verify -target %target-swift-5.1-abi-triple %s -package-name myPkg -// RUN: %target-swift-frontend-typecheck -enable-testing -verify -target %target-swift-5.1-abi-triple %s -package-name myPkg +// RUN: %target-swift-frontend-typecheck -verify -verify-ignore-unrelated -target %target-swift-5.1-abi-triple %s -package-name myPkg +// RUN: %target-swift-frontend-typecheck -enable-testing -verify -verify-ignore-unrelated -target %target-swift-5.1-abi-triple %s -package-name myPkg // Swift.AdditiveArithmetic:3:17: note: cannot yet register derivative default implementation for protocol requirements diff --git a/test/AutoDiff/Sema/differentiable_attr_type_checking.swift b/test/AutoDiff/Sema/differentiable_attr_type_checking.swift index 98ff06879396e..c70c3bad6d8ad 100644 --- a/test/AutoDiff/Sema/differentiable_attr_type_checking.swift +++ b/test/AutoDiff/Sema/differentiable_attr_type_checking.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend-typecheck -verify -target %target-swift-5.1-abi-triple %s -// RUN: %target-swift-frontend-typecheck -enable-testing -verify -target %target-swift-5.1-abi-triple %s +// RUN: %target-swift-frontend-typecheck -verify -verify-ignore-unrelated -target %target-swift-5.1-abi-triple %s +// RUN: %target-swift-frontend-typecheck -enable-testing -verify -verify-ignore-unrelated -target %target-swift-5.1-abi-triple %s import _Differentiation diff --git a/test/Availability/availability_versions_objc_api.swift b/test/Availability/availability_versions_objc_api.swift index c7fd9d308aa69..8870e570f5e6a 100644 --- a/test/Availability/availability_versions_objc_api.swift +++ b/test/Availability/availability_versions_objc_api.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift %clang-importer-sdk -I %S/Inputs/custom-modules +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated %clang-importer-sdk -I %S/Inputs/custom-modules // RUN: not %target-swift-frontend -typecheck %clang-importer-sdk -I %S/Inputs/custom-modules %s 2>&1 | %FileCheck %s // REQUIRES: OS=macosx diff --git a/test/Availability/conformance_availability_overlapping.swift b/test/Availability/conformance_availability_overlapping.swift index 28b09d9155a84..6fba2647dc44a 100644 --- a/test/Availability/conformance_availability_overlapping.swift +++ b/test/Availability/conformance_availability_overlapping.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module %S/Inputs/conformance_availability_overlapping_other.swift -emit-module-path %t/conformance_availability_overlapping_other.swiftmodule -// RUN: %target-typecheck-verify-swift -I %t +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %t // REQUIRES: OS=macosx diff --git a/test/Availability/spi-available-swift-module.swift b/test/Availability/spi-available-swift-module.swift index bfb6e8254911b..d13c9a875cb95 100644 --- a/test/Availability/spi-available-swift-module.swift +++ b/test/Availability/spi-available-swift-module.swift @@ -3,7 +3,7 @@ // RUN: split-file %s %t // RUN: %target-swift-frontend -parse-as-library %t/Foo.swift -emit-module -library-level api -emit-module-path %t/Foo.swiftmodule -module-name Foo -// RUN: %target-swift-frontend-typecheck -parse-as-library %t/Client.swift -verify -library-level api -I %t +// RUN: %target-swift-frontend-typecheck -parse-as-library %t/Client.swift -verify -verify-ignore-unrelated -library-level api -I %t //--- Foo.swift diff --git a/test/ClangImporter/AppKit_test.swift b/test/ClangImporter/AppKit_test.swift index 00588146544fa..a8d1c9ac47389 100644 --- a/test/ClangImporter/AppKit_test.swift +++ b/test/ClangImporter/AppKit_test.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift %clang-importer-sdk +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated %clang-importer-sdk // REQUIRES: OS=macosx diff --git a/test/ClangImporter/Darwin_sdk_test.swift b/test/ClangImporter/Darwin_sdk_test.swift index d77a28b291bd9..109af3d0707ea 100644 --- a/test/ClangImporter/Darwin_sdk_test.swift +++ b/test/ClangImporter/Darwin_sdk_test.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -verify +// RUN: %target-swift-frontend -typecheck %s -verify -verify-ignore-unrelated // REQUIRES: objc_interop diff --git a/test/ClangImporter/InternalBridgingHeader/access_checking.swift b/test/ClangImporter/InternalBridgingHeader/access_checking.swift index 237536cec4ef7..d1cf5c6ef5229 100644 --- a/test/ClangImporter/InternalBridgingHeader/access_checking.swift +++ b/test/ClangImporter/InternalBridgingHeader/access_checking.swift @@ -2,11 +2,11 @@ // RUN: mkdir -p %t/tmp // Test with the normal bridging header. -// RUN: %target-typecheck-verify-swift -internal-import-bridging-header %S/../Inputs/c-bridging-header.h -sdk %clang-importer-sdk +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -internal-import-bridging-header %S/../Inputs/c-bridging-header.h -sdk %clang-importer-sdk // Test with a precompiled bridging header. // RUN: %target-swift-frontend -emit-pch -o %t/c-bridging-header.pch %S/../Inputs/c-bridging-header.h -sdk %clang-importer-sdk -// RUN: %target-typecheck-verify-swift -internal-import-bridging-header %t/c-bridging-header.pch -sdk %clang-importer-sdk +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -internal-import-bridging-header %t/c-bridging-header.pch -sdk %clang-importer-sdk // Overrides the internal import that comes through the bridging header. diff --git a/test/ClangImporter/InternalBridgingHeader/access_checking_cxx.swift b/test/ClangImporter/InternalBridgingHeader/access_checking_cxx.swift index fb355fd625db5..50fd13944eafd 100644 --- a/test/ClangImporter/InternalBridgingHeader/access_checking_cxx.swift +++ b/test/ClangImporter/InternalBridgingHeader/access_checking_cxx.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -internal-import-bridging-header %S/../Inputs/cxx-bridging-header.h -sdk %clang-importer-sdk -cxx-interoperability-mode=default -I %S/../Inputs +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -internal-import-bridging-header %S/../Inputs/cxx-bridging-header.h -sdk %clang-importer-sdk -cxx-interoperability-mode=default -I %S/../Inputs public func getRed() -> OuterNS.Color { OuterNS.red } // expected-error@-1{{function cannot be declared public because its result uses an internal type}} diff --git a/test/ClangImporter/InternalBridgingHeader/implementation_only_checking.swift b/test/ClangImporter/InternalBridgingHeader/implementation_only_checking.swift index ba10fe9969c62..912f3546b4a8f 100644 --- a/test/ClangImporter/InternalBridgingHeader/implementation_only_checking.swift +++ b/test/ClangImporter/InternalBridgingHeader/implementation_only_checking.swift @@ -2,13 +2,13 @@ // RUN: mkdir -p %t/tmp // Test with the normal bridging header. -// RUN: %target-typecheck-verify-swift -internal-import-bridging-header %S/../Inputs/c-bridging-header.h -sdk %clang-importer-sdk -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -internal-import-bridging-header %S/../Inputs/c-bridging-header.h -sdk %clang-importer-sdk -verify-ignore-unknown // RUN: not %target-swift-frontend -typecheck -internal-import-bridging-header %S/../Inputs/c-bridging-header.h -sdk %clang-importer-sdk %s 2>&1 | %FileCheck %s // Test with a precompiled bridging header. // RUN: %target-swift-frontend -emit-pch -o %t/c-bridging-header.pch %S/../Inputs/c-bridging-header.h -sdk %clang-importer-sdk -// RUN: %target-typecheck-verify-swift -internal-import-bridging-header %t/c-bridging-header.pch -sdk %clang-importer-sdk -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -internal-import-bridging-header %t/c-bridging-header.pch -sdk %clang-importer-sdk -verify-ignore-unknown @inlinable diff --git a/test/ClangImporter/MixedSource/broken-bridging-header.swift b/test/ClangImporter/MixedSource/broken-bridging-header.swift index c3dde966b976b..de0b70c5fc233 100644 --- a/test/ClangImporter/MixedSource/broken-bridging-header.swift +++ b/test/ClangImporter/MixedSource/broken-bridging-header.swift @@ -10,11 +10,11 @@ // RUN: %target-swift-frontend -emit-module -o %t -module-name HasBridgingHeader %S/../../Inputs/empty.swift -enable-objc-interop -import-objc-header %t/error-on-define.h -diagnostic-style llvm -// RUN: %target-swift-frontend -typecheck %s -I %t -Xcc -DERROR -verify -show-diagnostics-after-fatal +// RUN: %target-swift-frontend -typecheck %s -I %t -Xcc -DERROR -verify -verify-ignore-unrelated -show-diagnostics-after-fatal // RUN: not %target-swift-frontend -typecheck %s -I %t -Xcc -DERROR 2>&1 -diagnostic-style llvm | %FileCheck -check-prefix=HEADER-ERROR %s // RUN: rm %t/error-on-define-impl.h -// RUN: %target-swift-frontend -typecheck %s -I %t -verify -show-diagnostics-after-fatal -diagnostic-style llvm +// RUN: %target-swift-frontend -typecheck %s -I %t -verify -verify-ignore-unrelated -show-diagnostics-after-fatal -diagnostic-style llvm // RUN: not %target-swift-frontend -typecheck %s -I %t -diagnostic-style llvm 2>&1 | %FileCheck -check-prefix=MISSING-OTHER-HEADER %s import HasBridgingHeader // expected-error {{failed to import bridging header}} expected-error {{failed to load module 'HasBridgingHeader'}} diff --git a/test/ClangImporter/MixedSource/can_import_objc_idempotent.swift b/test/ClangImporter/MixedSource/can_import_objc_idempotent.swift index 9ba34ebaa4320..1f38fde8bc2cb 100644 --- a/test/ClangImporter/MixedSource/can_import_objc_idempotent.swift +++ b/test/ClangImporter/MixedSource/can_import_objc_idempotent.swift @@ -7,10 +7,10 @@ // FIXME: END -enable-source-import hackaround // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -I %S/../Inputs/custom-modules -enable-objc-interop -import-objc-header %t/mixed-target/header.h -emit-module-path %t/MixedWithHeader.swiftmodule %S/Inputs/mixed-with-header.swift %S/../../Inputs/empty.swift -module-name MixedWithHeader -disable-objc-attr-requires-foundation-module -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -I %S/../Inputs/custom-modules -typecheck %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -I %S/../Inputs/custom-modules -typecheck %s -verify -verify-ignore-unrelated // RUN: rm -rf %t/mixed-target/ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -I %S/../Inputs/custom-modules -typecheck %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -I %S/../Inputs/custom-modules -typecheck %s -verify -verify-ignore-unrelated // REQUIRES: objc_interop diff --git a/test/ClangImporter/MixedSource/import-mixed-framework.swift b/test/ClangImporter/MixedSource/import-mixed-framework.swift index 8ce4b8b78da57..aeb522739cd3c 100644 --- a/test/ClangImporter/MixedSource/import-mixed-framework.swift +++ b/test/ClangImporter/MixedSource/import-mixed-framework.swift @@ -5,7 +5,7 @@ // RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -F %t -typecheck %s // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -emit-module -o %t/Mixed.framework/Modules/Mixed.swiftmodule/%target-swiftmodule-name %S/Inputs/mixed-framework/Mixed.swift -import-underlying-module -F %t -module-name Mixed -disable-objc-attr-requires-foundation-module -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -F %t -typecheck %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -F %t -typecheck %s -verify -verify-ignore-unrelated import Mixed diff --git a/test/ClangImporter/MixedSource/mixed-target-using-module.swift b/test/ClangImporter/MixedSource/mixed-target-using-module.swift index 7cacecc69c4fd..c258371b3f26d 100644 --- a/test/ClangImporter/MixedSource/mixed-target-using-module.swift +++ b/test/ClangImporter/MixedSource/mixed-target-using-module.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -F %S/Inputs/mixed-target/ -module-name Mixed -import-underlying-module -typecheck %s -verify -enable-objc-interop -disable-objc-attr-requires-foundation-module +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -F %S/Inputs/mixed-target/ -module-name Mixed -import-underlying-module -typecheck %s -verify -verify-ignore-unrelated -enable-objc-interop -disable-objc-attr-requires-foundation-module // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -F %S/Inputs/mixed-target/ -module-name Mixed -import-underlying-module -enable-objc-interop -emit-ir %S/../../Inputs/empty.swift | %FileCheck -check-prefix=CHECK-AUTOLINK %s // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -F %S/Inputs/mixed-target/ -module-name Mixed -DOVERLAY_STYLE_RIGHT -enable-objc-interop -emit-ir %S/../../Inputs/empty.swift | %FileCheck -check-prefix=CHECK-AUTOLINK %s // RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -F %S/Inputs/mixed-target/ -module-name WrongName -import-underlying-module -typecheck %s -enable-objc-interop -disable-objc-attr-requires-foundation-module 2>&1 | %FileCheck -check-prefix=CHECK-WRONG-NAME %s diff --git a/test/ClangImporter/MixedSource/resolve-cross-language.swift b/test/ClangImporter/MixedSource/resolve-cross-language.swift index f64c280ad4820..c0dcd972949f9 100644 --- a/test/ClangImporter/MixedSource/resolve-cross-language.swift +++ b/test/ClangImporter/MixedSource/resolve-cross-language.swift @@ -2,7 +2,7 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -emit-module -enable-objc-interop -emit-objc-header -o %t %S/Inputs/resolve-cross-language/Base.swift -disable-objc-attr-requires-foundation-module // RUN: cp %S/Inputs/resolve-cross-language/Base.modulemap %t/module.modulemap -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -typecheck -I %t -F %clang-importer-sdk-path/frameworks -F %S/Inputs/resolve-cross-language %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -typecheck -I %t -F %clang-importer-sdk-path/frameworks -F %S/Inputs/resolve-cross-language %s -verify -verify-ignore-unrelated import Base import BaseUser diff --git a/test/ClangImporter/SceneKit_test.swift b/test/ClangImporter/SceneKit_test.swift index fc4a005a0cdb2..7d155109821f9 100644 --- a/test/ClangImporter/SceneKit_test.swift +++ b/test/ClangImporter/SceneKit_test.swift @@ -1,5 +1,5 @@ // RUN: %empty-directory(%t/cache) -// RUN: %target-typecheck-verify-swift -module-cache-path %t/cache +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -module-cache-path %t/cache // REQUIRES: objc_interop // REQUIRES: OS=macosx diff --git a/test/ClangImporter/alias-invalid.swift b/test/ClangImporter/alias-invalid.swift index 44866126d84ea..ab6bc626b8f8b 100644 --- a/test/ClangImporter/alias-invalid.swift +++ b/test/ClangImporter/alias-invalid.swift @@ -1,5 +1,5 @@ // RUN: %empty-directory(%t) -// RUN: %target-typecheck-verify-swift -I %S/Inputs/custom-modules -enable-experimental-feature ImportMacroAliases +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %S/Inputs/custom-modules -enable-experimental-feature ImportMacroAliases // REQUIRES: swift_feature_ImportMacroAliases diff --git a/test/ClangImporter/attr-swift_name-errors.swift b/test/ClangImporter/attr-swift_name-errors.swift index 10143e9e00f8e..9173dc112c2e9 100644 --- a/test/ClangImporter/attr-swift_name-errors.swift +++ b/test/ClangImporter/attr-swift_name-errors.swift @@ -1,5 +1,5 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/custom-modules -typecheck %s \ -// RUN: -verify -verify-additional-file %S/Inputs/custom-modules/ConflictingNames.h -verify-ignore-unknown +// RUN: -verify -verify-ignore-unrelated -verify-additional-file %S/Inputs/custom-modules/ConflictingNames.h -verify-ignore-unknown // REQUIRES: objc_interop diff --git a/test/ClangImporter/attr-swift_name_renaming-objc.swift b/test/ClangImporter/attr-swift_name_renaming-objc.swift index 6a264271f7a5c..528727e2a7f3e 100644 --- a/test/ClangImporter/attr-swift_name_renaming-objc.swift +++ b/test/ClangImporter/attr-swift_name_renaming-objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -I %/S/Inputs/custom-modules -Xcc -w -typecheck -verify %s -verify-additional-file %/S/Inputs/custom-modules%{fs-sep}SwiftName.h +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -I %/S/Inputs/custom-modules -Xcc -w -typecheck -verify -verify-ignore-unrelated %s -verify-additional-file %/S/Inputs/custom-modules%{fs-sep}SwiftName.h import SwiftName diff --git a/test/ClangImporter/attr-swift_name_renaming.swift b/test/ClangImporter/attr-swift_name_renaming.swift index b2bcb37173b3a..b02015ef6db17 100644 --- a/test/ClangImporter/attr-swift_name_renaming.swift +++ b/test/ClangImporter/attr-swift_name_renaming.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/custom-modules -Xcc -w -typecheck -verify %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/custom-modules -Xcc -w -typecheck -verify -verify-ignore-unrelated %s import SwiftName diff --git a/test/ClangImporter/attr-swift_private.swift b/test/ClangImporter/attr-swift_private.swift index fd9af2910913f..87cacdc55be67 100644 --- a/test/ClangImporter/attr-swift_private.swift +++ b/test/ClangImporter/attr-swift_private.swift @@ -1,7 +1,7 @@ // RUN: %empty-directory(%t) // RUN: %build-clang-importer-objc-overlays -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -I %S/Inputs/custom-modules -typecheck %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -I %S/Inputs/custom-modules -typecheck %s -verify -verify-ignore-unrelated // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -I %S/Inputs/custom-modules -emit-ir %s -D IRGEN | %FileCheck %s // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk-nosource -I %t) -I %S/Inputs/custom-modules -print-module -source-filename="%s" -module-to-print SwiftPrivateAttr > %t.txt diff --git a/test/ClangImporter/availability.swift b/test/ClangImporter/availability.swift index b47fccad51230..4a55fc07e4db2 100644 --- a/test/ClangImporter/availability.swift +++ b/test/ClangImporter/availability.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -I %S/Inputs/custom-modules %s -verify-ignore-unknown +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated -I %S/Inputs/custom-modules %s -verify-ignore-unknown // REQUIRES: objc_interop diff --git a/test/ClangImporter/availability_app_extension.swift b/test/ClangImporter/availability_app_extension.swift index 2408c0ea7a257..3472f1c4508bc 100644 --- a/test/ClangImporter/availability_app_extension.swift +++ b/test/ClangImporter/availability_app_extension.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -application-extension %s -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -application-extension-library %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated -application-extension %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated -application-extension-library %s // Check the exact error message, which requires a regex match // RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -application-extension %s 2>&1 | %FileCheck %s diff --git a/test/ClangImporter/availability_custom_domains.swift b/test/ClangImporter/availability_custom_domains.swift index 7e5966a15747c..b5d777c120022 100644 --- a/test/ClangImporter/availability_custom_domains.swift +++ b/test/ClangImporter/availability_custom_domains.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify \ +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated \ // RUN: -import-objc-header %S/Inputs/availability_domains_bridging_header.h \ // RUN: -I %S/../Inputs/custom-modules/availability-domains \ // RUN: -enable-experimental-feature CustomAvailability \ @@ -10,7 +10,7 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-pch \ // RUN: -o %t/bridging-header.pch %S/Inputs/availability_domains_bridging_header.h -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify \ +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated \ // RUN: -import-objc-header %t/bridging-header.pch \ // RUN: -I %S/../Inputs/custom-modules/availability-domains \ // RUN: -enable-experimental-feature CustomAvailability \ diff --git a/test/ClangImporter/availability_custom_domains_access_availability.swift b/test/ClangImporter/availability_custom_domains_access_availability.swift index 00b7d28210636..8aba570eea1aa 100644 --- a/test/ClangImporter/availability_custom_domains_access_availability.swift +++ b/test/ClangImporter/availability_custom_domains_access_availability.swift @@ -1,11 +1,11 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify \ +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated \ // RUN: -import-objc-header %S/Inputs/availability_domains_bridging_header.h \ // RUN: -I %S/../Inputs/custom-modules/availability-domains \ // RUN: -enable-experimental-feature CustomAvailability \ // RUN: -experimental-spi-only-imports -parse-as-library -swift-version 4 \ // RUN: %s -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify \ +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated \ // RUN: -import-objc-header %S/Inputs/availability_domains_bridging_header.h \ // RUN: -I %S/../Inputs/custom-modules/availability-domains \ // RUN: -enable-experimental-feature CustomAvailability \ diff --git a/test/ClangImporter/availability_custom_domains_objc.swift b/test/ClangImporter/availability_custom_domains_objc.swift index 1d8c53a314e11..a55c898025127 100644 --- a/test/ClangImporter/availability_custom_domains_objc.swift +++ b/test/ClangImporter/availability_custom_domains_objc.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify \ +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated \ // RUN: -import-objc-header %S/Inputs/availability_domains_bridging_header.h \ // RUN: -I %S/../Inputs/custom-modules/availability-domains \ // RUN: -enable-experimental-feature CustomAvailability \ @@ -10,7 +10,7 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-pch \ // RUN: -o %t/bridging-header.pch %S/Inputs/availability_domains_bridging_header.h -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify \ +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated \ // RUN: -import-objc-header %t/bridging-header.pch \ // RUN: -I %S/../Inputs/custom-modules/availability-domains \ // RUN: -enable-experimental-feature CustomAvailability \ diff --git a/test/ClangImporter/availability_macosx.swift b/test/ClangImporter/availability_macosx.swift index e820a0302224f..1eeb56445b44a 100644 --- a/test/ClangImporter/availability_macosx.swift +++ b/test/ClangImporter/availability_macosx.swift @@ -1,6 +1,6 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -I %S/Inputs/custom-modules %s -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -I %S/Inputs/custom-modules -application-extension %s -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -I %S/Inputs/custom-modules -application-extension-library %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated -I %S/Inputs/custom-modules %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated -I %S/Inputs/custom-modules -application-extension %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated -I %S/Inputs/custom-modules -application-extension-library %s // REQUIRES: OS=macosx diff --git a/test/ClangImporter/availability_returns_twice-msvc-x86_64.swift b/test/ClangImporter/availability_returns_twice-msvc-x86_64.swift index ee2443bed80ae..07ce5e7dea3de 100644 --- a/test/ClangImporter/availability_returns_twice-msvc-x86_64.swift +++ b/test/ClangImporter/availability_returns_twice-msvc-x86_64.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated // REQUIRES: OS=windows-msvc && CPU=x86_64 import vcruntime diff --git a/test/ClangImporter/availability_returns_twice.swift b/test/ClangImporter/availability_returns_twice.swift index 1c79d33c3af72..65bfd8d92a006 100644 --- a/test/ClangImporter/availability_returns_twice.swift +++ b/test/ClangImporter/availability_returns_twice.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated // UNSUPPORTED: OS=windows-msvc diff --git a/test/ClangImporter/availability_spi_as_unavailable.swift b/test/ClangImporter/availability_spi_as_unavailable.swift index 16af331729c47..7affc3ea9d5e9 100644 --- a/test/ClangImporter/availability_spi_as_unavailable.swift +++ b/test/ClangImporter/availability_spi_as_unavailable.swift @@ -1,6 +1,6 @@ // REQUIRES: OS=macosx -// RUN: %target-swift-frontend -typecheck %s -F %S/Inputs/frameworks -verify -DNOT_UNDERLYING -library-level api -parse-as-library -require-explicit-availability=ignore -// RUN: %target-swift-frontend -typecheck %s -F %S/Inputs/frameworks -module-name SPIContainer -import-underlying-module -verify -library-level api -parse-as-library -require-explicit-availability=ignore +// RUN: %target-swift-frontend -typecheck %s -F %S/Inputs/frameworks -verify -verify-ignore-unrelated -DNOT_UNDERLYING -library-level api -parse-as-library -require-explicit-availability=ignore +// RUN: %target-swift-frontend -typecheck %s -F %S/Inputs/frameworks -module-name SPIContainer -import-underlying-module -verify -verify-ignore-unrelated -library-level api -parse-as-library -require-explicit-availability=ignore #if NOT_UNDERLYING import SPIContainer diff --git a/test/ClangImporter/availability_spi_as_unavailable_bridging_header.swift b/test/ClangImporter/availability_spi_as_unavailable_bridging_header.swift index d5936e09e5a43..f84d7118fc55b 100644 --- a/test/ClangImporter/availability_spi_as_unavailable_bridging_header.swift +++ b/test/ClangImporter/availability_spi_as_unavailable_bridging_header.swift @@ -1,5 +1,5 @@ // REQUIRES: OS=macosx -// RUN: %target-swift-frontend -typecheck %s -import-objc-header %S/Inputs/frameworks/SPIContainer.framework/Headers/SPIContainer.h -verify -library-level api +// RUN: %target-swift-frontend -typecheck %s -import-objc-header %S/Inputs/frameworks/SPIContainer.framework/Headers/SPIContainer.h -verify -verify-ignore-unrelated -library-level api @_spi(a) public let a: SPIInterface1 diff --git a/test/ClangImporter/availability_spi_transitive.swift b/test/ClangImporter/availability_spi_transitive.swift index d704d2ba4dec2..397a981e111f8 100644 --- a/test/ClangImporter/availability_spi_transitive.swift +++ b/test/ClangImporter/availability_spi_transitive.swift @@ -1,5 +1,5 @@ // REQUIRES: OS=macosx -// RUN: %target-swift-frontend -typecheck %s -F %S/Inputs/frameworks -verify -library-level api +// RUN: %target-swift-frontend -typecheck %s -F %S/Inputs/frameworks -verify -verify-ignore-unrelated -library-level api import SPIContainerImporter diff --git a/test/ClangImporter/availability_variadic.swift b/test/ClangImporter/availability_variadic.swift index 7070f8467f33d..a6d6f80842d42 100644 --- a/test/ClangImporter/availability_variadic.swift +++ b/test/ClangImporter/availability_variadic.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -I %S/Inputs/custom-modules %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated -I %S/Inputs/custom-modules %s // REQUIRES: OS=macosx diff --git a/test/ClangImporter/bad-ns-extensible-string-enum.swift b/test/ClangImporter/bad-ns-extensible-string-enum.swift index 8db500d44405a..b5cfddc0bf962 100644 --- a/test/ClangImporter/bad-ns-extensible-string-enum.swift +++ b/test/ClangImporter/bad-ns-extensible-string-enum.swift @@ -1,3 +1,3 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck %s -enable-objc-interop -import-objc-header %S/Inputs/bad-ns-extensible-string-enum.h -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck %s -enable-objc-interop -import-objc-header %S/Inputs/bad-ns-extensible-string-enum.h -verify -verify-ignore-unrelated let string = MyString.MyStringOne // expected-error {{cannot find 'MyString' in scope}} diff --git a/test/ClangImporter/cf.swift b/test/ClangImporter/cf.swift index 5cb2e9e7a3b0b..90da57bc9e58a 100644 --- a/test/ClangImporter/cf.swift +++ b/test/ClangImporter/cf.swift @@ -1,6 +1,6 @@ -// RUN: %target-swift-frontend -disable-objc-attr-requires-foundation-module -typecheck -verify -import-cf-types -I %S/Inputs/custom-modules %s +// RUN: %target-swift-frontend -disable-objc-attr-requires-foundation-module -typecheck -verify -verify-ignore-unrelated -import-cf-types -I %S/Inputs/custom-modules %s -// RUN: %target-swift-frontend -disable-objc-attr-requires-foundation-module -typecheck -verify -import-cf-types -enable-experimental-cxx-interop -I %S/Inputs/custom-modules %s +// RUN: %target-swift-frontend -disable-objc-attr-requires-foundation-module -typecheck -verify -verify-ignore-unrelated -import-cf-types -enable-experimental-cxx-interop -I %S/Inputs/custom-modules %s // REQUIRES: objc_interop diff --git a/test/ClangImporter/cfuncs_parse.swift b/test/ClangImporter/cfuncs_parse.swift index 051ffd35e52aa..d91d9248868ab 100644 --- a/test/ClangImporter/cfuncs_parse.swift +++ b/test/ClangImporter/cfuncs_parse.swift @@ -1,5 +1,5 @@ // XFAIL: CPU=powerpc64le -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -I %S/Inputs %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated -I %S/Inputs %s import cfuncs diff --git a/test/ClangImporter/ctypes_parse.swift b/test/ClangImporter/ctypes_parse.swift index 629af9d085aad..12a56d3a31676 100644 --- a/test/ClangImporter/ctypes_parse.swift +++ b/test/ClangImporter/ctypes_parse.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift %clang-importer-sdk -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated %clang-importer-sdk -verify-ignore-unknown import ctypes diff --git a/test/ClangImporter/ctypes_parse_msvc.swift b/test/ClangImporter/ctypes_parse_msvc.swift index 8a121f23feaf7..307a521bc659a 100644 --- a/test/ClangImporter/ctypes_parse_msvc.swift +++ b/test/ClangImporter/ctypes_parse_msvc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -Xcc -fms-extensions -import-objc-header %S/Inputs/ctypes_msvc.h -typecheck -verify %s +// RUN: %target-swift-frontend -Xcc -fms-extensions -import-objc-header %S/Inputs/ctypes_msvc.h -typecheck -verify -verify-ignore-unrelated %s _ = T().uc _ = T(S(uc: 0)) diff --git a/test/ClangImporter/ctypes_parse_objc.swift b/test/ClangImporter/ctypes_parse_objc.swift index 23208a2c43d11..7cb2d6677d4cb 100644 --- a/test/ClangImporter/ctypes_parse_objc.swift +++ b/test/ClangImporter/ctypes_parse_objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift %clang-importer-sdk -enable-objc-interop +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated %clang-importer-sdk -enable-objc-interop import ctypes import CoreGraphics diff --git a/test/ClangImporter/enum-objc.swift b/test/ClangImporter/enum-objc.swift index 83e7692226502..b9c2b211cb38d 100644 --- a/test/ClangImporter/enum-objc.swift +++ b/test/ClangImporter/enum-objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-sil %s -enable-objc-interop -import-objc-header %S/Inputs/enum-objc.h -verify -enable-nonfrozen-enum-exhaustivity-diagnostics +// RUN: %target-swift-frontend -emit-sil %s -enable-objc-interop -import-objc-header %S/Inputs/enum-objc.h -verify -verify-ignore-unrelated -enable-nonfrozen-enum-exhaustivity-diagnostics // REQUIRES: objc_interop diff --git a/test/ClangImporter/enum-with-target.swift b/test/ClangImporter/enum-with-target.swift index 78f8f15cb8727..07779a4e46282 100644 --- a/test/ClangImporter/enum-with-target.swift +++ b/test/ClangImporter/enum-with-target.swift @@ -1,5 +1,5 @@ -// RUN: %swift %clang-importer-sdk -target %target-cpu-apple-macosx51 -typecheck %s -verify -// RUN: %swift %clang-importer-sdk -target %target-cpu-apple-macosx52 -typecheck %s -verify +// RUN: %swift %clang-importer-sdk -target %target-cpu-apple-macosx51 -typecheck %s -verify -verify-ignore-unrelated +// RUN: %swift %clang-importer-sdk -target %target-cpu-apple-macosx52 -typecheck %s -verify -verify-ignore-unrelated // REQUIRES: OS=macosx import Foundation diff --git a/test/ClangImporter/enum.swift b/test/ClangImporter/enum.swift index 4184e2391f75c..37db41bb0d2bd 100644 --- a/test/ClangImporter/enum.swift +++ b/test/ClangImporter/enum.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck %s -verify -compiler-assertions +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck %s -verify -verify-ignore-unrelated -compiler-assertions // RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck %s -compiler-assertions 2>&1 | %FileCheck %s // -- Check that we can successfully round-trip. // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -D IRGEN -emit-ir -primary-file %s -compiler-assertions | %FileCheck -check-prefix=CHECK-IR %s diff --git a/test/ClangImporter/foreign_errors.swift b/test/ClangImporter/foreign_errors.swift index 0588f59eb681a..4374291274bc6 100644 --- a/test/ClangImporter/foreign_errors.swift +++ b/test/ClangImporter/foreign_errors.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-silgen -parse-as-library -verify %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-silgen -parse-as-library -verify -verify-ignore-unrelated %s // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-sil -O -parse-as-library -DEMIT_SIL %s // REQUIRES: objc_interop diff --git a/test/ClangImporter/generic_compatibility_alias.swift b/test/ClangImporter/generic_compatibility_alias.swift index b9a7f94c3afcb..f7f922dc3f177 100644 --- a/test/ClangImporter/generic_compatibility_alias.swift +++ b/test/ClangImporter/generic_compatibility_alias.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %build-clang-importer-objc-overlays -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -module-name generic_compat_alias -I %S/Inputs/custom-modules -typecheck -verify %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -module-name generic_compat_alias -I %S/Inputs/custom-modules -typecheck -verify -verify-ignore-unrelated %s // REQUIRES: objc_interop // REQUIRES: OS=macosx diff --git a/test/ClangImporter/import-as-member.swift b/test/ClangImporter/import-as-member.swift index f617cb43ba0f0..3d3de93a17355 100644 --- a/test/ClangImporter/import-as-member.swift +++ b/test/ClangImporter/import-as-member.swift @@ -4,7 +4,7 @@ // RUN: %FileCheck %S/Inputs/custom-modules/ImportAsMember.h <%t.txt // RUN: %FileCheck %S/Inputs/custom-modules/ImportAsMember_Private.h <%t.txt -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -typecheck -F %S/Inputs/frameworks -I %S/Inputs/custom-modules -module-cache-path %t.mcp %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -typecheck -F %S/Inputs/frameworks -I %S/Inputs/custom-modules -module-cache-path %t.mcp %s -verify -verify-ignore-unrelated import ImportAsMember import ImportAsMember_Private diff --git a/test/ClangImporter/macros.swift b/test/ClangImporter/macros.swift index a25354d17cb1b..602a8b5881e78 100644 --- a/test/ClangImporter/macros.swift +++ b/test/ClangImporter/macros.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -typecheck -verify %s -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -cxx-interoperability-mode=default -enable-objc-interop -typecheck -verify %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -typecheck -verify -verify-ignore-unrelated %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -cxx-interoperability-mode=default -enable-objc-interop -typecheck -verify -verify-ignore-unrelated %s @_exported import macros diff --git a/test/ClangImporter/macros_redef.swift b/test/ClangImporter/macros_redef.swift index 319b46046a342..b05d7aa8c8905 100644 --- a/test/ClangImporter/macros_redef.swift +++ b/test/ClangImporter/macros_redef.swift @@ -1,5 +1,5 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/custom-modules -enable-objc-interop -import-objc-header %S/Inputs/macros_redef.h -emit-silgen %s | %FileCheck -check-prefix=NEGATIVE %s -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/custom-modules -enable-objc-interop -import-objc-header %S/Inputs/macros_redef.h -DCONFLICT -typecheck -verify %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/custom-modules -enable-objc-interop -import-objc-header %S/Inputs/macros_redef.h -DCONFLICT -typecheck -verify -verify-ignore-unrelated %s // NEGATIVE-NOT: OLDTAG diff --git a/test/ClangImporter/nested_protocol_name.swift b/test/ClangImporter/nested_protocol_name.swift index 5b4f4d137d537..0e4c907155a52 100644 --- a/test/ClangImporter/nested_protocol_name.swift +++ b/test/ClangImporter/nested_protocol_name.swift @@ -1,6 +1,6 @@ // REQUIRES: objc_interop -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -import-objc-header %S/Inputs/nested_protocol_name.h -typecheck -verify %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -import-objc-header %S/Inputs/nested_protocol_name.h -typecheck -verify -verify-ignore-unrelated %s // RUN: echo '#include "nested_protocol_name.h"' > %t.m // RUN: %target-swift-ide-test -source-filename %s -print-header -header-to-print %S/Inputs/nested_protocol_name.h -import-objc-header %S/Inputs/nested_protocol_name.h --cc-args %target-cc-options -fsyntax-only %t.m -I %S/Inputs > %t.txt diff --git a/test/ClangImporter/nullability.swift b/test/ClangImporter/nullability.swift index 9a7ab8ab4b6b4..9a55ce1b19ee2 100644 --- a/test/ClangImporter/nullability.swift +++ b/test/ClangImporter/nullability.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -typecheck -I %S/Inputs/custom-modules %s -import-underlying-module -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -typecheck -I %S/Inputs/custom-modules %s -import-underlying-module -verify -verify-ignore-unrelated import CoreCooling diff --git a/test/ClangImporter/objc_async.swift b/test/ClangImporter/objc_async.swift index 480cc9ebcf2a4..8b9970f7d1a14 100644 --- a/test/ClangImporter/objc_async.swift +++ b/test/ClangImporter/objc_async.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -I %S/Inputs/custom-modules %s -verify -verify-additional-file %swift_src_root/test/Inputs/clang-importer-sdk/usr/include/ObjCConcurrency.h -strict-concurrency=targeted -parse-as-library -enable-experimental-feature SendableCompletionHandlers +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -I %S/Inputs/custom-modules %s -verify -verify-ignore-unrelated -verify-additional-file %swift_src_root/test/Inputs/clang-importer-sdk/usr/include/ObjCConcurrency.h -strict-concurrency=targeted -parse-as-library -enable-experimental-feature SendableCompletionHandlers // REQUIRES: objc_interop // REQUIRES: concurrency diff --git a/test/ClangImporter/objc_async_conformance.swift b/test/ClangImporter/objc_async_conformance.swift index a23b9897387d4..45ab6b898a001 100644 --- a/test/ClangImporter/objc_async_conformance.swift +++ b/test/ClangImporter/objc_async_conformance.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -I %S/Inputs/custom-modules -disable-availability-checking %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -I %S/Inputs/custom-modules -disable-availability-checking %s -verify -verify-ignore-unrelated // REQUIRES: objc_interop // REQUIRES: concurrency diff --git a/test/ClangImporter/objc_async_macos.swift b/test/ClangImporter/objc_async_macos.swift index 804e71a64b14c..3bb3e2b7e14bd 100644 --- a/test/ClangImporter/objc_async_macos.swift +++ b/test/ClangImporter/objc_async_macos.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -I %S/Inputs/custom-modules %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -I %S/Inputs/custom-modules %s -verify -verify-ignore-unrelated // REQUIRES: objc_interop // REQUIRES: concurrency diff --git a/test/ClangImporter/objc_bridging_generics.swift b/test/ClangImporter/objc_bridging_generics.swift index 65db7c46798f7..65d1bb5440703 100644 --- a/test/ClangImporter/objc_bridging_generics.swift +++ b/test/ClangImporter/objc_bridging_generics.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -verify -swift-version 4 -I %S/Inputs/custom-modules %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -verify -verify-ignore-unrelated -swift-version 4 -I %S/Inputs/custom-modules %s // REQUIRES: objc_interop diff --git a/test/ClangImporter/objc_class_subscript.swift b/test/ClangImporter/objc_class_subscript.swift index 37f770e367a07..4d59605b3db61 100644 --- a/test/ClangImporter/objc_class_subscript.swift +++ b/test/ClangImporter/objc_class_subscript.swift @@ -1,7 +1,7 @@ // RUN: %empty-directory(%t) // RUN: %build-clang-importer-objc-overlays -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -typecheck -I %S/Inputs/custom-modules %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -typecheck -I %S/Inputs/custom-modules %s -verify -verify-ignore-unrelated // REQUIRES: objc_interop diff --git a/test/ClangImporter/objc_diags.swift b/test/ClangImporter/objc_diags.swift index 539e8af48547e..cc85b0e9e5bb8 100644 --- a/test/ClangImporter/objc_diags.swift +++ b/test/ClangImporter/objc_diags.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -typecheck %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -typecheck %s -verify -verify-ignore-unrelated import ObjectiveC diff --git a/test/ClangImporter/objc_direct.swift b/test/ClangImporter/objc_direct.swift index cfcd04ef31715..fa3b11972be3f 100644 --- a/test/ClangImporter/objc_direct.swift +++ b/test/ClangImporter/objc_direct.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend-verify -typecheck %s -enable-objc-interop -import-objc-header %S/../Inputs/objc_direct.h +// RUN: %target-swift-frontend-verify -verify-ignore-unrelated -typecheck %s -enable-objc-interop -import-objc-header %S/../Inputs/objc_direct.h // REQUIRES: objc_interop diff --git a/test/ClangImporter/objc_factory_method.swift b/test/ClangImporter/objc_factory_method.swift index 95a7009a54566..d3590a5bfa584 100644 --- a/test/ClangImporter/objc_factory_method.swift +++ b/test/ClangImporter/objc_factory_method.swift @@ -1,7 +1,7 @@ // RUN: %empty-directory(%t) // RUN: %build-clang-importer-objc-overlays -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -target %target-cpu-apple-macosx51 -typecheck %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -target %target-cpu-apple-macosx51 -typecheck %s -verify -verify-ignore-unrelated // REQUIRES: OS=macosx // REQUIRES: objc_interop diff --git a/test/ClangImporter/objc_generics_conformance.swift b/test/ClangImporter/objc_generics_conformance.swift index 86084bb36ee49..6cb621a23b48a 100644 --- a/test/ClangImporter/objc_generics_conformance.swift +++ b/test/ClangImporter/objc_generics_conformance.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -verify -swift-version 4 -I %S/Inputs/custom-modules %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -verify -verify-ignore-unrelated -swift-version 4 -I %S/Inputs/custom-modules %s // REQUIRES: objc_interop diff --git a/test/ClangImporter/objc_implicit_with.swift b/test/ClangImporter/objc_implicit_with.swift index ec5702c83bd4f..2024cfa0541b6 100644 --- a/test/ClangImporter/objc_implicit_with.swift +++ b/test/ClangImporter/objc_implicit_with.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck %s -verify -verify-ignore-unrelated // REQUIRES: objc_interop diff --git a/test/ClangImporter/objc_init.swift b/test/ClangImporter/objc_init.swift index c795ff4bb2341..adde85e45311c 100644 --- a/test/ClangImporter/objc_init.swift +++ b/test/ClangImporter/objc_init.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-sil -I %S/Inputs/custom-modules %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-sil -I %S/Inputs/custom-modules %s -verify -verify-ignore-unrelated // REQUIRES: objc_interop diff --git a/test/ClangImporter/objc_init_redundant.swift b/test/ClangImporter/objc_init_redundant.swift index eb49c23e5c30d..dfa7fa7cee5ee 100644 --- a/test/ClangImporter/objc_init_redundant.swift +++ b/test/ClangImporter/objc_init_redundant.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk -I %S/Inputs/custom-modules -F %S/Inputs/frameworks) -import-underlying-module -import-objc-header %S/Inputs/objc_init_redundant_bridging.h -emit-sil %s -verify -swift-version 5 -enable-library-evolution +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk -I %S/Inputs/custom-modules -F %S/Inputs/frameworks) -import-underlying-module -import-objc-header %S/Inputs/objc_init_redundant_bridging.h -emit-sil %s -verify -verify-ignore-unrelated -swift-version 5 -enable-library-evolution // RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk -I %S/Inputs/custom-modules -F %S/Inputs/frameworks) -import-underlying-module -import-objc-header %S/Inputs/objc_init_redundant_bridging.h -emit-sil %s -swift-version 5 -enable-library-evolution > %t.log 2>&1 // RUN: %FileCheck %s < %t.log diff --git a/test/ClangImporter/objc_isolation_complete.swift b/test/ClangImporter/objc_isolation_complete.swift index 24a9b0f98f10d..1788f93e92e30 100644 --- a/test/ClangImporter/objc_isolation_complete.swift +++ b/test/ClangImporter/objc_isolation_complete.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -I %S/Inputs/custom-modules %s -verify -strict-concurrency=complete -parse-as-library +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -I %S/Inputs/custom-modules %s -verify -verify-ignore-unrelated -strict-concurrency=complete -parse-as-library // REQUIRES: objc_interop // REQUIRES: concurrency diff --git a/test/ClangImporter/objc_missing_designated_init.swift b/test/ClangImporter/objc_missing_designated_init.swift index 1cd5ff1f338de..546fdf7df954a 100644 --- a/test/ClangImporter/objc_missing_designated_init.swift +++ b/test/ClangImporter/objc_missing_designated_init.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -typecheck -I %S/Inputs/custom-modules %s -swift-version 4 -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -typecheck -I %S/Inputs/custom-modules %s -swift-version 4 -verify -verify-ignore-unrelated import UnimportableMembers import UnimportableMembersUser diff --git a/test/ClangImporter/objc_nsmanagedobject.swift b/test/ClangImporter/objc_nsmanagedobject.swift index 0d760cc5dc14e..eece181b242dc 100644 --- a/test/ClangImporter/objc_nsmanagedobject.swift +++ b/test/ClangImporter/objc_nsmanagedobject.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/custom-modules -typecheck -parse-as-library -verify %s %S/Inputs/objc_nsmanaged_other.swift -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/custom-modules -typecheck -parse-as-library -verify -primary-file %s %S/Inputs/objc_nsmanaged_other.swift +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/custom-modules -typecheck -parse-as-library -verify -verify-ignore-unrelated %s %S/Inputs/objc_nsmanaged_other.swift +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/custom-modules -typecheck -parse-as-library -verify -verify-ignore-unrelated -primary-file %s %S/Inputs/objc_nsmanaged_other.swift // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/custom-modules -emit-silgen -parse-as-library -o /dev/null -DNO_ERROR %s %S/Inputs/objc_nsmanaged_other.swift // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/custom-modules -emit-silgen -parse-as-library -o /dev/null -DNO_ERROR -primary-file %s %S/Inputs/objc_nsmanaged_other.swift diff --git a/test/ClangImporter/objc_override.swift b/test/ClangImporter/objc_override.swift index 70b2b5fb1f2a3..aaf81ea6ac552 100644 --- a/test/ClangImporter/objc_override.swift +++ b/test/ClangImporter/objc_override.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-sil -I %S/Inputs/custom-modules %s -verify -verify-ignore-unknown +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-sil -I %S/Inputs/custom-modules %s -verify -verify-ignore-unrelated -verify-ignore-unknown // REQUIRES: objc_interop diff --git a/test/ClangImporter/objc_parse.swift b/test/ClangImporter/objc_parse.swift index 14a91241747ca..d7562e5615121 100644 --- a/test/ClangImporter/objc_parse.swift +++ b/test/ClangImporter/objc_parse.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-sil -I %S/Inputs/custom-modules %s -verify -disable-experimental-clang-importer-diagnostics +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-sil -I %S/Inputs/custom-modules %s -verify -verify-ignore-unrelated -disable-experimental-clang-importer-diagnostics // REQUIRES: objc_interop diff --git a/test/ClangImporter/objc_parse_verifier.swift b/test/ClangImporter/objc_parse_verifier.swift index 3ad28b6f677e8..92919c72962b9 100644 --- a/test/ClangImporter/objc_parse_verifier.swift +++ b/test/ClangImporter/objc_parse_verifier.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -emit-sil -I %S/Inputs/custom-modules %s -verify > /dev/null +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -emit-sil -I %S/Inputs/custom-modules %s -verify -verify-ignore-unrelated > /dev/null // expected-no-diagnostics diff --git a/test/ClangImporter/objc_protocol_renaming.swift b/test/ClangImporter/objc_protocol_renaming.swift index a9f8f23c7394d..5ffd954e2d8fb 100644 --- a/test/ClangImporter/objc_protocol_renaming.swift +++ b/test/ClangImporter/objc_protocol_renaming.swift @@ -7,7 +7,7 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %S/Inputs/custom-modules -I %t) -emit-module -o %t %S/Inputs/ImplementProtoRenaming.swift -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %S/Inputs/custom-modules -I %t) -typecheck %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %S/Inputs/custom-modules -I %t) -typecheck %s -verify -verify-ignore-unrelated // REQUIRES: objc_interop diff --git a/test/ClangImporter/objc_subscript.swift b/test/ClangImporter/objc_subscript.swift index e7d73a9383d38..6ce37bdd1e680 100644 --- a/test/ClangImporter/objc_subscript.swift +++ b/test/ClangImporter/objc_subscript.swift @@ -1,7 +1,7 @@ // RUN: %empty-directory(%t) // RUN: %build-clang-importer-objc-overlays -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-sil -I %S/Inputs/custom-modules %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-sil -I %S/Inputs/custom-modules %s -verify -verify-ignore-unrelated // REQUIRES: objc_interop diff --git a/test/ClangImporter/overlay.swift b/test/ClangImporter/overlay.swift index cd1f5e27a93c8..26bc489f0e4bc 100644 --- a/test/ClangImporter/overlay.swift +++ b/test/ClangImporter/overlay.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -I %S/Inputs/custom-modules %s -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -I %S/Inputs/custom-modules -DREVERSED %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated -I %S/Inputs/custom-modules %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated -I %S/Inputs/custom-modules -DREVERSED %s // REQUIRES: objc_interop diff --git a/test/ClangImporter/protocol-member-renaming.swift b/test/ClangImporter/protocol-member-renaming.swift index 65c07c9b63b86..54169f58faed4 100644 --- a/test/ClangImporter/protocol-member-renaming.swift +++ b/test/ClangImporter/protocol-member-renaming.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck -import-objc-header %S/Inputs/protocol-member-renaming.h -verify %s +// RUN: %target-swift-frontend -typecheck -import-objc-header %S/Inputs/protocol-member-renaming.h -verify -verify-ignore-unrelated %s // REQUIRES: objc_interop diff --git a/test/ClangImporter/rdar123543707.swift b/test/ClangImporter/rdar123543707.swift index a4de2c6d3d781..93daffa572359 100644 --- a/test/ClangImporter/rdar123543707.swift +++ b/test/ClangImporter/rdar123543707.swift @@ -1,5 +1,5 @@ // RUN: %empty-directory(%t) -// RUN: %target-typecheck-verify-swift -F %S/Inputs/frameworks -module-cache-path %t/mcp1 -target %target-stable-abi-triple +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -F %S/Inputs/frameworks -module-cache-path %t/mcp1 -target %target-stable-abi-triple // REQUIRES: objc_interop diff --git a/test/ClangImporter/sdk.swift b/test/ClangImporter/sdk.swift index cc2e30d79ba33..ce1a7981337ca 100644 --- a/test/ClangImporter/sdk.swift +++ b/test/ClangImporter/sdk.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated // REQUIRES: objc_interop diff --git a/test/ClangImporter/serialization-search-paths.swift b/test/ClangImporter/serialization-search-paths.swift index af6b3394eae80..c5cf991438f12 100644 --- a/test/ClangImporter/serialization-search-paths.swift +++ b/test/ClangImporter/serialization-search-paths.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module-path %t/SerializationHelper.swiftmodule -I %S/Inputs/custom-modules -F %S/Inputs/frameworks -sdk "" -enable-objc-interop -disable-objc-attr-requires-foundation-module %S/Inputs/SerializationHelper.swift -// RUN: %target-swift-frontend -enable-objc-interop -typecheck -I %t %s -sdk "" -verify +// RUN: %target-swift-frontend -enable-objc-interop -typecheck -I %t %s -sdk "" -verify -verify-ignore-unrelated import SerializationHelper import Module diff --git a/test/ClangImporter/simd.swift b/test/ClangImporter/simd.swift index 69eb614057023..50b67313cfdd1 100644 --- a/test/ClangImporter/simd.swift +++ b/test/ClangImporter/simd.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -module-name main -typecheck -verify %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -module-name main -typecheck -verify -verify-ignore-unrelated %s import c_simd diff --git a/test/ClangImporter/subclass_existentials.swift b/test/ClangImporter/subclass_existentials.swift index c7525a48e5716..cc2f5e9571488 100644 --- a/test/ClangImporter/subclass_existentials.swift +++ b/test/ClangImporter/subclass_existentials.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -o - -primary-file %s -I %S/Inputs/custom-modules/ +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated -o - -primary-file %s -I %S/Inputs/custom-modules/ // REQUIRES: objc_interop diff --git a/test/ClangImporter/submodules_scoped.swift b/test/ClangImporter/submodules_scoped.swift index 6fbafa67f5a71..189b227c472a7 100644 --- a/test/ClangImporter/submodules_scoped.swift +++ b/test/ClangImporter/submodules_scoped.swift @@ -1,5 +1,5 @@ // RUN: %empty-directory(%t) -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify %s -DCHECK_SCOPING +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated %s -DCHECK_SCOPING // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-module -o %t %s -module-name submodules // RUN: echo 'import submodules; let s = "\(x), \(y)"' | %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck - -I %t // RUN: echo 'import submodules; let s = "\(x), \(y)"' | not %target-swift-frontend -typecheck - -I %t 2>&1 | %FileCheck -check-prefix=MISSING %s diff --git a/test/ClangImporter/swift2_warnings.swift b/test/ClangImporter/swift2_warnings.swift index f7b3152671523..ba96e86463843 100644 --- a/test/ClangImporter/swift2_warnings.swift +++ b/test/ClangImporter/swift2_warnings.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-sil -I %S/Inputs/custom-modules %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-sil -I %S/Inputs/custom-modules %s -verify -verify-ignore-unrelated // REQUIRES: objc_interop diff --git a/test/Compatibility/accessibility.swift b/test/Compatibility/accessibility.swift index 85461b1ab642a..903ddf6c653cc 100644 --- a/test/Compatibility/accessibility.swift +++ b/test/Compatibility/accessibility.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -swift-version 4 -// RUN: %target-typecheck-verify-swift -swift-version 4.2 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 4 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 4.2 public protocol PublicProto { func publicReq() diff --git a/test/Concurrency/actor_derived_conformances.swift b/test/Concurrency/actor_derived_conformances.swift index 1b2f31a332ace..1590f613fc644 100644 --- a/test/Concurrency/actor_derived_conformances.swift +++ b/test/Concurrency/actor_derived_conformances.swift @@ -1,6 +1,6 @@ -// RUN: %target-swift-frontend -target %target-swift-5.1-abi-triple %s -emit-sil -o /dev/null -verify -// RUN: %target-swift-frontend -target %target-swift-5.1-abi-triple %s -emit-sil -o /dev/null -verify -strict-concurrency=targeted -// RUN: %target-swift-frontend -target %target-swift-5.1-abi-triple %s -emit-sil -o /dev/null -verify -strict-concurrency=complete +// RUN: %target-swift-frontend -target %target-swift-5.1-abi-triple %s -emit-sil -o /dev/null -verify -verify-ignore-unrelated +// RUN: %target-swift-frontend -target %target-swift-5.1-abi-triple %s -emit-sil -o /dev/null -verify -verify-ignore-unrelated -strict-concurrency=targeted +// RUN: %target-swift-frontend -target %target-swift-5.1-abi-triple %s -emit-sil -o /dev/null -verify -verify-ignore-unrelated -strict-concurrency=complete // REQUIRES: concurrency diff --git a/test/Concurrency/actor_isolation.swift b/test/Concurrency/actor_isolation.swift index 0fd4b0deca799..d06d336f8f504 100644 --- a/test/Concurrency/actor_isolation.swift +++ b/test/Concurrency/actor_isolation.swift @@ -3,7 +3,7 @@ // RUN: %target-swift-frontend -emit-module -emit-module-path %t/OtherActors.swiftmodule -module-name OtherActors %S/Inputs/OtherActors.swift -target %target-swift-5.1-abi-triple // RUN: %target-swift-frontend -emit-module -emit-module-path %t/GlobalVariables.swiftmodule -module-name GlobalVariables %S/Inputs/GlobalVariables.swift -target %target-swift-5.1-abi-triple -parse-as-library -// RUN: %target-swift-frontend -I %t -target %target-swift-5.1-abi-triple -strict-concurrency=complete -parse-as-library -emit-sil -o /dev/null -verify -enable-upcoming-feature GlobalActorIsolatedTypesUsability %s +// RUN: %target-swift-frontend -I %t -target %target-swift-5.1-abi-triple -strict-concurrency=complete -parse-as-library -emit-sil -o /dev/null -verify -verify-ignore-unrelated -enable-upcoming-feature GlobalActorIsolatedTypesUsability %s // REQUIRES: concurrency // REQUIRES: swift_feature_GlobalActorIsolatedTypesUsability diff --git a/test/Concurrency/async_task_groups_and_type_inference.swift b/test/Concurrency/async_task_groups_and_type_inference.swift index d0cf74275ab22..653202788f245 100644 --- a/test/Concurrency/async_task_groups_and_type_inference.swift +++ b/test/Concurrency/async_task_groups_and_type_inference.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -target %target-swift-5.1-abi-triple %s -emit-sil -o /dev/null -verify -strict-concurrency=complete +// RUN: %target-swift-frontend -target %target-swift-5.1-abi-triple %s -emit-sil -o /dev/null -verify -verify-ignore-unrelated -strict-concurrency=complete // REQUIRES: concurrency // REQUIRES: asserts diff --git a/test/Concurrency/concurrency_warnings.swift b/test/Concurrency/concurrency_warnings.swift index d825ada3d9284..474973e6f978f 100644 --- a/test/Concurrency/concurrency_warnings.swift +++ b/test/Concurrency/concurrency_warnings.swift @@ -2,7 +2,7 @@ // RUN: %target-swift-frontend -emit-module -emit-module-path %t/GlobalVariables.swiftmodule -module-name GlobalVariables %S/Inputs/GlobalVariables.swift -disable-availability-checking -parse-as-library -// RUN: %target-swift-frontend -I %t -strict-concurrency=complete -parse-as-library %s -emit-sil -o /dev/null -verify +// RUN: %target-swift-frontend -I %t -strict-concurrency=complete -parse-as-library %s -emit-sil -o /dev/null -verify -verify-ignore-unrelated // REQUIRES: concurrency // REQUIRES: asserts diff --git a/test/Concurrency/concurrent_value_checking.swift b/test/Concurrency/concurrent_value_checking.swift index eb5c84d88747c..b3b13cfffa4a6 100644 --- a/test/Concurrency/concurrent_value_checking.swift +++ b/test/Concurrency/concurrent_value_checking.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -target %target-swift-5.1-abi-triple -strict-concurrency=complete -parse-as-library %s -emit-sil -o /dev/null -verify -// RUN: %target-swift-frontend -target %target-swift-5.1-abi-triple -strict-concurrency=complete -parse-as-library %s -emit-sil -o /dev/null -verify -enable-upcoming-feature NonisolatedNonsendingByDefault +// RUN: %target-swift-frontend -target %target-swift-5.1-abi-triple -strict-concurrency=complete -parse-as-library %s -emit-sil -o /dev/null -verify -verify-ignore-unrelated +// RUN: %target-swift-frontend -target %target-swift-5.1-abi-triple -strict-concurrency=complete -parse-as-library %s -emit-sil -o /dev/null -verify -verify-ignore-unrelated -enable-upcoming-feature NonisolatedNonsendingByDefault // REQUIRES: concurrency // REQUIRES: asserts diff --git a/test/Concurrency/custom_executor_enqueue_impls.swift b/test/Concurrency/custom_executor_enqueue_impls.swift index 8dcb7912ad8cb..a6b1a74bf1461 100644 --- a/test/Concurrency/custom_executor_enqueue_impls.swift +++ b/test/Concurrency/custom_executor_enqueue_impls.swift @@ -1,6 +1,6 @@ -// RUN: %target-swift-frontend -disable-availability-checking -emit-sil -o /dev/null -verify %s -// RUN: %target-swift-frontend -disable-availability-checking -emit-sil -o /dev/null -verify -strict-concurrency=targeted %s -// RUN: %target-swift-frontend -disable-availability-checking -emit-sil -o /dev/null -verify -strict-concurrency=complete %s +// RUN: %target-swift-frontend -disable-availability-checking -emit-sil -o /dev/null -verify -verify-ignore-unrelated %s +// RUN: %target-swift-frontend -disable-availability-checking -emit-sil -o /dev/null -verify -verify-ignore-unrelated -strict-concurrency=targeted %s +// RUN: %target-swift-frontend -disable-availability-checking -emit-sil -o /dev/null -verify -verify-ignore-unrelated -strict-concurrency=complete %s // REQUIRES: concurrency diff --git a/test/Concurrency/deinit_isolation_import/test.swift b/test/Concurrency/deinit_isolation_import/test.swift index f784bc702960f..45cf6195e574e 100644 --- a/test/Concurrency/deinit_isolation_import/test.swift +++ b/test/Concurrency/deinit_isolation_import/test.swift @@ -9,7 +9,7 @@ // RUN: cp -R %S/Inputs/Beta.framework %t/Frameworks/ // RUN: %empty-directory(%t/Frameworks/Beta.framework/Headers/) // RUN: cp %S/Inputs/Beta.h %t/Frameworks/Beta.framework/Headers/Beta.h -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -disable-availability-checking -typecheck -verify %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -disable-availability-checking -typecheck -verify -verify-ignore-unrelated %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks | %FileCheck %s // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-implicit-string-processing-module-import -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks | %FileCheck -check-prefix=CHECK-SYMB %s diff --git a/test/Concurrency/global_actor_isolated_completion_handlers.swift b/test/Concurrency/global_actor_isolated_completion_handlers.swift index 613154e8a263a..f3e4dd4079712 100644 --- a/test/Concurrency/global_actor_isolated_completion_handlers.swift +++ b/test/Concurrency/global_actor_isolated_completion_handlers.swift @@ -5,7 +5,7 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck %t/src/main.swift \ // RUN: -import-objc-header %t/src/Test.h \ // RUN: -swift-version 6 \ -// RUN: -module-name main -I %t -verify +// RUN: -module-name main -I %t -verify -verify-ignore-unrelated // REQUIRES: objc_interop diff --git a/test/Concurrency/global_actor_serialized.swift b/test/Concurrency/global_actor_serialized.swift index 7e7b9fdd8589d..c6add51ab329e 100644 --- a/test/Concurrency/global_actor_serialized.swift +++ b/test/Concurrency/global_actor_serialized.swift @@ -1,7 +1,7 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module -swift-version 5 -emit-module-path %t/SerializedStruct.swiftmodule -module-name SerializedStruct %S/Inputs/SerializedStruct.swift -// RUN: %target-swift-frontend %s -emit-sil -o /dev/null -verify -disable-availability-checking -swift-version 6 -I %t +// RUN: %target-swift-frontend %s -emit-sil -o /dev/null -verify -verify-ignore-unrelated -disable-availability-checking -swift-version 6 -I %t // REQUIRES: concurrency diff --git a/test/Concurrency/global_variables.swift b/test/Concurrency/global_variables.swift index 88990d1b792a3..89b1153067727 100644 --- a/test/Concurrency/global_variables.swift +++ b/test/Concurrency/global_variables.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module -emit-module-path %t/GlobalVariables.swiftmodule -module-name GlobalVariables -parse-as-library -strict-concurrency=minimal -swift-version 5 %S/Inputs/GlobalVariables.swift -// RUN: %target-swift-frontend -disable-availability-checking -parse-as-library -swift-version 6 -I %t -emit-sil -o /dev/null -verify %s +// RUN: %target-swift-frontend -disable-availability-checking -parse-as-library -swift-version 6 -I %t -emit-sil -o /dev/null -verify -verify-ignore-unrelated %s // REQUIRES: concurrency diff --git a/test/Concurrency/nonisolated_access.swift b/test/Concurrency/nonisolated_access.swift index 3f9731b648e97..6aecb6fcdf23c 100644 --- a/test/Concurrency/nonisolated_access.swift +++ b/test/Concurrency/nonisolated_access.swift @@ -3,13 +3,13 @@ /// Build the library A // RUN: %target-swift-frontend -emit-module %t/src/A.swift \ -// RUN: -target %target-swift-5.1-abi-triple -verify \ +// RUN: -target %target-swift-5.1-abi-triple -verify -verify-ignore-unrelated \ // RUN: -module-name A -swift-version 6 \ // RUN: -emit-module-path %t/A.swiftmodule // Build the client // RUN: %target-swift-frontend -emit-module %t/src/Client.swift \ -// RUN: -target %target-swift-5.1-abi-triple -verify \ +// RUN: -target %target-swift-5.1-abi-triple -verify -verify-ignore-unrelated \ // RUN: -module-name Client -I %t -swift-version 6 \ // RUN: -emit-module-path %t/Client.swiftmodule diff --git a/test/Concurrency/preconcurrency_implementationonly_override.swift b/test/Concurrency/preconcurrency_implementationonly_override.swift index 51dfb943b8804..414dbc3ad3684 100644 --- a/test/Concurrency/preconcurrency_implementationonly_override.swift +++ b/test/Concurrency/preconcurrency_implementationonly_override.swift @@ -2,9 +2,9 @@ // RUN: %target-swift-frontend -emit-module -emit-module-path %t/ImplementationOnlyDefs.swiftmodule -module-name ImplementationOnlyDefs %S/Inputs/ImplementationOnlyDefs.swift \ // RUN: -enable-library-evolution -swift-version 5 -// RUN: %target-swift-frontend -target %target-swift-5.1-abi-triple -I %t -enable-library-evolution -swift-version 5 -emit-sil -o /dev/null -verify %s -// RUN: %target-swift-frontend -target %target-swift-5.1-abi-triple -I %t -enable-library-evolution -swift-version 5 -emit-sil -o /dev/null -verify -strict-concurrency=targeted %s -// RUN: %target-swift-frontend -target %target-swift-5.1-abi-triple -I %t -enable-library-evolution -swift-version 5 -emit-sil -o /dev/null -verify -strict-concurrency=complete %s +// RUN: %target-swift-frontend -target %target-swift-5.1-abi-triple -I %t -enable-library-evolution -swift-version 5 -emit-sil -o /dev/null -verify -verify-ignore-unrelated %s +// RUN: %target-swift-frontend -target %target-swift-5.1-abi-triple -I %t -enable-library-evolution -swift-version 5 -emit-sil -o /dev/null -verify -verify-ignore-unrelated -strict-concurrency=targeted %s +// RUN: %target-swift-frontend -target %target-swift-5.1-abi-triple -I %t -enable-library-evolution -swift-version 5 -emit-sil -o /dev/null -verify -verify-ignore-unrelated -strict-concurrency=complete %s // REQUIRES: concurrency diff --git a/test/Concurrency/predates_concurrency_import.swift b/test/Concurrency/predates_concurrency_import.swift index c408ca9399653..26b9e520be16b 100644 --- a/test/Concurrency/predates_concurrency_import.swift +++ b/test/Concurrency/predates_concurrency_import.swift @@ -3,9 +3,9 @@ // RUN: %target-swift-frontend -emit-module -emit-module-path %t/NonStrictModule.swiftmodule -module-name NonStrictModule %S/Inputs/NonStrictModule.swift // RUN: %target-swift-frontend -emit-module -emit-module-path %t/OtherActors.swiftmodule -module-name OtherActors %S/Inputs/OtherActors.swift -target %target-swift-5.1-abi-triple -// RUN: %target-swift-frontend -I %t %s -emit-sil -o /dev/null -verify -parse-as-library -enable-upcoming-feature GlobalConcurrency -Wwarning PreconcurrencyImport -// RUN: %target-swift-frontend -I %t %s -emit-sil -o /dev/null -verify -strict-concurrency=targeted -parse-as-library -enable-upcoming-feature GlobalConcurrency -Wwarning PreconcurrencyImport -// RUN: %target-swift-frontend -I %t %s -emit-sil -o /dev/null -verify -strict-concurrency=complete -parse-as-library -enable-upcoming-feature GlobalConcurrency -Wwarning PreconcurrencyImport +// RUN: %target-swift-frontend -I %t %s -emit-sil -o /dev/null -verify -verify-ignore-unrelated -parse-as-library -enable-upcoming-feature GlobalConcurrency -Wwarning PreconcurrencyImport +// RUN: %target-swift-frontend -I %t %s -emit-sil -o /dev/null -verify -verify-ignore-unrelated -strict-concurrency=targeted -parse-as-library -enable-upcoming-feature GlobalConcurrency -Wwarning PreconcurrencyImport +// RUN: %target-swift-frontend -I %t %s -emit-sil -o /dev/null -verify -verify-ignore-unrelated -strict-concurrency=complete -parse-as-library -enable-upcoming-feature GlobalConcurrency -Wwarning PreconcurrencyImport // REQUIRES: concurrency // REQUIRES: swift_feature_GlobalConcurrency diff --git a/test/Concurrency/predates_concurrency_import_deinit.swift b/test/Concurrency/predates_concurrency_import_deinit.swift index 782956e81dc33..5f243bcf73db0 100644 --- a/test/Concurrency/predates_concurrency_import_deinit.swift +++ b/test/Concurrency/predates_concurrency_import_deinit.swift @@ -2,7 +2,7 @@ // RUN: %target-swift-frontend -emit-module -emit-module-path %t/StrictModule.swiftmodule -module-name StrictModule -swift-version 6 %S/Inputs/StrictModule.swift // RUN: %target-swift-frontend -emit-module -emit-module-path %t/NonStrictModule.swiftmodule -module-name NonStrictModule %S/Inputs/NonStrictModule.swift -// RUN: %target-swift-frontend -I %t %s -emit-sil -o /dev/null -verify -strict-concurrency=complete +// RUN: %target-swift-frontend -I %t %s -emit-sil -o /dev/null -verify -verify-ignore-unrelated -strict-concurrency=complete // REQUIRES: concurrency // REQUIRES: asserts diff --git a/test/Concurrency/predates_concurrency_import_swift6.swift b/test/Concurrency/predates_concurrency_import_swift6.swift index 5df3b31fb02a0..90447bdaeace3 100644 --- a/test/Concurrency/predates_concurrency_import_swift6.swift +++ b/test/Concurrency/predates_concurrency_import_swift6.swift @@ -2,7 +2,7 @@ // RUN: %target-swift-frontend -emit-module -emit-module-path %t/StrictModule.swiftmodule -module-name StrictModule -swift-version 6 %S/Inputs/StrictModule.swift // RUN: %target-swift-frontend -emit-module -emit-module-path %t/NonStrictModule.swiftmodule -module-name NonStrictModule %S/Inputs/NonStrictModule.swift -// RUN: %target-swift-frontend -swift-version 6 -I %t %s -emit-sil -o /dev/null -verify -parse-as-library +// RUN: %target-swift-frontend -swift-version 6 -I %t %s -emit-sil -o /dev/null -verify -verify-ignore-unrelated -parse-as-library @preconcurrency import NonStrictModule @preconcurrency import StrictModule diff --git a/test/Concurrency/redundant_sendable_conformance.swift b/test/Concurrency/redundant_sendable_conformance.swift index 956636e695ec4..f5d2fe2ca53e3 100644 --- a/test/Concurrency/redundant_sendable_conformance.swift +++ b/test/Concurrency/redundant_sendable_conformance.swift @@ -1,7 +1,7 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module -emit-module-path %t/SendableConformances.swiftmodule -module-name SendableConformances %S/Inputs/SendableConformances.swift -// RUN: %target-swift-frontend -typecheck %s -verify -swift-version 6 -I %t +// RUN: %target-swift-frontend -typecheck %s -verify -verify-ignore-unrelated -swift-version 6 -I %t // REQUIRES: concurrency diff --git a/test/Concurrency/sendable_checking.swift b/test/Concurrency/sendable_checking.swift index 8cc24ba4d59fe..f9ccdc4616887 100644 --- a/test/Concurrency/sendable_checking.swift +++ b/test/Concurrency/sendable_checking.swift @@ -1,6 +1,6 @@ -// RUN: %target-swift-frontend -target %target-swift-5.0-abi-triple -verify -verify-additional-prefix targeted-and-ni- -strict-concurrency=targeted -verify-additional-prefix targeted- -emit-sil -o /dev/null %s -// RUN: %target-swift-frontend -target %target-swift-5.0-abi-triple -verify -strict-concurrency=complete -verify-additional-prefix tns-ni- -verify-additional-prefix tns- -emit-sil -o /dev/null %s -swift-version 5 -verify-additional-prefix targeted-and-ni- -// RUN: %target-swift-frontend -target %target-swift-5.0-abi-triple -verify -strict-concurrency=complete -verify-additional-prefix tns-ni-ns- -verify-additional-prefix tns- -emit-sil -o /dev/null %s -enable-upcoming-feature NonisolatedNonsendingByDefault -swift-version 5 -DNONISOLATEDNONSENDING +// RUN: %target-swift-frontend -target %target-swift-5.0-abi-triple -verify -verify-ignore-unrelated -verify-additional-prefix targeted-and-ni- -strict-concurrency=targeted -verify-additional-prefix targeted- -emit-sil -o /dev/null %s +// RUN: %target-swift-frontend -target %target-swift-5.0-abi-triple -verify -verify-ignore-unrelated -strict-concurrency=complete -verify-additional-prefix tns-ni- -verify-additional-prefix tns- -emit-sil -o /dev/null %s -swift-version 5 -verify-additional-prefix targeted-and-ni- +// RUN: %target-swift-frontend -target %target-swift-5.0-abi-triple -verify -verify-ignore-unrelated -strict-concurrency=complete -verify-additional-prefix tns-ni-ns- -verify-additional-prefix tns- -emit-sil -o /dev/null %s -enable-upcoming-feature NonisolatedNonsendingByDefault -swift-version 5 -DNONISOLATEDNONSENDING // REQUIRES: concurrency // REQUIRES: asserts diff --git a/test/Concurrency/sendable_checking_errors.swift b/test/Concurrency/sendable_checking_errors.swift index 9e7de8aa5546c..3bcd08fbf190c 100644 --- a/test/Concurrency/sendable_checking_errors.swift +++ b/test/Concurrency/sendable_checking_errors.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck -verify -strict-concurrency=complete %s +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -strict-concurrency=complete %s // Don't test TransferNonSendable because this test will not make // it past Sema to the SIL pass. diff --git a/test/Concurrency/sendable_keypaths.swift b/test/Concurrency/sendable_keypaths.swift index e6700940c7f1e..6db444cbbe0ed 100644 --- a/test/Concurrency/sendable_keypaths.swift +++ b/test/Concurrency/sendable_keypaths.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-upcoming-feature InferSendableFromCaptures -strict-concurrency=complete -enable-upcoming-feature GlobalActorIsolatedTypesUsability +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-upcoming-feature InferSendableFromCaptures -strict-concurrency=complete -enable-upcoming-feature GlobalActorIsolatedTypesUsability // REQUIRES: concurrency // REQUIRES: swift_feature_GlobalActorIsolatedTypesUsability diff --git a/test/Concurrency/sendable_objc_attr_in_type_context_swift5.swift b/test/Concurrency/sendable_objc_attr_in_type_context_swift5.swift index d4b1d55ba7305..19ff5312c4737 100644 --- a/test/Concurrency/sendable_objc_attr_in_type_context_swift5.swift +++ b/test/Concurrency/sendable_objc_attr_in_type_context_swift5.swift @@ -6,7 +6,7 @@ // RUN: -import-objc-header %t/src/Test.h \ // RUN: -swift-version 5 \ // RUN: -enable-experimental-feature SendableCompletionHandlers \ -// RUN: -module-name main -I %t -verify +// RUN: -module-name main -I %t -verify -verify-ignore-unrelated // REQUIRES: objc_interop // REQUIRES: swift_feature_SendableCompletionHandlers diff --git a/test/Concurrency/sendable_objc_attr_in_type_context_swift5_strict.swift b/test/Concurrency/sendable_objc_attr_in_type_context_swift5_strict.swift index 3764ab0976962..832e7a6ab2532 100644 --- a/test/Concurrency/sendable_objc_attr_in_type_context_swift5_strict.swift +++ b/test/Concurrency/sendable_objc_attr_in_type_context_swift5_strict.swift @@ -7,7 +7,7 @@ // RUN: -swift-version 5 \ // RUN: -strict-concurrency=complete \ // RUN: -enable-experimental-feature SendableCompletionHandlers \ -// RUN: -module-name main -I %t -verify +// RUN: -module-name main -I %t -verify -verify-ignore-unrelated // REQUIRES: objc_interop // REQUIRES: swift_feature_SendableCompletionHandlers diff --git a/test/Concurrency/sendable_objc_attr_in_type_context_swift6.swift b/test/Concurrency/sendable_objc_attr_in_type_context_swift6.swift index 4d823e0873b57..6a9afa3734e68 100644 --- a/test/Concurrency/sendable_objc_attr_in_type_context_swift6.swift +++ b/test/Concurrency/sendable_objc_attr_in_type_context_swift6.swift @@ -6,7 +6,7 @@ // RUN: -import-objc-header %t/src/Test.h \ // RUN: -swift-version 6 \ // RUN: -enable-experimental-feature SendableCompletionHandlers \ -// RUN: -module-name main -I %t -verify +// RUN: -module-name main -I %t -verify -verify-ignore-unrelated // REQUIRES: objc_interop // REQUIRES: swift_feature_SendableCompletionHandlers diff --git a/test/Concurrency/sendable_preconcurrency.swift b/test/Concurrency/sendable_preconcurrency.swift index 0c912362305fd..9bf3ec85a2e50 100644 --- a/test/Concurrency/sendable_preconcurrency.swift +++ b/test/Concurrency/sendable_preconcurrency.swift @@ -3,8 +3,8 @@ // RUN: %target-swift-frontend -emit-module -emit-module-path %t/StrictModule.swiftmodule -module-name StrictModule -swift-version 6 %S/Inputs/StrictModule.swift // RUN: %target-swift-frontend -emit-module -emit-module-path %t/NonStrictModule.swiftmodule -module-name NonStrictModule %S/Inputs/NonStrictModule.swift -// RUN: %target-swift-frontend -strict-concurrency=targeted -disable-availability-checking -I %t %s -o /dev/null -verify -emit-sil -// RUN: %target-swift-frontend -disable-availability-checking -I %t %s -o /dev/null -verify -emit-sil -strict-concurrency=complete -verify-additional-prefix tns- +// RUN: %target-swift-frontend -strict-concurrency=targeted -disable-availability-checking -I %t %s -o /dev/null -verify -verify-ignore-unrelated -emit-sil +// RUN: %target-swift-frontend -disable-availability-checking -I %t %s -o /dev/null -verify -verify-ignore-unrelated -emit-sil -strict-concurrency=complete -verify-additional-prefix tns- // REQUIRES: concurrency diff --git a/test/Concurrency/sendable_without_preconcurrency_2.swift b/test/Concurrency/sendable_without_preconcurrency_2.swift index 70a38f6f2a910..17ccfef40d175 100644 --- a/test/Concurrency/sendable_without_preconcurrency_2.swift +++ b/test/Concurrency/sendable_without_preconcurrency_2.swift @@ -3,10 +3,10 @@ // RUN: %target-swift-frontend -emit-module -emit-module-path %t/StrictModule.swiftmodule -module-name StrictModule -swift-version 6 %S/Inputs/StrictModule.swift // RUN: %target-swift-frontend -emit-module -emit-module-path %t/NonStrictModule.swiftmodule -module-name NonStrictModule %S/Inputs/NonStrictModule.swift -// RUN: %target-swift-frontend -strict-concurrency=minimal -disable-availability-checking -I %t %s -verify -emit-sil -o /dev/null -// RUN: %target-swift-frontend -strict-concurrency=targeted -verify-additional-prefix targeted-complete- -disable-availability-checking -I %t %s -verify -emit-sil -o /dev/null +// RUN: %target-swift-frontend -strict-concurrency=minimal -disable-availability-checking -I %t %s -verify -verify-ignore-unrelated -emit-sil -o /dev/null +// RUN: %target-swift-frontend -strict-concurrency=targeted -verify-additional-prefix targeted-complete- -disable-availability-checking -I %t %s -verify -verify-ignore-unrelated -emit-sil -o /dev/null -// RUN: %target-swift-frontend -strict-concurrency=complete -verify-additional-prefix targeted-complete- -verify-additional-prefix complete- -disable-availability-checking -I %t %s -verify -emit-sil -o /dev/null -verify-additional-prefix tns- +// RUN: %target-swift-frontend -strict-concurrency=complete -verify-additional-prefix targeted-complete- -verify-additional-prefix complete- -disable-availability-checking -I %t %s -verify -verify-ignore-unrelated -emit-sil -o /dev/null -verify-additional-prefix tns- // REQUIRES: concurrency diff --git a/test/Concurrency/taskgroup_cancelAll_from_child.swift b/test/Concurrency/taskgroup_cancelAll_from_child.swift index 073af9f64e07e..b05d6c8d52345 100644 --- a/test/Concurrency/taskgroup_cancelAll_from_child.swift +++ b/test/Concurrency/taskgroup_cancelAll_from_child.swift @@ -1,6 +1,6 @@ -// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify -// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify -strict-concurrency=targeted -// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify -strict-concurrency=complete +// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify -verify-ignore-unrelated +// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify -verify-ignore-unrelated -strict-concurrency=targeted +// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify -verify-ignore-unrelated -strict-concurrency=complete // REQUIRES: concurrency diff --git a/test/Concurrency/unavailable_from_async.swift b/test/Concurrency/unavailable_from_async.swift index 7b27ede30342c..fd27763bbe76b 100644 --- a/test/Concurrency/unavailable_from_async.swift +++ b/test/Concurrency/unavailable_from_async.swift @@ -1,8 +1,8 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module -emit-module-path %t/UnavailableFunction.swiftmodule -module-name UnavailableFunction -strict-concurrency=complete %S/Inputs/UnavailableFunction.swift -// RUN: %target-swift-frontend -verify -I %t %s -emit-sil -o /dev/null -// RUN: %target-swift-frontend -verify -I %t %s -emit-sil -o /dev/null -strict-concurrency=targeted -// RUN: %target-swift-frontend -verify -I %t %s -emit-sil -o /dev/null -strict-concurrency=complete +// RUN: %target-swift-frontend -verify -verify-ignore-unrelated -I %t %s -emit-sil -o /dev/null +// RUN: %target-swift-frontend -verify -verify-ignore-unrelated -I %t %s -emit-sil -o /dev/null -strict-concurrency=targeted +// RUN: %target-swift-frontend -verify -verify-ignore-unrelated -I %t %s -emit-sil -o /dev/null -strict-concurrency=complete // REQUIRES: concurrency // REQUIRES: asserts diff --git a/test/Constraints/ambiguous_specialized_name_diagnostics.swift b/test/Constraints/ambiguous_specialized_name_diagnostics.swift index 90d363b8f1e88..3ecf7d8d6cfe9 100644 --- a/test/Constraints/ambiguous_specialized_name_diagnostics.swift +++ b/test/Constraints/ambiguous_specialized_name_diagnostics.swift @@ -11,7 +11,7 @@ // RUN: -emit-module-path %t/B.swiftmodule // RUN: %target-swift-frontend -typecheck %t/src/main.swift \ -// RUN: -module-name main -I %t -verify +// RUN: -module-name main -I %t -verify -verify-ignore-unrelated // https://github.com/apple/swift/issues/67799 diff --git a/test/Constraints/array_literal.swift b/test/Constraints/array_literal.swift index 9927002e81e7d..39017b52c6475 100644 --- a/test/Constraints/array_literal.swift +++ b/test/Constraints/array_literal.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -target %target-swift-5.1-abi-triple +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -target %target-swift-5.1-abi-triple struct IntList : ExpressibleByArrayLiteral { typealias Element = Int diff --git a/test/Constraints/bridging.swift b/test/Constraints/bridging.swift index ee36e9e4fee85..17d55377d372f 100644 --- a/test/Constraints/bridging.swift +++ b/test/Constraints/bridging.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated // REQUIRES: objc_interop diff --git a/test/Constraints/casts_objc.swift b/test/Constraints/casts_objc.swift index e7ffc5820a8a3..5ecc4b946ca26 100644 --- a/test/Constraints/casts_objc.swift +++ b/test/Constraints/casts_objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated %s // REQUIRES: objc_interop import Foundation diff --git a/test/Constraints/closures.swift b/test/Constraints/closures.swift index 845c25920bcde..941317f3ac956 100644 --- a/test/Constraints/closures.swift +++ b/test/Constraints/closures.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated func myMap(_ array: [T1], _ fn: (T1) -> T2) -> [T2] {} diff --git a/test/Constraints/diagnostics.swift b/test/Constraints/diagnostics.swift index 815c8b8d2a163..2f20663e5a060 100644 --- a/test/Constraints/diagnostics.swift +++ b/test/Constraints/diagnostics.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated protocol P { associatedtype SomeType diff --git a/test/Constraints/dynamic_lookup.swift b/test/Constraints/dynamic_lookup.swift index b221248786b27..bc2d25a3e09ad 100644 --- a/test/Constraints/dynamic_lookup.swift +++ b/test/Constraints/dynamic_lookup.swift @@ -1,7 +1,7 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module %S/Inputs/PrivateObjC.swift -o %t -// RUN: %target-typecheck-verify-swift -swift-version 4 -I %t -verify-ignore-unknown -// RUN: %target-typecheck-verify-swift -swift-version 5 -I %t -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 4 -I %t -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 5 -I %t -verify-ignore-unknown // REQUIRES: objc_interop diff --git a/test/Constraints/generic_protocol_witness.swift b/test/Constraints/generic_protocol_witness.swift index 51657d5281b9b..f155820e33959 100644 --- a/test/Constraints/generic_protocol_witness.swift +++ b/test/Constraints/generic_protocol_witness.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated infix operator • diff --git a/test/Constraints/generics.swift b/test/Constraints/generics.swift index daf7bdfcd1392..e9466290c2c09 100644 --- a/test/Constraints/generics.swift +++ b/test/Constraints/generics.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-objc-interop +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-objc-interop infix operator +++ diff --git a/test/Constraints/invalid_stdlib_2.swift b/test/Constraints/invalid_stdlib_2.swift index 08d1f59f86502..cbd1b2631c236 100644 --- a/test/Constraints/invalid_stdlib_2.swift +++ b/test/Constraints/invalid_stdlib_2.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated class Dictionary : ExpressibleByDictionaryLiteral { // expected-error {{type 'Dictionary' does not conform to protocol 'ExpressibleByDictionaryLiteral'}} expected-note {{add stubs for conformance}} typealias Key = K diff --git a/test/Constraints/issue-55410.swift b/test/Constraints/issue-55410.swift index cd22ff5d2dbae..b3c38768fb014 100644 --- a/test/Constraints/issue-55410.swift +++ b/test/Constraints/issue-55410.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated // https://github.com/apple/swift/issues/55410 diff --git a/test/Constraints/members.swift b/test/Constraints/members.swift index 78652e798747c..ab1acc47d6684 100644 --- a/test/Constraints/members.swift +++ b/test/Constraints/members.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -swift-version 5 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 5 //// // Members of structs diff --git a/test/Constraints/operator.swift b/test/Constraints/operator.swift index 66f7725788f1d..5756db1978ee1 100644 --- a/test/Constraints/operator.swift +++ b/test/Constraints/operator.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated // https://github.com/apple/swift/issues/43735 // Test constraint simplification of chains of binary operators. diff --git a/test/Constraints/rdar42678836.swift b/test/Constraints/rdar42678836.swift index ff9ebe2d9b1cc..b6b92443f74fe 100644 --- a/test/Constraints/rdar42678836.swift +++ b/test/Constraints/rdar42678836.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated func foo(chr: Character) -> String { return String(repeating: String(chr)) // expected-error {{missing argument for parameter 'count' in call}} {{39-39=, count: <#Int#>}} diff --git a/test/Constraints/rdar85263844_swift6.swift b/test/Constraints/rdar85263844_swift6.swift index 709aa109c8212..4b502e9a3adce 100644 --- a/test/Constraints/rdar85263844_swift6.swift +++ b/test/Constraints/rdar85263844_swift6.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -swift-version 6 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 6 // rdar://85263844 - initializer 'init(_:)' requires the types be equivalent func rdar85263844(arr: [(q: String, a: Int)]) -> AnySequence<(question: String, answer: Int)> { diff --git a/test/Constraints/result_builder_diags.swift b/test/Constraints/result_builder_diags.swift index febaf5af4df78..709b2dc6403a9 100644 --- a/test/Constraints/result_builder_diags.swift +++ b/test/Constraints/result_builder_diags.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -target %target-swift-5.1-abi-triple +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -target %target-swift-5.1-abi-triple enum Either { case first(T) diff --git a/test/Constraints/swift_to_c_pointer_conversions.swift.gyb b/test/Constraints/swift_to_c_pointer_conversions.swift.gyb index 3e60aff908834..31fd487a46bd9 100644 --- a/test/Constraints/swift_to_c_pointer_conversions.swift.gyb +++ b/test/Constraints/swift_to_c_pointer_conversions.swift.gyb @@ -2,7 +2,7 @@ // RUN: %gyb %s -o %t/swift_to_c_pointer_conversions.swift -// RUN: %line-directive %t/swift_to_c_pointer_conversions.swift -- %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -import-objc-header %S/Inputs/c_pointer_conversions.h %t/swift_to_c_pointer_conversions.swift -typecheck -verify +// RUN: %line-directive %t/swift_to_c_pointer_conversions.swift -- %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -import-objc-header %S/Inputs/c_pointer_conversions.h %t/swift_to_c_pointer_conversions.swift -typecheck -verify -verify-ignore-unrelated // REQUIRES: objc_interop diff --git a/test/Constraints/valid_pointer_conversions.swift b/test/Constraints/valid_pointer_conversions.swift index 1254f38b7a297..f759c41f326e0 100644 --- a/test/Constraints/valid_pointer_conversions.swift +++ b/test/Constraints/valid_pointer_conversions.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated func foo(_ a: [[UInt8]], _ p: [UnsafeRawPointer]) { foo(a, a) // expect-warning {{all paths through this function will call itself}} diff --git a/test/CrossImport/access-level-imports-errors.swift b/test/CrossImport/access-level-imports-errors.swift index 93363fd88696e..5a3f4acb7695c 100644 --- a/test/CrossImport/access-level-imports-errors.swift +++ b/test/CrossImport/access-level-imports-errors.swift @@ -8,7 +8,7 @@ // RUN: %target-swift-emit-module-interface(%t/lib/swift/SomeUnrelatedModule.swiftinterface) %t/SomeUnrelatedModule.swift -module-name SomeUnrelatedModule //--- BothPublic.swift -// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %t/BothPublic.swift -enable-cross-import-overlays -I %t/lib/swift -module-name ClientLibrary -verify +// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %t/BothPublic.swift -enable-cross-import-overlays -I %t/lib/swift -module-name ClientLibrary -verify -verify-ignore-unrelated public import DeclaringLibrary public import BystandingLibrary @@ -18,7 +18,7 @@ public func fn(_: OverlayLibraryTy) {} //--- BothHidden.swift -// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %t/BothHidden.swift -enable-cross-import-overlays -I %t/lib/swift -module-name ClientLibrary -verify +// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %t/BothHidden.swift -enable-cross-import-overlays -I %t/lib/swift -module-name ClientLibrary -verify -verify-ignore-unrelated internal import DeclaringLibrary internal import BystandingLibrary @@ -29,7 +29,7 @@ public func fn(_: OverlayLibraryTy) {} //--- FirstHidden.swift -// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %t/FirstHidden.swift -enable-cross-import-overlays -I %t/lib/swift -module-name ClientLibrary -verify +// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %t/FirstHidden.swift -enable-cross-import-overlays -I %t/lib/swift -module-name ClientLibrary -verify -verify-ignore-unrelated internal import DeclaringLibrary public import BystandingLibrary @@ -40,7 +40,7 @@ public func fn(_: OverlayLibraryTy) {} //--- SecondHidden.swift -// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %t/SecondHidden.swift -enable-cross-import-overlays -I %t/lib/swift -module-name ClientLibrary -verify +// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %t/SecondHidden.swift -enable-cross-import-overlays -I %t/lib/swift -module-name ClientLibrary -verify -verify-ignore-unrelated public import DeclaringLibrary internal import BystandingLibrary @@ -51,7 +51,7 @@ public func fn(_: OverlayLibraryTy) {} //--- PrivateVsInternal.swift -// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %t/PrivateVsInternal.swift -enable-cross-import-overlays -I %t/lib/swift -module-name ClientLibrary -verify +// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %t/PrivateVsInternal.swift -enable-cross-import-overlays -I %t/lib/swift -module-name ClientLibrary -verify -verify-ignore-unrelated private import DeclaringLibrary internal import BystandingLibrary @@ -62,7 +62,7 @@ internal func fn(_: OverlayLibraryTy) {} //--- InternalVsPrivate.swift -// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %t/InternalVsPrivate.swift -enable-cross-import-overlays -I %t/lib/swift -module-name ClientLibrary -verify +// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %t/InternalVsPrivate.swift -enable-cross-import-overlays -I %t/lib/swift -module-name ClientLibrary -verify -verify-ignore-unrelated internal import DeclaringLibrary private import BystandingLibrary @@ -73,7 +73,7 @@ internal func fn(_: OverlayLibraryTy) {} //--- UnusedOverlay.swift -// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %t/UnusedOverlay.swift -enable-cross-import-overlays -I %t/lib/swift -module-name ClientLibrary -verify +// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %t/UnusedOverlay.swift -enable-cross-import-overlays -I %t/lib/swift -module-name ClientLibrary -verify -verify-ignore-unrelated public import DeclaringLibrary // expected-warning {{public import of 'DeclaringLibrary' was not used in public declarations or inlinable code}} public import BystandingLibrary // expected-warning {{public import of 'BystandingLibrary' was not used in public declarations or inlinable code}} diff --git a/test/CrossImport/loading.swift b/test/CrossImport/loading.swift index 2cd71c8090b6c..c3aa867f47113 100644 --- a/test/CrossImport/loading.swift +++ b/test/CrossImport/loading.swift @@ -10,9 +10,9 @@ // the test is incorrectly constructed. // -// RUN: %target-typecheck-verify-swift -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DDIRECTLY_IMPORT_OVERLAYS -// RUN: not %target-typecheck-verify-swift -enable-cross-import-overlays -DTHIN_LIBRARY 2>/dev/null -// RUN: not %target-typecheck-verify-swift -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DTHIN_LIBRARY -DNEVER_IMPORTED 2>/dev/null +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DDIRECTLY_IMPORT_OVERLAYS +// RUN: not %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -DTHIN_LIBRARY 2>/dev/null +// RUN: not %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DTHIN_LIBRARY -DNEVER_IMPORTED 2>/dev/null // // Actual test cases @@ -20,26 +20,26 @@ // Check that we find the overlay in all layouts of Swift and Clang modules, // and that we generate correct dependencies. -// RUN: %target-typecheck-verify-swift -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DTHIN_LIBRARY -emit-dependencies-path - | %FileCheck -check-prefixes=DEPS,DEPS-MOST -DMODULE=ThinLibrary -DTARGET=%module-target-triple %s -// RUN: %target-typecheck-verify-swift -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DFAT_LIBRARY -emit-dependencies-path - | %FileCheck -check-prefixes=DEPS,DEPS-MOST -DMODULE=FatLibrary -DTARGET=%module-target-triple %s -// RUN: %target-typecheck-verify-swift -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DCLANG_LIBRARY -emit-dependencies-path - | %FileCheck -check-prefixes=DEPS,DEPS-MOST -DMODULE=ClangLibrary -DTARGET=%module-target-triple %s -// RUN: %target-typecheck-verify-swift -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DCLANG_LIBRARY_SUBMODULE -emit-dependencies-path - | %FileCheck -check-prefixes=DEPS,DEPS-MOST -DMODULE=ClangLibrary -DTARGET=%module-target-triple %s -// RUN: %target-typecheck-verify-swift -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DSWIFT_FRAMEWORK -emit-dependencies-path - | %FileCheck -check-prefixes=DEPS,DEPS-MOST -DMODULE=SwiftFramework -DTARGET=%module-target-triple %s -// RUN: %target-typecheck-verify-swift -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DCLANG_FRAMEWORK -emit-dependencies-path - | %FileCheck -check-prefixes=DEPS,DEPS-MOST -DMODULE=ClangFramework -DTARGET=%module-target-triple %s -// RUN: %target-typecheck-verify-swift -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DOVERLAID_CLANG_FRAMEWORK -emit-dependencies-path - | %FileCheck -check-prefix=DEPS -DMODULE=OverlaidClangFramework -DTARGET=%module-target-triple %s +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DTHIN_LIBRARY -emit-dependencies-path - | %FileCheck -check-prefixes=DEPS,DEPS-MOST -DMODULE=ThinLibrary -DTARGET=%module-target-triple %s +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DFAT_LIBRARY -emit-dependencies-path - | %FileCheck -check-prefixes=DEPS,DEPS-MOST -DMODULE=FatLibrary -DTARGET=%module-target-triple %s +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DCLANG_LIBRARY -emit-dependencies-path - | %FileCheck -check-prefixes=DEPS,DEPS-MOST -DMODULE=ClangLibrary -DTARGET=%module-target-triple %s +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DCLANG_LIBRARY_SUBMODULE -emit-dependencies-path - | %FileCheck -check-prefixes=DEPS,DEPS-MOST -DMODULE=ClangLibrary -DTARGET=%module-target-triple %s +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DSWIFT_FRAMEWORK -emit-dependencies-path - | %FileCheck -check-prefixes=DEPS,DEPS-MOST -DMODULE=SwiftFramework -DTARGET=%module-target-triple %s +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DCLANG_FRAMEWORK -emit-dependencies-path - | %FileCheck -check-prefixes=DEPS,DEPS-MOST -DMODULE=ClangFramework -DTARGET=%module-target-triple %s +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DOVERLAID_CLANG_FRAMEWORK -emit-dependencies-path - | %FileCheck -check-prefix=DEPS -DMODULE=OverlaidClangFramework -DTARGET=%module-target-triple %s // Make sure order doesn't matter. -// RUN: %target-typecheck-verify-swift -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DALWAYS_IMPORTED_LAST -DTHIN_LIBRARY +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DALWAYS_IMPORTED_LAST -DTHIN_LIBRARY // Negative cases (one side of overlay is missing). -// RUN: not %target-typecheck-verify-swift -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks 2>/dev/null -// RUN: not %target-typecheck-verify-swift -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DDONT_ALWAYS_IMPORT -DTHIN_LIBRARY 2>/dev/null -// RUN: not %target-typecheck-verify-swift -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DDONT_ALWAYS_IMPORT -DFAT_LIBRARY 2>/dev/null -// RUN: not %target-typecheck-verify-swift -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DDONT_ALWAYS_IMPORT -DCLANG_LIBRARY 2>/dev/null -// RUN: not %target-typecheck-verify-swift -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DDONT_ALWAYS_IMPORT -DCLANG_LIBRARY_SUBMODULE 2>/dev/null -// RUN: not %target-typecheck-verify-swift -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DDONT_ALWAYS_IMPORT -DSWIFT_FRAMEWORK 2>/dev/null -// RUN: not %target-typecheck-verify-swift -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DDONT_ALWAYS_IMPORT -DCLANG_FRAMEWORK 2>/dev/null -// RUN: not %target-typecheck-verify-swift -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DDONT_ALWAYS_IMPORT -DOVERLAID_CLANG_FRAMEWORK 2>/dev/null +// RUN: not %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks 2>/dev/null +// RUN: not %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DDONT_ALWAYS_IMPORT -DTHIN_LIBRARY 2>/dev/null +// RUN: not %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DDONT_ALWAYS_IMPORT -DFAT_LIBRARY 2>/dev/null +// RUN: not %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DDONT_ALWAYS_IMPORT -DCLANG_LIBRARY 2>/dev/null +// RUN: not %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DDONT_ALWAYS_IMPORT -DCLANG_LIBRARY_SUBMODULE 2>/dev/null +// RUN: not %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DDONT_ALWAYS_IMPORT -DSWIFT_FRAMEWORK 2>/dev/null +// RUN: not %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DDONT_ALWAYS_IMPORT -DCLANG_FRAMEWORK 2>/dev/null +// RUN: not %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DDONT_ALWAYS_IMPORT -DOVERLAID_CLANG_FRAMEWORK 2>/dev/null // // Actual test code: diff --git a/test/CrossImport/transitive.swift b/test/CrossImport/transitive.swift index b8c17509c7675..ff5c0c3b77020 100644 --- a/test/CrossImport/transitive.swift +++ b/test/CrossImport/transitive.swift @@ -3,8 +3,8 @@ // RUN: %empty-directory(%t) // RUN: cp -r %S/Inputs/lib-templates/* %t/ -// RUN: %target-typecheck-verify-swift -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DDIRECT_FIRST -// RUN: %target-typecheck-verify-swift -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DDIRECT_SECOND +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DDIRECT_FIRST +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-cross-import-overlays -I %t/include -I %t/lib/swift -F %t/Frameworks -DDIRECT_SECOND #if DIRECT_FIRST import ThinLibrary diff --git a/test/Distributed/Macros/distributed_macro_expansion_DistributedProtocol_errors.swift b/test/Distributed/Macros/distributed_macro_expansion_DistributedProtocol_errors.swift index 8759d4c906d67..fe1278ebba830 100644 --- a/test/Distributed/Macros/distributed_macro_expansion_DistributedProtocol_errors.swift +++ b/test/Distributed/Macros/distributed_macro_expansion_DistributedProtocol_errors.swift @@ -8,7 +8,7 @@ // RUN: %empty-directory(%t-scratch) // RUN: %target-swift-frontend-emit-module -emit-module-path %t/FakeDistributedActorSystems.swiftmodule -module-name FakeDistributedActorSystems -target %target-swift-6.0-abi-triple %S/../Inputs/FakeDistributedActorSystems.swift -// RUN: %target-swift-frontend -typecheck -verify -target %target-swift-6.0-abi-triple -plugin-path %swift-plugin-dir -parse-as-library -I %t %S/../Inputs/FakeDistributedActorSystems.swift -dump-macro-expansions %s 2>&1 +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -target %target-swift-6.0-abi-triple -plugin-path %swift-plugin-dir -parse-as-library -I %t %S/../Inputs/FakeDistributedActorSystems.swift -dump-macro-expansions %s 2>&1 import Distributed diff --git a/test/Distributed/actor_protocols.swift b/test/Distributed/actor_protocols.swift index 17717892517e4..197e9ec53c514 100644 --- a/test/Distributed/actor_protocols.swift +++ b/test/Distributed/actor_protocols.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend-emit-module -emit-module-path %t/FakeDistributedActorSystems.swiftmodule -module-name FakeDistributedActorSystems -target %target-swift-5.7-abi-triple %S/Inputs/FakeDistributedActorSystems.swift -// RUN: %target-swift-frontend -typecheck -verify -target %target-swift-5.7-abi-triple -I %t 2>&1 %s +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -target %target-swift-5.7-abi-triple -I %t 2>&1 %s // REQUIRES: concurrency // REQUIRES: distributed diff --git a/test/Distributed/distributed_actor_derived_conformances.swift b/test/Distributed/distributed_actor_derived_conformances.swift index 056e3f31baea8..59e7743e12f8b 100644 --- a/test/Distributed/distributed_actor_derived_conformances.swift +++ b/test/Distributed/distributed_actor_derived_conformances.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend-emit-module -emit-module-path %t/FakeDistributedActorSystems.swiftmodule -module-name FakeDistributedActorSystems -target %target-swift-5.7-abi-triple %S/Inputs/FakeDistributedActorSystems.swift -// RUN: %target-typecheck-verify-swift -target %target-swift-5.7-abi-triple -I %t +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -target %target-swift-5.7-abi-triple -I %t // REQUIRES: concurrency // REQUIRES: distributed diff --git a/test/Distributed/distributed_actor_system_missing.swift b/test/Distributed/distributed_actor_system_missing.swift index 9c5d989418be7..b5129ce8a5481 100644 --- a/test/Distributed/distributed_actor_system_missing.swift +++ b/test/Distributed/distributed_actor_system_missing.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck -verify -enable-experimental-distributed -target %target-swift-5.7-abi-triple -I %t 2>&1 %s +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -enable-experimental-distributed -target %target-swift-5.7-abi-triple -I %t 2>&1 %s // UNSUPPORTED: back_deploy_concurrency // REQUIRES: concurrency diff --git a/test/Distributed/distributed_actor_system_missing_adhoc_requirement_fixits.swift b/test/Distributed/distributed_actor_system_missing_adhoc_requirement_fixits.swift index 972ee4f025318..327e790013f55 100644 --- a/test/Distributed/distributed_actor_system_missing_adhoc_requirement_fixits.swift +++ b/test/Distributed/distributed_actor_system_missing_adhoc_requirement_fixits.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck -verify -target %target-swift-5.7-abi-triple -I %t 2>&1 %s +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -target %target-swift-5.7-abi-triple -I %t 2>&1 %s // UNSUPPORTED: back_deploy_concurrency // REQUIRES: concurrency diff --git a/test/Distributed/distributed_actor_system_missing_adhoc_requirement_impls.swift b/test/Distributed/distributed_actor_system_missing_adhoc_requirement_impls.swift index 16428f4d61c77..9bfdc254298c3 100644 --- a/test/Distributed/distributed_actor_system_missing_adhoc_requirement_impls.swift +++ b/test/Distributed/distributed_actor_system_missing_adhoc_requirement_impls.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck -verify -target %target-swift-5.7-abi-triple -I %t 2>&1 %s +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -target %target-swift-5.7-abi-triple -I %t 2>&1 %s // UNSUPPORTED: back_deploy_concurrency // REQUIRES: concurrency diff --git a/test/Distributed/distributed_actor_system_missing_system_type.swift b/test/Distributed/distributed_actor_system_missing_system_type.swift index ab06e61c78976..9984db3ea7a68 100644 --- a/test/Distributed/distributed_actor_system_missing_system_type.swift +++ b/test/Distributed/distributed_actor_system_missing_system_type.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck -verify -enable-experimental-distributed -target %target-swift-5.7-abi-triple -I %t 2>&1 %s +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -enable-experimental-distributed -target %target-swift-5.7-abi-triple -I %t 2>&1 %s // UNSUPPORTED: back_deploy_concurrency // REQUIRES: concurrency diff --git a/test/Distributed/distributed_actor_system_missing_type_no_crash.swift b/test/Distributed/distributed_actor_system_missing_type_no_crash.swift index d8c9e6518d8b6..b6f52d384c478 100644 --- a/test/Distributed/distributed_actor_system_missing_type_no_crash.swift +++ b/test/Distributed/distributed_actor_system_missing_type_no_crash.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck -verify -target %target-swift-5.7-abi-triple -I %t 2>&1 %s +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -target %target-swift-5.7-abi-triple -I %t 2>&1 %s // UNSUPPORTED: back_deploy_concurrency // REQUIRES: concurrency diff --git a/test/Distributed/distributed_incomplete_system_no_crash.swift b/test/Distributed/distributed_incomplete_system_no_crash.swift index 431e1474f74ec..01b6461094673 100644 --- a/test/Distributed/distributed_incomplete_system_no_crash.swift +++ b/test/Distributed/distributed_incomplete_system_no_crash.swift @@ -1,5 +1,5 @@ // RUN: %empty-directory(%t) -// RUN: %target-swift-frontend -typecheck -verify -target %target-swift-5.7-abi-triple 2>&1 %s +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -target %target-swift-5.7-abi-triple 2>&1 %s // REQUIRES: concurrency // REQUIRES: distributed diff --git a/test/Distributed/distributed_protocols_distributed_func_serialization_requirements.swift b/test/Distributed/distributed_protocols_distributed_func_serialization_requirements.swift index f169c98a307a7..c87c5b3b3aa69 100644 --- a/test/Distributed/distributed_protocols_distributed_func_serialization_requirements.swift +++ b/test/Distributed/distributed_protocols_distributed_func_serialization_requirements.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend-emit-module -emit-module-path %t/FakeDistributedActorSystems.swiftmodule -module-name FakeDistributedActorSystems -target %target-swift-5.7-abi-triple %S/Inputs/FakeDistributedActorSystems.swift -// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unknown -target %target-swift-5.7-abi-triple -I %t 2>&1 %s +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -verify-ignore-unknown -target %target-swift-5.7-abi-triple -I %t 2>&1 %s // REQUIRES: concurrency // REQUIRES: distributed diff --git a/test/Distributed/distributed_serializationRequirement_must_be_protocol.swift b/test/Distributed/distributed_serializationRequirement_must_be_protocol.swift index 054e0833ad850..24bad38d3c72f 100644 --- a/test/Distributed/distributed_serializationRequirement_must_be_protocol.swift +++ b/test/Distributed/distributed_serializationRequirement_must_be_protocol.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend-emit-module -emit-module-path %t/FakeDistributedActorSystems.swiftmodule -module-name FakeDistributedActorSystems -target %target-swift-5.7-abi-triple %S/Inputs/FakeDistributedActorSystems.swift -// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unknown -target %target-swift-5.7-abi-triple -I %t 2>&1 %s +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -verify-ignore-unknown -target %target-swift-5.7-abi-triple -I %t 2>&1 %s // REQUIRES: concurrency // REQUIRES: distributed diff --git a/test/Frontend/features/upcoming_feature.swift b/test/Frontend/features/upcoming_feature.swift index 58f10f47c4235..5883d20dc0f3b 100644 --- a/test/Frontend/features/upcoming_feature.swift +++ b/test/Frontend/features/upcoming_feature.swift @@ -1,34 +1,34 @@ // Make sure that hasFeature(ConciseMagicFile) evaluates true when provided // explicitly. -// RUN: %target-typecheck-verify-swift -enable-upcoming-feature ConciseMagicFile +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-upcoming-feature ConciseMagicFile // Make sure that hasFeature(ConciseMagicFile) evaluates true in Swift 6. -// RUN: %target-typecheck-verify-swift -swift-version 6 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 6 // Make sure that hasFeature(ConciseMagicFile) is off prior to Swift 6. -// RUN: %target-typecheck-verify-swift -verify-additional-prefix swift5- +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-additional-prefix swift5- // It's fine to provide a feature that we don't know about. -// RUN: %target-typecheck-verify-swift -enable-upcoming-feature ConciseMagicFile -enable-upcoming-feature UnknownFeature -// RUN: %target-typecheck-verify-swift -enable-upcoming-feature UnknownFeature -enable-upcoming-feature ConciseMagicFile +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-upcoming-feature ConciseMagicFile -enable-upcoming-feature UnknownFeature +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-upcoming-feature UnknownFeature -enable-upcoming-feature ConciseMagicFile // When -disable-upcoming-feature is specified, leave the feature disabled. -// RUN: %target-typecheck-verify-swift -disable-upcoming-feature ConciseMagicFile -verify-additional-prefix swift5- +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -disable-upcoming-feature ConciseMagicFile -verify-additional-prefix swift5- // When both -enable-upcoming-feature and -disable-upcoming-feature are // specified, the result depends on the order. -// RUN: %target-typecheck-verify-swift -enable-upcoming-feature ConciseMagicFile -disable-upcoming-feature ConciseMagicFile -verify-additional-prefix swift5- -// RUN: %target-typecheck-verify-swift -disable-upcoming-feature ConciseMagicFile -enable-upcoming-feature ConciseMagicFile +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-upcoming-feature ConciseMagicFile -disable-upcoming-feature ConciseMagicFile -verify-additional-prefix swift5- +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -disable-upcoming-feature ConciseMagicFile -enable-upcoming-feature ConciseMagicFile // For compatibility when a feature graduates, it's fine to refer to an // upcoming feature as an experimental feature. -// RUN: %target-typecheck-verify-swift -enable-experimental-feature ConciseMagicFile +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-experimental-feature ConciseMagicFile // A feature that has graduated can also be disabled as an experimental feature. -// RUN: %target-typecheck-verify-swift -disable-experimental-feature ConciseMagicFile -verify-additional-prefix swift5- -// RUN: %target-typecheck-verify-swift -enable-experimental-feature ConciseMagicFile -disable-experimental-feature ConciseMagicFile -verify-additional-prefix swift5- -// RUN: %target-typecheck-verify-swift -disable-experimental-feature ConciseMagicFile -enable-experimental-feature ConciseMagicFile -// RUN: %target-typecheck-verify-swift -enable-upcoming-feature ConciseMagicFile -disable-experimental-feature ConciseMagicFile -verify-additional-prefix swift5- +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -disable-experimental-feature ConciseMagicFile -verify-additional-prefix swift5- +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-experimental-feature ConciseMagicFile -disable-experimental-feature ConciseMagicFile -verify-additional-prefix swift5- +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -disable-experimental-feature ConciseMagicFile -enable-experimental-feature ConciseMagicFile +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-upcoming-feature ConciseMagicFile -disable-experimental-feature ConciseMagicFile -verify-additional-prefix swift5- // Warn about enabled features that are implied by the specified language version. // RUN: %target-swift-frontend -typecheck -enable-upcoming-feature ConciseMagicFile -swift-version 6 %s 2>&1 | %FileCheck %s diff --git a/test/Generics/conditional_conformances.swift b/test/Generics/conditional_conformances.swift index ab094f60ad2c1..d7145c166b8cc 100644 --- a/test/Generics/conditional_conformances.swift +++ b/test/Generics/conditional_conformances.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -debug-generic-signatures > %t.dump 2>&1 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -debug-generic-signatures > %t.dump 2>&1 // RUN: %FileCheck %s < %t.dump protocol P1 {} diff --git a/test/Generics/deduction.swift b/test/Generics/deduction.swift index 1612d1ce6e139..7b35f6cbe3ab5 100644 --- a/test/Generics/deduction.swift +++ b/test/Generics/deduction.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated //===----------------------------------------------------------------------===// // Deduction of generic arguments diff --git a/test/Generics/inheritance.swift b/test/Generics/inheritance.swift index 40b6b76458885..039a91e63abd5 100644 --- a/test/Generics/inheritance.swift +++ b/test/Generics/inheritance.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated class A { func foo() { } diff --git a/test/Generics/inverse_copyable_requirement.swift b/test/Generics/inverse_copyable_requirement.swift index a4579f5181d4d..35806a7a60eec 100644 --- a/test/Generics/inverse_copyable_requirement.swift +++ b/test/Generics/inverse_copyable_requirement.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated // a concrete move-only type struct MO: ~Copyable { diff --git a/test/Generics/protocol_typealias_cycle_5.swift b/test/Generics/protocol_typealias_cycle_5.swift index 1d35b49f4ae56..c4f736f26fc8f 100644 --- a/test/Generics/protocol_typealias_cycle_5.swift +++ b/test/Generics/protocol_typealias_cycle_5.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated protocol P : Sequence { typealias Element = Iterator.Element diff --git a/test/Generics/protocol_typealias_unbound_generic.swift b/test/Generics/protocol_typealias_unbound_generic.swift index 4848cb930f0fe..042737f816c54 100644 --- a/test/Generics/protocol_typealias_unbound_generic.swift +++ b/test/Generics/protocol_typealias_unbound_generic.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated protocol P { typealias A = Array diff --git a/test/Generics/rdar94848868.swift b/test/Generics/rdar94848868.swift index ae4ceadca9029..b7d866e23ae37 100644 --- a/test/Generics/rdar94848868.swift +++ b/test/Generics/rdar94848868.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated // This is too circular to work, but it shouldn't crash. diff --git a/test/IDE/complete_from_clang_framework_typechecker.swift b/test/IDE/complete_from_clang_framework_typechecker.swift index 4bce3edbd66ed..117d0f05a686b 100644 --- a/test/IDE/complete_from_clang_framework_typechecker.swift +++ b/test/IDE/complete_from_clang_framework_typechecker.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-objc-interop -F %S/Inputs/mock-sdk +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-objc-interop -F %S/Inputs/mock-sdk import Foo // Don't import 'FooHelper'. diff --git a/test/IDE/dump_swift_lookup_tables_objc.swift b/test/IDE/dump_swift_lookup_tables_objc.swift index 48dbf6bd59f35..6d41988a42a0a 100644 --- a/test/IDE/dump_swift_lookup_tables_objc.swift +++ b/test/IDE/dump_swift_lookup_tables_objc.swift @@ -1,7 +1,7 @@ // RUN: %target-swift-ide-test -dump-importer-lookup-table -source-filename %s -import-objc-header %S/Inputs/swift_name_objc.h > %t.ide-test.log 2>&1 // RUN: %FileCheck %s < %t.ide-test.log -// RUN: %target-typecheck-verify-swift -dump-clang-lookup-tables -import-objc-header %S/Inputs/swift_name_objc.h > %t.frontend.log 2>&1 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -dump-clang-lookup-tables -import-objc-header %S/Inputs/swift_name_objc.h > %t.frontend.log 2>&1 // RUN: %FileCheck %s < %t.frontend.log // REQUIRES: objc_interop diff --git a/test/IDE/newtype.swift b/test/IDE/newtype.swift index 08945a1cd44cb..37f7af552bacf 100644 --- a/test/IDE/newtype.swift +++ b/test/IDE/newtype.swift @@ -2,7 +2,7 @@ // RUN: %build-clang-importer-objc-overlays // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk-nosource) -I %t -I %S/Inputs/custom-modules -print-module -source-filename %s -module-to-print=Newtype -skip-unavailable -access-filter-public > %t.printed.A.txt // RUN: %FileCheck %s -check-prefix=PRINT -strict-whitespace < %t.printed.A.txt -// RUN: %target-typecheck-verify-swift -sdk %clang-importer-sdk -I %S/Inputs/custom-modules -I %t +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -sdk %clang-importer-sdk -I %S/Inputs/custom-modules -I %t // REQUIRES: objc_interop // PRINT-LABEL: struct ErrorDomain : _ObjectiveCBridgeable, Hashable, Equatable, _SwiftNewtypeWrapper, RawRepresentable, @unchecked Sendable { diff --git a/test/IDE/print_ast_tc_decls.swift b/test/IDE/print_ast_tc_decls.swift index b0cd2f4297b54..bbafcae286833 100644 --- a/test/IDE/print_ast_tc_decls.swift +++ b/test/IDE/print_ast_tc_decls.swift @@ -8,7 +8,7 @@ // FIXME: END -enable-source-import hackaround // // This file should not have any syntax or type checker errors. -// RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -swift-version 4 -D ERRORS -typecheck -verify %s -F %S/Inputs/mock-sdk -enable-objc-interop -disable-objc-attr-requires-foundation-module +// RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -swift-version 4 -D ERRORS -typecheck -verify -verify-ignore-unrelated %s -F %S/Inputs/mock-sdk -enable-objc-interop -disable-objc-attr-requires-foundation-module // // RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -swift-version 4 -skip-deinit=false -print-ast-typechecked -source-filename %s -F %S/Inputs/mock-sdk -function-definitions=false -prefer-type-repr=false -print-implicit-attrs=true -enable-objc-interop -disable-objc-attr-requires-foundation-module > %t.printed.txt // RUN: %FileCheck %s -check-prefix=PASS_COMMON -strict-whitespace < %t.printed.txt diff --git a/test/IDE/print_ast_tc_decls_errors.swift b/test/IDE/print_ast_tc_decls_errors.swift index f84a590edb69c..1f5a88b83fbf5 100644 --- a/test/IDE/print_ast_tc_decls_errors.swift +++ b/test/IDE/print_ast_tc_decls_errors.swift @@ -1,6 +1,6 @@ // Verify errors in this file to ensure that parse and type checker errors // occur where we expect them. -// RUN: %target-typecheck-verify-swift -show-diagnostics-after-fatal +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -show-diagnostics-after-fatal // RUN: %target-swift-ide-test -print-ast-typechecked -source-filename %s -prefer-type-repr=false > %t.printed.txt // RUN: %FileCheck %s -strict-whitespace < %t.printed.txt diff --git a/test/IRGen/bitwise_copyable_resilient.swift b/test/IRGen/bitwise_copyable_resilient.swift index ea960af42f822..977cfb093bd3f 100644 --- a/test/IRGen/bitwise_copyable_resilient.swift +++ b/test/IRGen/bitwise_copyable_resilient.swift @@ -10,7 +10,7 @@ // RUN: %target-swift-frontend \ // RUN: %t/DownstreamDiagnostics.swift \ -// RUN: -typecheck -verify \ +// RUN: -typecheck -verify -verify-ignore-unrelated \ // RUN: -debug-diagnostic-names \ // RUN: -I %t diff --git a/test/ImportResolution/import-resolution-2.swift b/test/ImportResolution/import-resolution-2.swift index 370a91a8489de..951a978662f15 100644 --- a/test/ImportResolution/import-resolution-2.swift +++ b/test/ImportResolution/import-resolution-2.swift @@ -3,7 +3,7 @@ // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/aeiou.swift // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/asdf.swift // RUN: %target-swift-frontend -emit-module -o %t -I %t %S/Inputs/letters.swift -// RUN: %target-swift-frontend -typecheck %s -I %t -sdk "" -verify +// RUN: %target-swift-frontend -typecheck %s -I %t -sdk "" -verify -verify-ignore-unrelated import letters import aeiou diff --git a/test/ImportResolution/import-resolution.swift b/test/ImportResolution/import-resolution.swift index 374a4fbb64dcb..1e9c5e81607e2 100644 --- a/test/ImportResolution/import-resolution.swift +++ b/test/ImportResolution/import-resolution.swift @@ -1,13 +1,13 @@ // RUN: %empty-directory(%t) -// RUN: %target-swift-frontend -typecheck %s -enable-source-import -I %S/Inputs -sdk "" -verify -show-diagnostics-after-fatal +// RUN: %target-swift-frontend -typecheck %s -enable-source-import -I %S/Inputs -sdk "" -verify -verify-ignore-unrelated -show-diagnostics-after-fatal // RUN: not %target-swift-frontend -typecheck %s -I %S/Inputs -sdk "" -show-diagnostics-after-fatal 2>&1 | %FileCheck %s -check-prefix=CHECK-NO-SOURCE-IMPORT // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/abcde.swift // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/aeiou.swift // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/asdf.swift // RUN: %target-swift-frontend -emit-module -o %t -I %t %S/Inputs/letters.swift -// RUN: %target-swift-frontend -typecheck %s -I %t -sdk "" -verify -show-diagnostics-after-fatal +// RUN: %target-swift-frontend -typecheck %s -I %t -sdk "" -verify -verify-ignore-unrelated -show-diagnostics-after-fatal // RUN: %target-swift-ide-test -source-filename %s -print-module-imports -module-to-print=letters -I %t | %FileCheck %s -check-prefix=CHECK-IMPORTS diff --git a/test/ImportResolution/import-specific-decl.swift b/test/ImportResolution/import-specific-decl.swift index a95702d22ef23..29cf7d6e83bf1 100644 --- a/test/ImportResolution/import-specific-decl.swift +++ b/test/ImportResolution/import-specific-decl.swift @@ -2,7 +2,7 @@ // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/asdf.swift // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/abcde.swift // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/aeiou.swift -// RUN: %target-swift-frontend -typecheck %s -I %t -sdk "" -verify +// RUN: %target-swift-frontend -typecheck %s -I %t -sdk "" -verify -verify-ignore-unrelated // RUN: not %target-swift-frontend -typecheck %s -I %t -sdk "" 2>&1 | %FileCheck %s import struct aeiou.U diff --git a/test/ImportResolution/import-specific-fixits.swift b/test/ImportResolution/import-specific-fixits.swift index ee6c60fd2add3..4589b67959178 100644 --- a/test/ImportResolution/import-specific-fixits.swift +++ b/test/ImportResolution/import-specific-fixits.swift @@ -5,7 +5,7 @@ // RUN: %target-swift-frontend -emit-module -o %t -I %t %S/Inputs/ambiguous.swift // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/DeclsUsedWrongly.swift -// RUN: %target-swift-frontend -typecheck -I %t -serialize-diagnostics-path %t.dia %s -verify +// RUN: %target-swift-frontend -typecheck -I %t -serialize-diagnostics-path %t.dia %s -verify -verify-ignore-unrelated // RUN: c-index-test -read-diagnostics %t.dia > %t.deserialized_diagnostics.txt 2>&1 // RUN: %FileCheck --input-file=%t.deserialized_diagnostics.txt %s diff --git a/test/Interop/Cxx/class/access-anonymous-field.swift b/test/Interop/Cxx/class/access-anonymous-field.swift index 767d70baee38d..133956fb87e72 100644 --- a/test/Interop/Cxx/class/access-anonymous-field.swift +++ b/test/Interop/Cxx/class/access-anonymous-field.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -I %S/Inputs -swift-version 6 -cxx-interoperability-mode=upcoming-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %S/Inputs -swift-version 6 -cxx-interoperability-mode=upcoming-swift // CHECK: Foobar diff --git a/test/Interop/Cxx/class/access/access-inversion-typechecker.swift b/test/Interop/Cxx/class/access/access-inversion-typechecker.swift index 534c209b9e2aa..ae361132ddb34 100644 --- a/test/Interop/Cxx/class/access/access-inversion-typechecker.swift +++ b/test/Interop/Cxx/class/access/access-inversion-typechecker.swift @@ -4,7 +4,7 @@ // but does not necessarily specify it (in the deliberate sense). In other words, // there may be behaviors captured in these tests that deserve amending. -// RUN: %target-typecheck-verify-swift -I %S/Inputs -cxx-interoperability-mode=default -enable-experimental-feature ImportNonPublicCxxMembers +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=default -enable-experimental-feature ImportNonPublicCxxMembers // REQUIRES: swift_feature_ImportNonPublicCxxMembers import AccessInversion diff --git a/test/Interop/Cxx/class/access/access-specifiers-typechecker.swift b/test/Interop/Cxx/class/access/access-specifiers-typechecker.swift index 030babd16503a..b5b62eeebdb0b 100644 --- a/test/Interop/Cxx/class/access/access-specifiers-typechecker.swift +++ b/test/Interop/Cxx/class/access/access-specifiers-typechecker.swift @@ -1,6 +1,6 @@ // Test that C++ access specifiers are honored. -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -enable-experimental-cxx-interop -enable-experimental-feature ImportNonPublicCxxMembers +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -I %S/Inputs -enable-experimental-cxx-interop -enable-experimental-feature ImportNonPublicCxxMembers // REQUIRES: swift_feature_ImportNonPublicCxxMembers import AccessSpecifiers diff --git a/test/Interop/Cxx/class/access/non-public-inheritance-typecheck.swift b/test/Interop/Cxx/class/access/non-public-inheritance-typecheck.swift index 36ba1c566c64e..492b781f676f7 100644 --- a/test/Interop/Cxx/class/access/non-public-inheritance-typecheck.swift +++ b/test/Interop/Cxx/class/access/non-public-inheritance-typecheck.swift @@ -1,6 +1,6 @@ //--- blessed.swift // RUN: split-file %s %t -// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/blessed.swift +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/blessed.swift import NonPublicInheritance // Extensions of each class test whether we correctly modeled *which* members diff --git a/test/Interop/Cxx/class/access/non-public-nested-enum-typecheck.swift b/test/Interop/Cxx/class/access/non-public-nested-enum-typecheck.swift index 08a01c5dde85e..b32e0c7c57695 100644 --- a/test/Interop/Cxx/class/access/non-public-nested-enum-typecheck.swift +++ b/test/Interop/Cxx/class/access/non-public-nested-enum-typecheck.swift @@ -1,7 +1,7 @@ // RUN: split-file %s %t -// RUN: %target-swift-frontend -typecheck -verify -I %t/Inputs -cxx-interoperability-mode=default -enable-experimental-feature ImportNonPublicCxxMembers -module-name main %t/base.swift -// RUN: %target-swift-frontend -typecheck -verify -I %t/Inputs -cxx-interoperability-mode=default -enable-experimental-feature ImportNonPublicCxxMembers -module-name main %t/derived.swift +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %t/Inputs -cxx-interoperability-mode=default -enable-experimental-feature ImportNonPublicCxxMembers -module-name main %t/base.swift +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %t/Inputs -cxx-interoperability-mode=default -enable-experimental-feature ImportNonPublicCxxMembers -module-name main %t/derived.swift // REQUIRES: swift_feature_ImportNonPublicCxxMembers diff --git a/test/Interop/Cxx/class/access/non-public-shadow-typecheck.swift b/test/Interop/Cxx/class/access/non-public-shadow-typecheck.swift index 428b2336ded33..41fa6dbcda6cd 100644 --- a/test/Interop/Cxx/class/access/non-public-shadow-typecheck.swift +++ b/test/Interop/Cxx/class/access/non-public-shadow-typecheck.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default -enable-experimental-feature ImportNonPublicCxxMembers +// RUN: %target-swift-frontend %s -typecheck -verify -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=default -enable-experimental-feature ImportNonPublicCxxMembers // REQUIRES: swift_feature_ImportNonPublicCxxMembers import NonPublicShadow diff --git a/test/Interop/Cxx/class/access/private-fileid-conformance.swift b/test/Interop/Cxx/class/access/private-fileid-conformance.swift index 8e3defdf217db..b27d8d2926a51 100644 --- a/test/Interop/Cxx/class/access/private-fileid-conformance.swift +++ b/test/Interop/Cxx/class/access/private-fileid-conformance.swift @@ -1,7 +1,7 @@ // RUN: split-file %s %t -// RUN: %target-swift-frontend -typecheck -verify -I %t/Cxx/include %t/PrivateFile.swift -cxx-interoperability-mode=default -module-name Module -// RUN: %target-swift-frontend -typecheck -verify -I %t/Cxx/include %t/HasRetroactive.swift -cxx-interoperability-mode=default -module-name Module -// RUN: %target-swift-frontend -typecheck -verify -I %t/Cxx/include %t/NoRetroactive.swift -cxx-interoperability-mode=default -module-name Module +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %t/Cxx/include %t/PrivateFile.swift -cxx-interoperability-mode=default -module-name Module +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %t/Cxx/include %t/HasRetroactive.swift -cxx-interoperability-mode=default -module-name Module +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %t/Cxx/include %t/NoRetroactive.swift -cxx-interoperability-mode=default -module-name Module //--- Cxx/include/module.modulemap module CxxModule { diff --git a/test/Interop/Cxx/class/access/private-fileid-nested-typecheck.swift b/test/Interop/Cxx/class/access/private-fileid-nested-typecheck.swift index 4ab68f874a93d..c91d08b24b59c 100644 --- a/test/Interop/Cxx/class/access/private-fileid-nested-typecheck.swift +++ b/test/Interop/Cxx/class/access/private-fileid-nested-typecheck.swift @@ -2,8 +2,8 @@ // works as expected. // // RUN: split-file %s %t -// RUN: %target-swift-frontend -typecheck -verify %t/file1.swift -I %t/include -cxx-interoperability-mode=default -module-name main -// RUN: %target-swift-frontend -typecheck -verify %t/file2.swift -I %t/include -cxx-interoperability-mode=default -module-name main +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/file1.swift -I %t/include -cxx-interoperability-mode=default -module-name main +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/file2.swift -I %t/include -cxx-interoperability-mode=default -module-name main //--- include/module.modulemap module CxxModule { diff --git a/test/Interop/Cxx/class/access/private-fileid-template-typecheck.swift b/test/Interop/Cxx/class/access/private-fileid-template-typecheck.swift index 23b4c6a04a029..f634bf21f03d1 100644 --- a/test/Interop/Cxx/class/access/private-fileid-template-typecheck.swift +++ b/test/Interop/Cxx/class/access/private-fileid-template-typecheck.swift @@ -15,7 +15,7 @@ // non-public in different contexts, and variations in module and file names. // // RUN: split-file %s %t -// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/blessed.swift +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/blessed.swift //--- blessed.swift diff --git a/test/Interop/Cxx/class/access/private-fileid-typecheck.swift b/test/Interop/Cxx/class/access/private-fileid-typecheck.swift index 20bfccc59e04b..d600373a5889e 100644 --- a/test/Interop/Cxx/class/access/private-fileid-typecheck.swift +++ b/test/Interop/Cxx/class/access/private-fileid-typecheck.swift @@ -16,37 +16,37 @@ // members are private (default) or protected. The result should be the same // no matter the configuration. // -// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/blessed.swift -// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/blessed.swift -Xcc -DTEST_CLASS=struct -// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/blessed.swift -Xcc -DTEST_PRIVATE=protected -// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/blessed.swift -Xcc -DTEST_CLASS=struct -Xcc -DTEST_PRIVATE=protected +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/blessed.swift +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/blessed.swift -Xcc -DTEST_CLASS=struct +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/blessed.swift -Xcc -DTEST_PRIVATE=protected +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/blessed.swift -Xcc -DTEST_CLASS=struct -Xcc -DTEST_PRIVATE=protected // // This test also includes a "cursed.swift", which expects to not have access to // non-public members: // -// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/cursed.swift -// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/cursed.swift -Xcc -DTEST_CLASS=struct -// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/cursed.swift -Xcc -DTEST_PRIVATE=protected -// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/cursed.swift -Xcc -DTEST_CLASS=struct -Xcc -DTEST_PRIVATE=protected +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/cursed.swift +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/cursed.swift -Xcc -DTEST_CLASS=struct +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/cursed.swift -Xcc -DTEST_PRIVATE=protected +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/cursed.swift -Xcc -DTEST_CLASS=struct -Xcc -DTEST_PRIVATE=protected // // To check that fileID is agnostic about directory structure within a module, // we move blessed.swift into a subdirectory (but keep its filename). // // RUN: mkdir -p %t/subdir/subsubdir // RUN: mv %t/blessed.swift %t/subdir/subsubdir/blessed.swift -// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/subdir/subsubdir/blessed.swift -// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/subdir/subsubdir/blessed.swift -Xcc -DTEST_CLASS=struct -// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/subdir/subsubdir/blessed.swift -Xcc -DTEST_PRIVATE=protected -// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/subdir/subsubdir/blessed.swift -Xcc -DTEST_CLASS=struct -Xcc -DTEST_PRIVATE=protected +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/subdir/subsubdir/blessed.swift +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/subdir/subsubdir/blessed.swift -Xcc -DTEST_CLASS=struct +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/subdir/subsubdir/blessed.swift -Xcc -DTEST_PRIVATE=protected +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=default -module-name main %t/subdir/subsubdir/blessed.swift -Xcc -DTEST_CLASS=struct -Xcc -DTEST_PRIVATE=protected // // To check that fileID is sensitive to module names, rename cursed.swift to // "blessed.swift", but typecheck in a module not called "main". // // RUN: mv %t/cursed.swift %t/blessed.swift -// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default -module-name brain %t/blessed.swift -// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default -module-name brain %t/blessed.swift -Xcc -DTEST_CLASS=struct -// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default -module-name brain %t/blessed.swift -Xcc -DTEST_PRIVATE=protected -// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default -module-name brain %t/blessed.swift -Xcc -DTEST_CLASS=struct -Xcc -DTEST_PRIVATE=protected +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=default -module-name brain %t/blessed.swift +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=default -module-name brain %t/blessed.swift -Xcc -DTEST_CLASS=struct +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=default -module-name brain %t/blessed.swift -Xcc -DTEST_PRIVATE=protected +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=default -module-name brain %t/blessed.swift -Xcc -DTEST_CLASS=struct -Xcc -DTEST_PRIVATE=protected //--- blessed.swift diff --git a/test/Interop/Cxx/class/access/using-non-public-typechecker.swift b/test/Interop/Cxx/class/access/using-non-public-typechecker.swift index 25cbbae460b3e..cb1c0e8e21d58 100644 --- a/test/Interop/Cxx/class/access/using-non-public-typechecker.swift +++ b/test/Interop/Cxx/class/access/using-non-public-typechecker.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=default -enable-experimental-feature ImportNonPublicCxxMembers +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=default -enable-experimental-feature ImportNonPublicCxxMembers // REQUIRES: swift_feature_ImportNonPublicCxxMembers import UsingNonPublic diff --git a/test/Interop/Cxx/class/clang-trivial-abi.swift b/test/Interop/Cxx/class/clang-trivial-abi.swift index f9415365b4a41..996e4737bd08e 100644 --- a/test/Interop/Cxx/class/clang-trivial-abi.swift +++ b/test/Interop/Cxx/class/clang-trivial-abi.swift @@ -2,7 +2,7 @@ // RUN: split-file %s %t // RUN: %target-swift-ide-test -print-module -module-to-print=Test -I %t/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s -// RUN: %target-swift-frontend -typecheck -I %t/Inputs %t/test.swift -enable-experimental-cxx-interop -verify +// RUN: %target-swift-frontend -typecheck -I %t/Inputs %t/test.swift -enable-experimental-cxx-interop -verify -verify-ignore-unrelated //--- Inputs/module.modulemap module Test { diff --git a/test/Interop/Cxx/class/constructors-typechecker.swift b/test/Interop/Cxx/class/constructors-typechecker.swift index 52ff4104b83fe..c5680d4a5125c 100644 --- a/test/Interop/Cxx/class/constructors-typechecker.swift +++ b/test/Interop/Cxx/class/constructors-typechecker.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -enable-experimental-cxx-interop +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -I %S/Inputs -enable-experimental-cxx-interop // XFAIL: OS=linux-androideabi import Constructors diff --git a/test/Interop/Cxx/class/friend-diag.swift b/test/Interop/Cxx/class/friend-diag.swift index a34f353827038..b5f26bccd1349 100644 --- a/test/Interop/Cxx/class/friend-diag.swift +++ b/test/Interop/Cxx/class/friend-diag.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t // RUN: split-file %s %t -// RUN: %target-swiftxx-frontend -typecheck -I %t/Inputs %t/test.swift -verify +// RUN: %target-swiftxx-frontend -typecheck -I %t/Inputs %t/test.swift -verify -verify-ignore-unrelated //--- Inputs/module.modulemap module FriendClass { diff --git a/test/Interop/Cxx/class/inheritance/inherited-lookup-typechecker.swift b/test/Interop/Cxx/class/inheritance/inherited-lookup-typechecker.swift index fe6a06cc51167..cad71d779c307 100644 --- a/test/Interop/Cxx/class/inheritance/inherited-lookup-typechecker.swift +++ b/test/Interop/Cxx/class/inheritance/inherited-lookup-typechecker.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=default +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=default import InheritedLookup extension One { diff --git a/test/Interop/Cxx/class/inheritance/using-base-members-typechecker.swift b/test/Interop/Cxx/class/inheritance/using-base-members-typechecker.swift index f417fa935867c..2fb90d49ecac9 100644 --- a/test/Interop/Cxx/class/inheritance/using-base-members-typechecker.swift +++ b/test/Interop/Cxx/class/inheritance/using-base-members-typechecker.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=default -enable-experimental-feature ImportNonPublicCxxMembers +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=default -enable-experimental-feature ImportNonPublicCxxMembers // REQUIRES: swift_feature_ImportNonPublicCxxMembers import UsingBaseMembers diff --git a/test/Interop/Cxx/class/inheritance/virtual-methods-typechecker.swift b/test/Interop/Cxx/class/inheritance/virtual-methods-typechecker.swift index f44fece94952b..2cbc04c3f1988 100644 --- a/test/Interop/Cxx/class/inheritance/virtual-methods-typechecker.swift +++ b/test/Interop/Cxx/class/inheritance/virtual-methods-typechecker.swift @@ -1,6 +1,6 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=upcoming-swift -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=swift-5.9 -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=swift-6 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=upcoming-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=swift-5.9 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=swift-6 import VirtualMethods diff --git a/test/Interop/Cxx/class/returns-unavailable-class.swift b/test/Interop/Cxx/class/returns-unavailable-class.swift index 058efe4370d59..9ac44bf7b8d57 100644 --- a/test/Interop/Cxx/class/returns-unavailable-class.swift +++ b/test/Interop/Cxx/class/returns-unavailable-class.swift @@ -2,7 +2,7 @@ // RUN: split-file %s %t // RUN: %target-swift-ide-test -print-module -module-to-print=CxxModule -I %t/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s -// RUN: %target-swift-frontend -typecheck -verify -I %t/Inputs -enable-experimental-cxx-interop %t/test.swift +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %t/Inputs -enable-experimental-cxx-interop %t/test.swift //--- Inputs/module.modulemap module CxxTypes { diff --git a/test/Interop/Cxx/class/sendable-typechecker.swift b/test/Interop/Cxx/class/sendable-typechecker.swift index f4de5f48483a4..9a3097e4fc199 100644 --- a/test/Interop/Cxx/class/sendable-typechecker.swift +++ b/test/Interop/Cxx/class/sendable-typechecker.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -I %S/Inputs -swift-version 6 -cxx-interoperability-mode=upcoming-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %S/Inputs -swift-version 6 -cxx-interoperability-mode=upcoming-swift import Sendable // expected-warning {{add '@preconcurrency' to treat 'Sendable'-related errors from module 'Sendable' as warnings}} diff --git a/test/Interop/Cxx/class/type-classification-typechecker.swift b/test/Interop/Cxx/class/type-classification-typechecker.swift index 017e6131d918d..e5e34e5dd3472 100644 --- a/test/Interop/Cxx/class/type-classification-typechecker.swift +++ b/test/Interop/Cxx/class/type-classification-typechecker.swift @@ -1,6 +1,6 @@ -// RUN: %target-typecheck-verify-swift -I %S/Inputs -cxx-interoperability-mode=swift-5.9 -// RUN: %target-typecheck-verify-swift -I %S/Inputs -cxx-interoperability-mode=swift-6 -// RUN: %target-typecheck-verify-swift -I %S/Inputs -cxx-interoperability-mode=upcoming-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=swift-5.9 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=swift-6 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=upcoming-swift import TypeClassification diff --git a/test/Interop/Cxx/foreign-reference/member-inheritance-typechecker.swift b/test/Interop/Cxx/foreign-reference/member-inheritance-typechecker.swift index 80b1d883f3abe..4556a2b8e5258 100644 --- a/test/Interop/Cxx/foreign-reference/member-inheritance-typechecker.swift +++ b/test/Interop/Cxx/foreign-reference/member-inheritance-typechecker.swift @@ -1,6 +1,6 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=upcoming-swift -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=swift-5.9 -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=swift-6 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=upcoming-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=swift-5.9 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=swift-6 import MemberInheritance diff --git a/test/Interop/Cxx/foreign-reference/witness-table-typechecker.swift b/test/Interop/Cxx/foreign-reference/witness-table-typechecker.swift index 85a7130a00cc3..c65ece5f7ff2f 100644 --- a/test/Interop/Cxx/foreign-reference/witness-table-typechecker.swift +++ b/test/Interop/Cxx/foreign-reference/witness-table-typechecker.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -cxx-interoperability-mode=default -disable-availability-checking -I %S/Inputs +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -cxx-interoperability-mode=default -disable-availability-checking -I %S/Inputs import WitnessTable diff --git a/test/Interop/Cxx/function/builtin-nullability-return-type-typechecker.swift b/test/Interop/Cxx/function/builtin-nullability-return-type-typechecker.swift index 0d9df7b1ff481..7403490e3ef3f 100644 --- a/test/Interop/Cxx/function/builtin-nullability-return-type-typechecker.swift +++ b/test/Interop/Cxx/function/builtin-nullability-return-type-typechecker.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -typecheck -verify -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=default -Xcc -D_CRT_SECURE_NO_WARNINGS %s -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -typecheck -verify -verify-ignore-unknown -I %S/Inputs -Xcc -D_CRT_SECURE_NO_WARNINGS %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -typecheck -verify -verify-ignore-unrelated -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=default -Xcc -D_CRT_SECURE_NO_WARNINGS %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -typecheck -verify -verify-ignore-unrelated -verify-ignore-unknown -I %S/Inputs -Xcc -D_CRT_SECURE_NO_WARNINGS %s import CustomStringBuiltins diff --git a/test/Interop/Cxx/function/default-arguments-typechecker.swift b/test/Interop/Cxx/function/default-arguments-typechecker.swift index 2c4f802d21fa7..94b5caff1d8c9 100644 --- a/test/Interop/Cxx/function/default-arguments-typechecker.swift +++ b/test/Interop/Cxx/function/default-arguments-typechecker.swift @@ -1,6 +1,6 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=swift-5.9 -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=swift-6 -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=upcoming-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=swift-5.9 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=swift-6 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -I %S/Inputs -cxx-interoperability-mode=upcoming-swift import DefaultArguments diff --git a/test/Interop/Cxx/library-evolution/allow-objc-in-cxx-mode-in-evolving-libraries.swift b/test/Interop/Cxx/library-evolution/allow-objc-in-cxx-mode-in-evolving-libraries.swift index f52956b1704fe..3d621e37a3753 100644 --- a/test/Interop/Cxx/library-evolution/allow-objc-in-cxx-mode-in-evolving-libraries.swift +++ b/test/Interop/Cxx/library-evolution/allow-objc-in-cxx-mode-in-evolving-libraries.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: split-file %s %t -// RUN: %target-swift-frontend %t/test.swift -I %t/Inputs -typecheck -enable-library-evolution -enable-experimental-cxx-interop -verify +// RUN: %target-swift-frontend %t/test.swift -I %t/Inputs -typecheck -enable-library-evolution -enable-experimental-cxx-interop -verify -verify-ignore-unrelated // REQUIRES: objc_interop // REQUIRES: OS=macosx diff --git a/test/Interop/Cxx/library-evolution/prohibit-cxx-api-in-evolving-libraries.swift b/test/Interop/Cxx/library-evolution/prohibit-cxx-api-in-evolving-libraries.swift index 7ade6ba0c5b75..4feb377016558 100644 --- a/test/Interop/Cxx/library-evolution/prohibit-cxx-api-in-evolving-libraries.swift +++ b/test/Interop/Cxx/library-evolution/prohibit-cxx-api-in-evolving-libraries.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: split-file %s %t -// RUN: %target-swift-frontend %t/test.swift -I %t/Inputs -typecheck -enable-library-evolution -enable-experimental-cxx-interop -disable-availability-checking -disable-implicit-cxx-module-import -verify +// RUN: %target-swift-frontend %t/test.swift -I %t/Inputs -typecheck -enable-library-evolution -enable-experimental-cxx-interop -disable-availability-checking -disable-implicit-cxx-module-import -verify -verify-ignore-unrelated // REQUIRES: OS=macosx diff --git a/test/Interop/Cxx/library-evolution/prohibit-cxx-calls-in-evolving-inlinable-bodies.swift b/test/Interop/Cxx/library-evolution/prohibit-cxx-calls-in-evolving-inlinable-bodies.swift index a5d9e6b3d280d..c4b4a5270bc87 100644 --- a/test/Interop/Cxx/library-evolution/prohibit-cxx-calls-in-evolving-inlinable-bodies.swift +++ b/test/Interop/Cxx/library-evolution/prohibit-cxx-calls-in-evolving-inlinable-bodies.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: split-file %s %t -// RUN: %target-swift-frontend %t/test.swift -I %t/Inputs -typecheck -enable-library-evolution -enable-experimental-cxx-interop -disable-implicit-cxx-module-import -verify +// RUN: %target-swift-frontend %t/test.swift -I %t/Inputs -typecheck -enable-library-evolution -enable-experimental-cxx-interop -disable-implicit-cxx-module-import -verify -verify-ignore-unrelated // REQUIRES: OS=macosx diff --git a/test/Interop/Cxx/namespace/import-as-member-typechecker.swift b/test/Interop/Cxx/namespace/import-as-member-typechecker.swift index 5fe52f082971d..d42d43bd72093 100644 --- a/test/Interop/Cxx/namespace/import-as-member-typechecker.swift +++ b/test/Interop/Cxx/namespace/import-as-member-typechecker.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -I %S/Inputs -cxx-interoperability-mode=upcoming-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=upcoming-swift import ImportAsMember diff --git a/test/Interop/Cxx/namespace/inline-namespace-ambiguity-error.swift b/test/Interop/Cxx/namespace/inline-namespace-ambiguity-error.swift index 9ad64b1e93a82..d9a2d96975a7f 100644 --- a/test/Interop/Cxx/namespace/inline-namespace-ambiguity-error.swift +++ b/test/Interop/Cxx/namespace/inline-namespace-ambiguity-error.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t // RUN: split-file %s %t -// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unknown -I %t/Inputs %t/test.swift -enable-experimental-cxx-interop +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -verify-ignore-unknown -I %t/Inputs %t/test.swift -enable-experimental-cxx-interop //--- Inputs/module.modulemap module namespaces { diff --git a/test/Interop/Cxx/operators/member-inline-typechecker.swift b/test/Interop/Cxx/operators/member-inline-typechecker.swift index 7db791a32a60d..e38b921f6d900 100644 --- a/test/Interop/Cxx/operators/member-inline-typechecker.swift +++ b/test/Interop/Cxx/operators/member-inline-typechecker.swift @@ -1,6 +1,6 @@ -// RUN: %target-typecheck-verify-swift -I %S/Inputs -cxx-interoperability-mode=swift-5.9 -// RUN: %target-typecheck-verify-swift -I %S/Inputs -cxx-interoperability-mode=swift-6 -// RUN: %target-typecheck-verify-swift -I %S/Inputs -cxx-interoperability-mode=upcoming-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=swift-5.9 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=swift-6 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=upcoming-swift import MemberInline diff --git a/test/Interop/Cxx/reference/reference-cannot-import-diagnostic.swift b/test/Interop/Cxx/reference/reference-cannot-import-diagnostic.swift index 48e1b3e45ef0d..1510aa3265e27 100644 --- a/test/Interop/Cxx/reference/reference-cannot-import-diagnostic.swift +++ b/test/Interop/Cxx/reference/reference-cannot-import-diagnostic.swift @@ -1,6 +1,6 @@ // RUN: rm -rf %t // RUN: split-file %s %t -// RUN: %target-swift-frontend -typecheck -verify -I %t/Inputs %t/test.swift -enable-experimental-cxx-interop +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %t/Inputs %t/test.swift -enable-experimental-cxx-interop // RUN: not %target-swift-frontend -typecheck -I %t/Inputs %t/test.swift -enable-experimental-cxx-interop 2>&1 | %FileCheck %s //--- Inputs/module.modulemap diff --git a/test/Interop/Cxx/stdlib/overlay/convertible-to-bool-typechecker.swift b/test/Interop/Cxx/stdlib/overlay/convertible-to-bool-typechecker.swift index 38867db05b77a..669763c6ca1e2 100644 --- a/test/Interop/Cxx/stdlib/overlay/convertible-to-bool-typechecker.swift +++ b/test/Interop/Cxx/stdlib/overlay/convertible-to-bool-typechecker.swift @@ -1,6 +1,6 @@ -// RUN: %target-typecheck-verify-swift -I %S/Inputs -enable-experimental-cxx-interop -// RUN: %target-typecheck-verify-swift -I %S/Inputs -cxx-interoperability-mode=swift-6 -// RUN: %target-typecheck-verify-swift -I %S/Inputs -cxx-interoperability-mode=upcoming-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %S/Inputs -enable-experimental-cxx-interop +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=swift-6 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %S/Inputs -cxx-interoperability-mode=upcoming-swift import ConvertibleToBool diff --git a/test/Interop/Cxx/swiftify-import/bounds-attrs-in-template.swift b/test/Interop/Cxx/swiftify-import/bounds-attrs-in-template.swift index f09d490ebfd0c..c9cfaaa117d25 100644 --- a/test/Interop/Cxx/swiftify-import/bounds-attrs-in-template.swift +++ b/test/Interop/Cxx/swiftify-import/bounds-attrs-in-template.swift @@ -2,7 +2,7 @@ // RUN: rm -rf %t // RUN: split-file %s %t -// RUN: %target-swift-frontend -plugin-path %swift-plugin-dir -I %t/Inputs -cxx-interoperability-mode=default -enable-experimental-feature SafeInteropWrappers %t/template.swift -dump-macro-expansions -emit-ir -o %t/out -verify +// RUN: %target-swift-frontend -plugin-path %swift-plugin-dir -I %t/Inputs -cxx-interoperability-mode=default -enable-experimental-feature SafeInteropWrappers %t/template.swift -dump-macro-expansions -emit-ir -o %t/out -verify -verify-ignore-unrelated // RUN: %target-swift-ide-test -plugin-path %swift-plugin-dir -I %t/Inputs -cxx-interoperability-mode=default -enable-experimental-feature SafeInteropWrappers -print-module -module-to-print=Template -source-filename=x | %FileCheck %s // CHECK: func cb_template(_ p: UnsafePointer!, _ size: Int{{.*}}) -> UnsafePointer diff --git a/test/Interop/Cxx/value-witness-table/custom-destructors-typechecker-trivial-windows-abi.swift b/test/Interop/Cxx/value-witness-table/custom-destructors-typechecker-trivial-windows-abi.swift index 8d555ad22672e..12e8bc1e2361f 100644 --- a/test/Interop/Cxx/value-witness-table/custom-destructors-typechecker-trivial-windows-abi.swift +++ b/test/Interop/Cxx/value-witness-table/custom-destructors-typechecker-trivial-windows-abi.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -I %S/Inputs -enable-experimental-cxx-interop -Xcc -DWIN_TRIVIAL +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %S/Inputs -enable-experimental-cxx-interop -Xcc -DWIN_TRIVIAL // REQUIRES: OS=windows-msvc diff --git a/test/Interpreter/SDK/misc_osx.swift b/test/Interpreter/SDK/misc_osx.swift index 15383cf784077..4b6b747c90693 100644 --- a/test/Interpreter/SDK/misc_osx.swift +++ b/test/Interpreter/SDK/misc_osx.swift @@ -1,4 +1,4 @@ -// RUN: %target-build-swift -typecheck %s -Xfrontend -verify +// RUN: %target-build-swift -typecheck %s -Xfrontend -verify -Xfrontend -verify-ignore-unrelated // REQUIRES: executable_test // REQUIRES: OS=macosx diff --git a/test/Macros/SwiftifyImport/MacroErrors/UnexpectedCountType.swift b/test/Macros/SwiftifyImport/MacroErrors/UnexpectedCountType.swift index 1b37bf45bd7cb..239436936c6c9 100644 --- a/test/Macros/SwiftifyImport/MacroErrors/UnexpectedCountType.swift +++ b/test/Macros/SwiftifyImport/MacroErrors/UnexpectedCountType.swift @@ -10,7 +10,7 @@ func myFunc(_ ptr: UnsafePointer, _ len: String) { // REQUIRES: swift_swift_parser // RUN: %empty-directory(%t) // RUN: split-file %s %t -// RUN: %target-swift-frontend %t/test.swift -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions -verify 2>&1 | %FileCheck %s --match-full-lines --strict-whitespace +// RUN: %target-swift-frontend %t/test.swift -swift-version 5 -module-name main -disable-availability-checking -typecheck -plugin-path %swift-plugin-dir -dump-macro-expansions -verify -verify-ignore-unrelated 2>&1 | %FileCheck %s --match-full-lines --strict-whitespace // CHECK:@__swiftmacro_4main6myFunc15_SwiftifyImportfMp_.swift // CHECK-NEXT:------------------------------ diff --git a/test/Macros/accessor_macros.swift b/test/Macros/accessor_macros.swift index df722c8d535d8..d64f91be11702 100644 --- a/test/Macros/accessor_macros.swift +++ b/test/Macros/accessor_macros.swift @@ -4,7 +4,7 @@ // RUN: %host-build-swift -swift-version 5 -emit-library -o %t/%target-library-name(MacroDefinition) -module-name=MacroDefinition %S/Inputs/syntax_macro_definitions.swift -g -no-toolchain-stdlib-rpath // Check for expected errors. -// RUN: %target-typecheck-verify-swift -swift-version 5 -load-plugin-library %t/%target-library-name(MacroDefinition) -DTEST_DIAGNOSTICS -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 5 -load-plugin-library %t/%target-library-name(MacroDefinition) -DTEST_DIAGNOSTICS -verify-ignore-unknown // RUN: not %target-swift-frontend -typecheck -swift-version 5 -load-plugin-library %t/%target-library-name(MacroDefinition) -DTEST_DIAGNOSTICS %s > %t/diags.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-DIAGS %s < %t/diags.txt diff --git a/test/Macros/attached_macros_diags.swift b/test/Macros/attached_macros_diags.swift index 52ef735e7262e..d123e351771d4 100644 --- a/test/Macros/attached_macros_diags.swift +++ b/test/Macros/attached_macros_diags.swift @@ -2,7 +2,7 @@ // RUN: %empty-directory(%t) // RUN: %host-build-swift -swift-version 5 -emit-library -o %t/%target-library-name(MacroDefinition) -parse-as-library -module-name=MacroDefinition %S/Inputs/syntax_macro_definitions.swift -g -no-toolchain-stdlib-rpath -// RUN: %target-typecheck-verify-swift -swift-version 5 -load-plugin-library %t/%target-library-name(MacroDefinition) -disable-availability-checking -module-name MacrosTest +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 5 -load-plugin-library %t/%target-library-name(MacroDefinition) -disable-availability-checking -module-name MacrosTest @attached(peer) macro m1() = #externalMacro(module: "MacroDefinition", type: "EmptyPeerMacro") diff --git a/test/Macros/expand_on_imported_objc.swift b/test/Macros/expand_on_imported_objc.swift index 1f7d3eb9c7a7f..45b0d6814e608 100644 --- a/test/Macros/expand_on_imported_objc.swift +++ b/test/Macros/expand_on_imported_objc.swift @@ -9,7 +9,7 @@ // RUN: %target-swift-frontend -swift-version 5 -emit-module -o %t/macro_library.swiftmodule %S/Inputs/macro_library.swift -module-name macro_library -load-plugin-library %t/%target-library-name(MacroDefinition) // Diagnostics testing -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -swift-version 5 -enable-experimental-feature MacrosOnImports -load-plugin-library %t/%target-library-name(MacroDefinition) -module-name ModuleUser %s -I %t -DTEST_DIAGNOSTICS +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated -swift-version 5 -enable-experimental-feature MacrosOnImports -load-plugin-library %t/%target-library-name(MacroDefinition) -module-name ModuleUser %s -I %t -DTEST_DIAGNOSTICS // Emit IR just to make sure nothing else fails. // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir -swift-version 5 -g -enable-experimental-feature MacrosOnImports -load-plugin-library %t/%target-library-name(MacroDefinition) -module-name ModuleUser %s -I %t | %FileCheck %s diff --git a/test/Macros/expand_peers_hang.swift b/test/Macros/expand_peers_hang.swift index 5e9a0a7ad1698..10d7f974cf02e 100644 --- a/test/Macros/expand_peers_hang.swift +++ b/test/Macros/expand_peers_hang.swift @@ -2,7 +2,7 @@ // RUN: %empty-directory(%t) // RUN: %host-build-swift -swift-version 5 -emit-library -o %t/%target-library-name(MacroDefinition) -parse-as-library -module-name=MacroDefinition %S/Inputs/syntax_macro_definitions.swift -g -no-toolchain-stdlib-rpath -// RUN: %target-typecheck-verify-swift -swift-version 5 -load-plugin-library %t/%target-library-name(MacroDefinition) -parse-as-library -disable-availability-checking +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 5 -load-plugin-library %t/%target-library-name(MacroDefinition) -parse-as-library -disable-availability-checking @attached(peer, names: named(BadThing)) macro HangingMacro() = #externalMacro(module: "MacroDefinition", type: "HangingMacro") diff --git a/test/Macros/macro_expand.swift b/test/Macros/macro_expand.swift index 5480b735b035d..128463e5d4051 100644 --- a/test/Macros/macro_expand.swift +++ b/test/Macros/macro_expand.swift @@ -4,13 +4,13 @@ // RUN: %host-build-swift -swift-version 5 -emit-library -o %t/%target-library-name(MacroDefinition) -module-name=MacroDefinition %S/Inputs/syntax_macro_definitions.swift // Diagnostics testing -// RUN: %target-typecheck-verify-swift -swift-version 5 -load-plugin-library %t/%target-library-name(MacroDefinition) -module-name MacroUser -DTEST_DIAGNOSTICS +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 5 -load-plugin-library %t/%target-library-name(MacroDefinition) -module-name MacroUser -DTEST_DIAGNOSTICS // Diagnostics testing by importing macros from a module // RUN: %target-swift-frontend -swift-version 5 -emit-module -o %t/freestanding_macro_library.swiftmodule %S/Inputs/freestanding_macro_library.swift -module-name freestanding_macro_library -load-plugin-library %t/%target-library-name(MacroDefinition) // RUN: %target-swift-frontend -swift-version 5 -emit-module -o %t/freestanding_macro_library_2.swiftmodule %S/Inputs/freestanding_macro_library_2.swift -module-name freestanding_macro_library_2 -load-plugin-library %t/%target-library-name(MacroDefinition) -I %t -// RUN: %target-typecheck-verify-swift -swift-version 5 -load-plugin-library %t/%target-library-name(MacroDefinition) -module-name MacroUser -DTEST_DIAGNOSTICS -I %t -DIMPORT_MACRO_LIBRARY +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 5 -load-plugin-library %t/%target-library-name(MacroDefinition) -module-name MacroUser -DTEST_DIAGNOSTICS -I %t -DIMPORT_MACRO_LIBRARY // RUN: not %target-swift-frontend -swift-version 5 -typecheck -load-plugin-library %t/%target-library-name(MacroDefinition) -module-name MacroUser -DTEST_DIAGNOSTICS -serialize-diagnostics-path %t/macro_expand.dia %s -emit-macro-expansion-files no-diagnostics -Rmacro-loading > %t/macro-printing.txt // RUN: c-index-test -read-diagnostics %t/macro_expand.dia 2>&1 | %FileCheck -check-prefix CHECK-DIAGS -dump-input=always %s diff --git a/test/Macros/macro_plugin_server_mod.swift b/test/Macros/macro_plugin_server_mod.swift index 8755f5440f215..c1726977b4d8d 100644 --- a/test/Macros/macro_plugin_server_mod.swift +++ b/test/Macros/macro_plugin_server_mod.swift @@ -36,7 +36,7 @@ // RUN: -external-plugin-path %t/plugins#%swift-plugin-server // RUN: env SWIFT_DUMP_PLUGIN_MESSAGING=1 %target-swift-frontend \ -// RUN: -typecheck -verify \ +// RUN: -typecheck -verify -verify-ignore-unrelated \ // RUN: -I %t \ // RUN: -swift-version 5 \ // RUN: -external-plugin-path %t/plugins#%swift-plugin-server \ diff --git a/test/Misc/misc_diagnostics.swift b/test/Misc/misc_diagnostics.swift index 6d27d411adcc5..c297a65cec06e 100644 --- a/test/Misc/misc_diagnostics.swift +++ b/test/Misc/misc_diagnostics.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated // REQUIRES: objc_interop diff --git a/test/Misc/serialized-diagnostics-prettyprint.swift b/test/Misc/serialized-diagnostics-prettyprint.swift index 80bc62521e16f..632f36f3d4712 100644 --- a/test/Misc/serialized-diagnostics-prettyprint.swift +++ b/test/Misc/serialized-diagnostics-prettyprint.swift @@ -2,7 +2,7 @@ // RUN: split-file %s %t // RUN: %target-swift-frontend -emit-module %t/Lib.swift -module-name Lib -emit-module-path %t/Lib.swiftmodule -// RUN: %target-swift-frontend -typecheck -I %t -serialize-diagnostics-path %t/diags.dia %t/Client.swift -verify +// RUN: %target-swift-frontend -typecheck -I %t -serialize-diagnostics-path %t/diags.dia %t/Client.swift -verify -verify-ignore-unrelated // RUN: c-index-test -read-diagnostics %t/diags.dia > %t/diags.deserialized_diagnostics.txt 2>&1 // RUN: %FileCheck --input-file=%t/diags.deserialized_diagnostics.txt %t/Client.swift diff --git a/test/ModuleInterface/build-alternative-interface.swift b/test/ModuleInterface/build-alternative-interface.swift index 3cae254ce79a3..ca1ada1188789 100644 --- a/test/ModuleInterface/build-alternative-interface.swift +++ b/test/ModuleInterface/build-alternative-interface.swift @@ -20,7 +20,7 @@ // RUN: echo "messmessmess" >> %t/inputs/Foo.swiftinterface // RUN: echo "messmessmess" >> %t/inputs/Bar.swiftinterface -// RUN: %target-typecheck-verify-swift -disable-implicit-concurrency-module-import -I %t/inputs -backup-module-interface-path %t/alternative-inputs -module-cache-path %t/module-cache +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -disable-implicit-concurrency-module-import -I %t/inputs -backup-module-interface-path %t/alternative-inputs -module-cache-path %t/module-cache // RUN: touch -t 201401240005 %t/inputs/Bar.swiftinterface // RUN: %target-swift-frontend-typecheck -disable-implicit-concurrency-module-import -I %t/inputs -backup-module-interface-path %t/alternative-inputs -module-cache-path %t/module-cache -Rmodule-interface-rebuild %s &> %t/remarks.txt diff --git a/test/ModuleInterface/implicit-import.swift b/test/ModuleInterface/implicit-import.swift index f8413cf225720..ab74a279a5b74 100644 --- a/test/ModuleInterface/implicit-import.swift +++ b/test/ModuleInterface/implicit-import.swift @@ -13,7 +13,7 @@ // RUN: %target-swift-emit-module-interface(%t/DefinesExtension.swiftinterface) -I %t %t/DefinesExtension.swift -module-name DefinesExtension // RUN: %target-swift-typecheck-module-from-interface(%t/DefinesExtension.swiftinterface) -I %t -module-name DefinesExtension -// RUN: %target-swift-emit-module-interface(%t/Client.swiftinterface) -verify -I %t %t/File2.swift %t/File1.swift -module-name Client +// RUN: %target-swift-emit-module-interface(%t/Client.swiftinterface) -verify -verify-ignore-unrelated -I %t %t/File2.swift %t/File1.swift -module-name Client // RUN: %target-swift-typecheck-module-from-interface(%t/Client.swiftinterface) -I %t -module-name Client // RUN: %FileCheck %t/File2.swift < %t/Client.swiftinterface diff --git a/test/ModuleInterface/lazy-typecheck.swift b/test/ModuleInterface/lazy-typecheck.swift index a5ae7b839b5e9..ae6598b663708 100644 --- a/test/ModuleInterface/lazy-typecheck.swift +++ b/test/ModuleInterface/lazy-typecheck.swift @@ -7,24 +7,24 @@ // (1) Generate a baseline .swiftinterface and build a client against it. // RUN: %target-swift-frontend -swift-version 5 %S/../Inputs/lazy_typecheck.swift -module-name lazy_typecheck -typecheck -emit-module-interface-path %t/baseline/lazy_typecheck.swiftinterface -enable-library-evolution -parse-as-library -package-name Package -DFLAG // RUN: rm -rf %t/baseline/*.swiftmodule -// RUN: %target-swift-frontend -package-name ClientPackage -typecheck -verify %S/../Inputs/lazy_typecheck_client.swift -I %t/baseline/ +// RUN: %target-swift-frontend -package-name ClientPackage -typecheck -verify -verify-ignore-unrelated %S/../Inputs/lazy_typecheck_client.swift -I %t/baseline/ // (2) Generate a .swiftinterface with -experimental-lazy-typecheck and build the client against it. // The .swiftinterface should be identical to the baseline and avoid triggering typechecking // for any "NoTypecheck" decls. // RUN: %target-swift-frontend -swift-version 5 %S/../Inputs/lazy_typecheck.swift -module-name lazy_typecheck -typecheck -emit-module-interface-path %t/lazy/lazy_typecheck.swiftinterface -enable-library-evolution -parse-as-library -package-name Package -DFLAG -debug-forbid-typecheck-prefix NoTypecheck -experimental-lazy-typecheck // RUN: rm -rf %t/lazy/*.swiftmodule -// RUN: %target-swift-frontend -package-name ClientPackage -typecheck -verify %S/../Inputs/lazy_typecheck_client.swift -I %t/lazy +// RUN: %target-swift-frontend -package-name ClientPackage -typecheck -verify -verify-ignore-unrelated %S/../Inputs/lazy_typecheck_client.swift -I %t/lazy // RUN: diff -u %t/baseline/lazy_typecheck.swiftinterface %t/lazy/lazy_typecheck.swiftinterface // (3) Same as (2), but with -experimental-skip-all-function-bodies added. // RUN: %target-swift-frontend -swift-version 5 %S/../Inputs/lazy_typecheck.swift -module-name lazy_typecheck -typecheck -emit-module-interface-path %t/lazy-skip-all/lazy_typecheck.swiftinterface -enable-library-evolution -parse-as-library -package-name Package -DFLAG -debug-forbid-typecheck-prefix NoTypecheck -experimental-lazy-typecheck -experimental-skip-non-exportable-decls -experimental-skip-all-function-bodies // RUN: rm -rf %t/lazy-skip-all/*.swiftmodule -// RUN: %target-swift-frontend -package-name ClientPackage -typecheck -verify %S/../Inputs/lazy_typecheck_client.swift -I %t/lazy-skip-all +// RUN: %target-swift-frontend -package-name ClientPackage -typecheck -verify -verify-ignore-unrelated %S/../Inputs/lazy_typecheck_client.swift -I %t/lazy-skip-all // RUN: diff -u %t/baseline/lazy_typecheck.swiftinterface %t/lazy-skip-all/lazy_typecheck.swiftinterface // (4) Same as (2), but with -experimental-skip-non-inlinable-function-bodies added. // RUN: %target-swift-frontend -swift-version 5 %S/../Inputs/lazy_typecheck.swift -module-name lazy_typecheck -typecheck -emit-module-interface-path %t/lazy-skip-non-inlinable/lazy_typecheck.swiftinterface -enable-library-evolution -parse-as-library -package-name Package -DFLAG -debug-forbid-typecheck-prefix NoTypecheck -experimental-lazy-typecheck -experimental-skip-non-inlinable-function-bodies // RUN: rm -rf %t/lazy-skip-non-inlinable/*.swiftmodule -// RUN: %target-swift-frontend -package-name ClientPackage -typecheck -verify %S/../Inputs/lazy_typecheck_client.swift -I %t/lazy-skip-non-inlinable +// RUN: %target-swift-frontend -package-name ClientPackage -typecheck -verify -verify-ignore-unrelated %S/../Inputs/lazy_typecheck_client.swift -I %t/lazy-skip-non-inlinable // RUN: diff -u %t/baseline/lazy_typecheck.swiftinterface %t/lazy-skip-non-inlinable/lazy_typecheck.swiftinterface diff --git a/test/ModuleInterface/opaque-result-types.swift b/test/ModuleInterface/opaque-result-types.swift index ba26e259393c9..dbf0ed173a0e2 100644 --- a/test/ModuleInterface/opaque-result-types.swift +++ b/test/ModuleInterface/opaque-result-types.swift @@ -2,7 +2,7 @@ // RUN: %target-swift-emit-module-interface(%t/OpaqueResultTypes.swiftinterface) %s -module-name OpaqueResultTypes // RUN: %target-swift-typecheck-module-from-interface(%t/OpaqueResultTypes.swiftinterface) -module-name OpaqueResultTypes // RUN: %FileCheck %s < %t/OpaqueResultTypes.swiftinterface -// RUN: %target-swift-frontend -I %t -typecheck -verify %S/Inputs/opaque-result-types-client.swift +// RUN: %target-swift-frontend -I %t -typecheck -verify -verify-ignore-unrelated %S/Inputs/opaque-result-types-client.swift public protocol Foo {} extension Int: Foo {} diff --git a/test/NameLookup/accessibility.swift b/test/NameLookup/accessibility.swift index 4c3524ed5860a..b0251346452bf 100644 --- a/test/NameLookup/accessibility.swift +++ b/test/NameLookup/accessibility.swift @@ -2,7 +2,7 @@ // RUN: cp %s %t/main.swift // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/has_accessibility.swift -D DEFINE_VAR_FOR_SCOPED_IMPORT -enable-testing -// RUN: %target-swift-frontend -typecheck -primary-file %t/main.swift %S/Inputs/accessibility_other.swift -module-name accessibility -I %t -sdk "" -enable-access-control -verify -verify-ignore-unknown +// RUN: %target-swift-frontend -typecheck -primary-file %t/main.swift %S/Inputs/accessibility_other.swift -module-name accessibility -I %t -sdk "" -enable-access-control -verify -verify-ignore-unrelated -verify-ignore-unknown // RUN: %target-swift-frontend -typecheck -primary-file %t/main.swift %S/Inputs/accessibility_other.swift -module-name accessibility -I %t -sdk "" -disable-access-control -D ACCESS_DISABLED // RUN: not %target-swift-frontend -typecheck -primary-file %t/main.swift %S/Inputs/accessibility_other.swift -module-name accessibility -I %t -sdk "" -D TESTABLE 2>&1 | %FileCheck -check-prefix=TESTABLE %s diff --git a/test/NameLookup/custom_attrs_ambiguous.swift b/test/NameLookup/custom_attrs_ambiguous.swift index 6512e44d610bf..cae1d394cb1fe 100644 --- a/test/NameLookup/custom_attrs_ambiguous.swift +++ b/test/NameLookup/custom_attrs_ambiguous.swift @@ -1,7 +1,7 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module -I %t -o %t %S/Inputs/custom_attrs_A.swift // RUN: %target-swift-frontend -emit-module -I %t -o %t %S/Inputs/custom_attrs_B.swift -// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unknown -I %t %s +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -verify-ignore-unknown -I %t %s import custom_attrs_A import custom_attrs_B diff --git a/test/NameLookup/library.swift b/test/NameLookup/library.swift index 5b85f5e7923f3..610ae0c958194 100644 --- a/test/NameLookup/library.swift +++ b/test/NameLookup/library.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -I %S/Inputs -enable-source-import -parse-as-library -verify +// RUN: %target-swift-frontend -typecheck %s -I %S/Inputs -enable-source-import -parse-as-library -verify -verify-ignore-unrelated // Name lookup is global in a library. var x : x_ty = 4 diff --git a/test/NameLookup/member_import_visibility.swift b/test/NameLookup/member_import_visibility.swift index 5e23718056901..bdd2d5833cd0a 100644 --- a/test/NameLookup/member_import_visibility.swift +++ b/test/NameLookup/member_import_visibility.swift @@ -2,9 +2,9 @@ // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/MemberImportVisibility/members_A.swift // RUN: %target-swift-frontend -emit-module -I %t -o %t -package-name TestPackage %S/Inputs/MemberImportVisibility/members_B.swift // RUN: %target-swift-frontend -emit-module -I %t -o %t %S/Inputs/MemberImportVisibility/members_C.swift -// RUN: %target-swift-frontend -typecheck %s -I %t -verify -swift-version 5 -package-name TestPackage -verify-additional-prefix ambiguity- -// RUN: %target-swift-frontend -typecheck %s -I %t -verify -swift-version 6 -package-name TestPackage -verify-additional-prefix ambiguity- -// RUN: %target-swift-frontend -typecheck %s -I %t -verify -swift-version 5 -package-name TestPackage -enable-upcoming-feature MemberImportVisibility -verify-additional-prefix member-visibility- +// RUN: %target-swift-frontend -typecheck %s -I %t -verify -verify-ignore-unrelated -swift-version 5 -package-name TestPackage -verify-additional-prefix ambiguity- +// RUN: %target-swift-frontend -typecheck %s -I %t -verify -verify-ignore-unrelated -swift-version 6 -package-name TestPackage -verify-additional-prefix ambiguity- +// RUN: %target-swift-frontend -typecheck %s -I %t -verify -verify-ignore-unrelated -swift-version 5 -package-name TestPackage -enable-upcoming-feature MemberImportVisibility -verify-additional-prefix member-visibility- // REQUIRES: swift_feature_MemberImportVisibility diff --git a/test/NameLookup/member_import_visibility_multifile.swift b/test/NameLookup/member_import_visibility_multifile.swift index 4a37c69759ecf..1e5b873bbd4c6 100644 --- a/test/NameLookup/member_import_visibility_multifile.swift +++ b/test/NameLookup/member_import_visibility_multifile.swift @@ -3,9 +3,9 @@ // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/MemberImportVisibility/members_A.swift // RUN: %target-swift-frontend -emit-module -I %t -o %t -package-name TestPackage %S/Inputs/MemberImportVisibility/members_B.swift // RUN: %target-swift-frontend -emit-module -I %t -o %t %S/Inputs/MemberImportVisibility/members_C.swift -// RUN: %target-swift-frontend -typecheck -primary-file %t/main.swift %t/A.swift %t/B.swift %t/C.swift -I %t -verify -swift-version 5 -// RUN: %target-swift-frontend -typecheck -primary-file %t/main.swift %t/A.swift %t/B.swift %t/C.swift -I %t -verify -swift-version 6 -// RUN: %target-swift-frontend -typecheck -primary-file %t/main.swift %t/A.swift %t/B.swift %t/C.swift -I %t -verify -swift-version 5 -enable-upcoming-feature MemberImportVisibility -verify-additional-prefix member-visibility- +// RUN: %target-swift-frontend -typecheck -primary-file %t/main.swift %t/A.swift %t/B.swift %t/C.swift -I %t -verify -verify-ignore-unrelated -swift-version 5 +// RUN: %target-swift-frontend -typecheck -primary-file %t/main.swift %t/A.swift %t/B.swift %t/C.swift -I %t -verify -verify-ignore-unrelated -swift-version 6 +// RUN: %target-swift-frontend -typecheck -primary-file %t/main.swift %t/A.swift %t/B.swift %t/C.swift -I %t -verify -verify-ignore-unrelated -swift-version 5 -enable-upcoming-feature MemberImportVisibility -verify-additional-prefix member-visibility- // REQUIRES: swift_feature_MemberImportVisibility diff --git a/test/NameLookup/member_import_visibility_objc.swift b/test/NameLookup/member_import_visibility_objc.swift index cb624b3088a33..a12bb890a7c35 100644 --- a/test/NameLookup/member_import_visibility_objc.swift +++ b/test/NameLookup/member_import_visibility_objc.swift @@ -3,9 +3,9 @@ // RUN: %target-swift-frontend -emit-module -I %t -I %S/Inputs/MemberImportVisibility -o %t %S/Inputs/MemberImportVisibility/Categories_B.swift // RUN: %target-swift-frontend -emit-module -I %t -I %S/Inputs/MemberImportVisibility -o %t %S/Inputs/MemberImportVisibility/Categories_C.swift // RUN: %target-swift-frontend -emit-module -I %t -I %S/Inputs/MemberImportVisibility -o %t %S/Inputs/MemberImportVisibility/Categories_E.swift -// RUN: %target-swift-frontend -typecheck %s -I %t -I %S/Inputs/MemberImportVisibility -import-objc-header %S/Inputs/MemberImportVisibility/Bridging.h -verify -swift-version 5 -verify-additional-prefix no-member-visibility- -// RUN: %target-swift-frontend -typecheck %s -I %t -I %S/Inputs/MemberImportVisibility -import-objc-header %S/Inputs/MemberImportVisibility/Bridging.h -verify -swift-version 6 -verify-additional-prefix no-member-visibility- -// RUN: %target-swift-frontend -typecheck %s -I %t -I %S/Inputs/MemberImportVisibility -import-objc-header %S/Inputs/MemberImportVisibility/Bridging.h -verify -swift-version 5 -enable-upcoming-feature MemberImportVisibility -verify-additional-prefix member-visibility- +// RUN: %target-swift-frontend -typecheck %s -I %t -I %S/Inputs/MemberImportVisibility -import-objc-header %S/Inputs/MemberImportVisibility/Bridging.h -verify -verify-ignore-unrelated -swift-version 5 -verify-additional-prefix no-member-visibility- +// RUN: %target-swift-frontend -typecheck %s -I %t -I %S/Inputs/MemberImportVisibility -import-objc-header %S/Inputs/MemberImportVisibility/Bridging.h -verify -verify-ignore-unrelated -swift-version 6 -verify-additional-prefix no-member-visibility- +// RUN: %target-swift-frontend -typecheck %s -I %t -I %S/Inputs/MemberImportVisibility -import-objc-header %S/Inputs/MemberImportVisibility/Bridging.h -verify -verify-ignore-unrelated -swift-version 5 -enable-upcoming-feature MemberImportVisibility -verify-additional-prefix member-visibility- // REQUIRES: objc_interop // REQUIRES: swift_feature_MemberImportVisibility diff --git a/test/NameLookup/name_lookup2.swift b/test/NameLookup/name_lookup2.swift index b188d6097ec26..a7f4177d1ada9 100644 --- a/test/NameLookup/name_lookup2.swift +++ b/test/NameLookup/name_lookup2.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -module-name themodule -enable-source-import -I %S/../decl/enum -sdk "" -verify -show-diagnostics-after-fatal -verify-ignore-unknown +// RUN: %target-swift-frontend -typecheck %s -module-name themodule -enable-source-import -I %S/../decl/enum -sdk "" -verify -verify-ignore-unrelated -show-diagnostics-after-fatal -verify-ignore-unknown // -verify-ignore-unknown is for // :0: error: unexpected note produced: did you forget to set an SDK using -sdk or SDKROOT? diff --git a/test/NameLookup/name_lookup_min_max_conditional_conformance.swift b/test/NameLookup/name_lookup_min_max_conditional_conformance.swift index e79212e6aa318..4bc0c144bd6e5 100644 --- a/test/NameLookup/name_lookup_min_max_conditional_conformance.swift +++ b/test/NameLookup/name_lookup_min_max_conditional_conformance.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated extension Range { func f(_ value: Bound) -> Bound { diff --git a/test/NameLookup/private_import.swift b/test/NameLookup/private_import.swift index e9f2a881e9910..d0ce3c246f91d 100644 --- a/test/NameLookup/private_import.swift +++ b/test/NameLookup/private_import.swift @@ -30,7 +30,7 @@ // RUN: %target-swift-frontend -emit-module -module-name Host -I %t -emit-module-path %t/Host.swiftmodule -enable-private-imports %s %S/Inputs/private_import/Host.swift // Build a thunk for the host module. -// RUN: %target-typecheck-verify-swift -parse-as-library -I %t -DCOMPILING_THUNK +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -parse-as-library -I %t -DCOMPILING_THUNK #if COMPILING_THUNK @_private(sourceFile: "private_import.swift") import Host diff --git a/test/Parse/confusables.swift b/test/Parse/confusables.swift index a7d8179c3e141..db799c29a82e3 100644 --- a/test/Parse/confusables.swift +++ b/test/Parse/confusables.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated // expected-error @+4 {{type annotation missing in pattern}} // expected-error @+3 {{cannot find operator '⁚' in scope}} diff --git a/test/Parse/coroutine_accessors.swift b/test/Parse/coroutine_accessors.swift index 66430049e2f9d..105d00544bf67 100644 --- a/test/Parse/coroutine_accessors.swift +++ b/test/Parse/coroutine_accessors.swift @@ -1,8 +1,8 @@ -// RUN: %target-typecheck-verify-swift \ +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated \ // RUN: -verify-additional-prefix enabled- \ // RUN: -enable-experimental-feature CoroutineAccessors \ // RUN: -debug-diagnostic-names -// RUN: %target-typecheck-verify-swift \ +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated \ // RUN: -verify-additional-prefix disabled- \ // RUN: -debug-diagnostic-names diff --git a/test/Parse/enum.swift b/test/Parse/enum.swift index 20718eb71334b..6455cf7859550 100644 --- a/test/Parse/enum.swift +++ b/test/Parse/enum.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated enum Empty {} diff --git a/test/Parse/enum_floating_point_raw_value.swift b/test/Parse/enum_floating_point_raw_value.swift index 27fd8a8724aff..79db4d7c9affb 100644 --- a/test/Parse/enum_floating_point_raw_value.swift +++ b/test/Parse/enum_floating_point_raw_value.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated // FIXME: this test only passes on platforms which have Float80. // Floating point enum raw values are not portable diff --git a/test/Parse/identifiers.swift b/test/Parse/identifiers.swift index 7971687dc4f9a..20ac28629be30 100644 --- a/test/Parse/identifiers.swift +++ b/test/Parse/identifiers.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated func my_print(_ t: T) {} diff --git a/test/Parse/invalid.swift b/test/Parse/invalid.swift index 443ba558ce098..766c4e52fc2df 100644 --- a/test/Parse/invalid.swift +++ b/test/Parse/invalid.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated // REQUIRES: swift_swift_parser // FIXME: Swift parser is not enabled on Linux CI yet. // REQUIRES: OS=macosx diff --git a/test/Parse/objc_enum.swift b/test/Parse/objc_enum.swift index 558a605e19e25..b6c5237daf2b4 100644 --- a/test/Parse/objc_enum.swift +++ b/test/Parse/objc_enum.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-objc-interop +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-objc-interop @objc enum Foo: Int32 { case Zim, Zang, Zung diff --git a/test/Parse/pointer_conversion.swift.gyb b/test/Parse/pointer_conversion.swift.gyb index 9e2efd2b1094d..9a122f4edb357 100644 --- a/test/Parse/pointer_conversion.swift.gyb +++ b/test/Parse/pointer_conversion.swift.gyb @@ -1,13 +1,13 @@ // RUN: %empty-directory(%t) // RUN: %gyb -DOPT_KIND=None %s -o %t/pointer_conversion.swift -// RUN: %line-directive %t/pointer_conversion.swift -- %target-swift-frontend -typecheck -verify %t/pointer_conversion.swift +// RUN: %line-directive %t/pointer_conversion.swift -- %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/pointer_conversion.swift // RUN: %gyb -DOPT_KIND=Optional %s -o %t/pointer_conversion_opt.swift -// RUN: %line-directive %t/pointer_conversion_opt.swift -- %target-swift-frontend -typecheck -verify %t/pointer_conversion_opt.swift +// RUN: %line-directive %t/pointer_conversion_opt.swift -- %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/pointer_conversion_opt.swift // RUN: %gyb -DOPT_KIND=ImplicitlyUnwrappedOptional %s -o %t/pointer_conversion_iuo.swift -// RUN: %line-directive %t/pointer_conversion_iuo.swift -- %target-swift-frontend -typecheck -verify %t/pointer_conversion_iuo.swift +// RUN: %line-directive %t/pointer_conversion_iuo.swift -- %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/pointer_conversion_iuo.swift %{ if OPT_KIND == 'Optional': diff --git a/test/Parse/recovery.swift b/test/Parse/recovery.swift index 665140a429e47..c79310410deda 100644 --- a/test/Parse/recovery.swift +++ b/test/Parse/recovery.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated //===--- Helper types used in this file. diff --git a/test/SILOptimizer/moveonly_builtins.swift b/test/SILOptimizer/moveonly_builtins.swift index 12bdd86bcfe7f..5ba65aada7e07 100644 --- a/test/SILOptimizer/moveonly_builtins.swift +++ b/test/SILOptimizer/moveonly_builtins.swift @@ -1,8 +1,8 @@ -// RUN: %target-swift-frontend-typecheck -verify %s -DILLEGAL \ +// RUN: %target-swift-frontend-typecheck -verify -verify-ignore-unrelated %s -DILLEGAL \ // RUN: -enable-builtin-module \ // RUN: -verify-additional-prefix illegal- -// RUN: %target-swift-frontend -emit-sil -sil-verify-all -verify %s \ +// RUN: %target-swift-frontend -emit-sil -sil-verify-all -verify -verify-ignore-unrelated %s \ // RUN: -enable-builtin-module import Builtin diff --git a/test/SPI/client_reuse_spi.swift b/test/SPI/client_reuse_spi.swift index b23a64102f92d..e5c7048641f8a 100644 --- a/test/SPI/client_reuse_spi.swift +++ b/test/SPI/client_reuse_spi.swift @@ -4,7 +4,7 @@ // RUN: split-file %s %t // RUN: %target-swift-frontend -emit-module %t/A.swift -module-name A -emit-module-path %t/A.swiftmodule // RUN: %target-swift-frontend -emit-module %t/B.swift -module-name B -emit-module-path %t/B.swiftmodule -I %t -// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unknown %t/C.swift -I %t +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -verify-ignore-unknown %t/C.swift -I %t //--- A.swift @_spi(A) public struct SecretStruct { diff --git a/test/SPI/implementation_only_spi_import.swift b/test/SPI/implementation_only_spi_import.swift index 58721566c5de4..a9865a0ad5974 100644 --- a/test/SPI/implementation_only_spi_import.swift +++ b/test/SPI/implementation_only_spi_import.swift @@ -4,7 +4,7 @@ // RUN: %target-swift-frontend -emit-module -DLIB_A %s -module-name A -emit-module-path %t/A.swiftmodule // RUN: %target-swift-frontend -emit-module -DLIB_B %s -module-name B -emit-module-path %t/B.swiftmodule -I %t // RUN: rm %t/A.swiftmodule -// RUN: %target-swift-frontend -typecheck -verify -DLIB_C %s -I %t +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -DLIB_C %s -I %t #if LIB_A diff --git a/test/SPI/implementation_only_spi_import_exposability.swift b/test/SPI/implementation_only_spi_import_exposability.swift index de3354d7303da..b62354a15e1af 100644 --- a/test/SPI/implementation_only_spi_import_exposability.swift +++ b/test/SPI/implementation_only_spi_import_exposability.swift @@ -3,7 +3,7 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module -DLIB %s -module-name Lib -emit-module-path %t/Lib.swiftmodule \ // RUN: -swift-version 5 -enable-library-evolution -// RUN: %target-typecheck-verify-swift -DCLIENT -I %t \ +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -DCLIENT -I %t \ // RUN: -swift-version 5 -enable-library-evolution #if LIB diff --git a/test/SPI/implicit_spi_import.swift b/test/SPI/implicit_spi_import.swift index c10dee0443af0..93f77aa59cb26 100644 --- a/test/SPI/implicit_spi_import.swift +++ b/test/SPI/implicit_spi_import.swift @@ -8,14 +8,14 @@ // RUN: -emit-module-interface-path %t/Lib.swiftinterface \ // RUN: -emit-private-module-interface-path %t/Lib.private.swiftinterface -// RUN: %target-swift-frontend -typecheck -verify %t/ClientA.swift -I %t -// RUN: %target-swift-frontend -typecheck -verify %t/ClientB.swift -I %t -// RUN: %target-swift-frontend -typecheck -verify %t/ClientC.swift -I %t +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/ClientA.swift -I %t +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/ClientB.swift -I %t +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/ClientC.swift -I %t // RUN: rm %t/Lib.swiftmodule -// RUN: %target-swift-frontend -typecheck -verify %t/ClientA.swift -I %t -// RUN: %target-swift-frontend -typecheck -verify %t/ClientB.swift -I %t -// RUN: %target-swift-frontend -typecheck -verify %t/ClientC.swift -I %t +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/ClientA.swift -I %t +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/ClientB.swift -I %t +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/ClientC.swift -I %t // RUN: %target-swift-frontend -emit-module %t/ClientA.swift \ // RUN: -module-name ClientA -swift-version 5 -I %t \ diff --git a/test/SPI/private-import-access-spi.swift b/test/SPI/private-import-access-spi.swift index 763822c3b2224..ad6d7d68e9243 100644 --- a/test/SPI/private-import-access-spi.swift +++ b/test/SPI/private-import-access-spi.swift @@ -11,10 +11,10 @@ // RUN: -enable-private-imports /// Typecheck a @_private client. -// RUN: %target-swift-frontend -typecheck -verify -I %t %t/PrivateClient.swift +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %t %t/PrivateClient.swift /// Typecheck a regular client building against the same Lib with private imports enabled. -// RUN: %target-swift-frontend -typecheck -verify -I %t %t/RegularClient.swift +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %t %t/RegularClient.swift //--- Lib_FileA.swift @_spi(S) public func spiFuncA() {} diff --git a/test/SPI/public_client.swift b/test/SPI/public_client.swift index 20bb56a12cbf9..7c59617e4c02e 100644 --- a/test/SPI/public_client.swift +++ b/test/SPI/public_client.swift @@ -6,11 +6,11 @@ // RUN: %target-swift-frontend -emit-module %S/Inputs/spi_helper.swift -module-name SPIHelper -emit-module-path %t/SPIHelper.swiftmodule -emit-module-interface-path %t/SPIHelper.swiftinterface -emit-private-module-interface-path %t/SPIHelper.private.swiftinterface -enable-library-evolution -swift-version 5 -parse-as-library /// Reading from swiftmodule -// RUN: %target-typecheck-verify-swift -I %t -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %t -verify-ignore-unknown /// Reading from .private.swiftinterface // RUN: rm %t/SPIHelper.swiftmodule -// RUN: %target-typecheck-verify-swift -I %t -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %t -verify-ignore-unknown /// Reading from the public .swiftinterface should raise errors on missing /// declarations. diff --git a/test/SPI/reexported-spi-groups.swift b/test/SPI/reexported-spi-groups.swift index 8b14766ee2fe0..665a07502069a 100644 --- a/test/SPI/reexported-spi-groups.swift +++ b/test/SPI/reexported-spi-groups.swift @@ -53,30 +53,30 @@ /// Test diagnostics of a multifile client // RUN: %target-swift-frontend -typecheck \ // RUN: %t/Client_FileA.swift %t/Client_FileB.swift\ -// RUN: -swift-version 5 -I %t -verify +// RUN: -swift-version 5 -I %t -verify -verify-ignore-unrelated /// SPIs are now reexported by any `@_exported` from Swift modules, no matter /// if `export_as` is present or not. // RUN: %target-swift-frontend -typecheck \ // RUN: %t/NonExportedAsClient.swift \ -// RUN: -swift-version 5 -I %t -verify +// RUN: -swift-version 5 -I %t -verify -verify-ignore-unrelated /// Test that SPIs don't leak when not reexported // RUN: %target-swift-frontend -typecheck \ // RUN: %t/NonExporterClient.swift \ -// RUN: -swift-version 5 -I %t -verify +// RUN: -swift-version 5 -I %t -verify -verify-ignore-unrelated /// Test diagnostics against private swiftinterfaces // RUN: rm %t/Exported.swiftmodule %t/Exporter.swiftmodule // RUN: %target-swift-frontend -typecheck \ // RUN: %t/Client_FileA.swift %t/Client_FileB.swift\ -// RUN: -swift-version 5 -I %t -verify +// RUN: -swift-version 5 -I %t -verify -verify-ignore-unrelated /// Test diagnostics against public swiftinterfaces // RUN: rm %t/Exported.private.swiftinterface %t/Exporter.private.swiftinterface // RUN: %target-swift-frontend -typecheck \ // RUN: %t/PublicClient.swift \ -// RUN: -swift-version 5 -I %t -verify +// RUN: -swift-version 5 -I %t -verify -verify-ignore-unrelated //--- module.modulemap module Exported { diff --git a/test/SPI/report-ioi-in-spi.swift b/test/SPI/report-ioi-in-spi.swift index 9f562d9845e50..b858382b6d4cf 100644 --- a/test/SPI/report-ioi-in-spi.swift +++ b/test/SPI/report-ioi-in-spi.swift @@ -9,13 +9,13 @@ /// Use of IOI types in SPI signatures is an error with -experimental-spi-only-imports // RUN: %target-swift-frontend -emit-module %t/ClientSPIOnlyMode.swift -I %t \ // RUN: -enable-library-evolution \ -// RUN: -swift-version 5 -verify \ +// RUN: -swift-version 5 -verify -verify-ignore-unrelated \ // RUN: -experimental-spi-only-imports /// Use of IOI types in SPI signatures is a warning without -experimental-spi-only-imports // RUN: %target-swift-frontend -emit-module %t/ClientDefaultMode.swift -I %t \ // RUN: -enable-library-evolution \ -// RUN: -swift-version 5 -verify +// RUN: -swift-version 5 -verify -verify-ignore-unrelated //--- Lib.swift diff --git a/test/SPI/spi-only-and-library-level.swift b/test/SPI/spi-only-and-library-level.swift index be904e2d65c6e..e9f02c4e027d2 100644 --- a/test/SPI/spi-only-and-library-level.swift +++ b/test/SPI/spi-only-and-library-level.swift @@ -5,16 +5,16 @@ // RUN: -module-name Lib -emit-module-path %t/Lib.swiftmodule \ // RUN: -swift-version 5 // RUN: %target-swift-frontend -emit-module %t/APILib.swift -I %t \ -// RUN: -swift-version 5 -verify \ +// RUN: -swift-version 5 -verify -verify-ignore-unrelated \ // RUN: -experimental-spi-only-imports \ // RUN: -library-level api \ // RUN: -require-explicit-availability=ignore // RUN: %target-swift-frontend -emit-module %t/SPILib.swift -I %t \ -// RUN: -swift-version 5 -verify \ +// RUN: -swift-version 5 -verify -verify-ignore-unrelated \ // RUN: -experimental-spi-only-imports \ // RUN: -library-level spi // RUN: %target-swift-frontend -emit-module %t/OtherLib.swift -I %t \ -// RUN: -swift-version 5 -verify \ +// RUN: -swift-version 5 -verify -verify-ignore-unrelated \ // RUN: -experimental-spi-only-imports //--- Lib.swift diff --git a/test/SPI/spi-only-import-exportability.swift b/test/SPI/spi-only-import-exportability.swift index d2ef28d3b4a57..27a285e781bb2 100644 --- a/test/SPI/spi-only-import-exportability.swift +++ b/test/SPI/spi-only-import-exportability.swift @@ -13,9 +13,9 @@ // RUN: -swift-version 5 -enable-library-evolution -I %t /// Test the client. -// RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t -verify \ +// RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t -verify -verify-ignore-unrelated \ // RUN: -experimental-spi-only-imports -// RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t -verify \ +// RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t -verify -verify-ignore-unrelated \ // RUN: -experimental-spi-only-imports \ // RUN: -enable-library-evolution diff --git a/test/SPI/spi_client.swift b/test/SPI/spi_client.swift index f8f47c6187b79..574ff2569251f 100644 --- a/test/SPI/spi_client.swift +++ b/test/SPI/spi_client.swift @@ -6,11 +6,11 @@ // RUN: %target-swift-frontend -emit-module %S/Inputs/spi_helper.swift -module-name SPIHelper -emit-module-path %t/SPIHelper.swiftmodule -emit-module-interface-path %t/SPIHelper.swiftinterface -emit-private-module-interface-path %t/SPIHelper.private.swiftinterface -enable-library-evolution -swift-version 5 -parse-as-library /// Reading from swiftmodule -// RUN: %target-typecheck-verify-swift -I %t -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %t -verify-ignore-unknown /// Reading from .private.swiftinterface // RUN: rm %t/SPIHelper.swiftmodule -// RUN: %target-typecheck-verify-swift -I %t -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %t -verify-ignore-unknown //// Reading from .swiftinterface should fail as it won't find the decls // RUN: rm %t/SPIHelper.private.swiftinterface diff --git a/test/Sema/access-level-import-classic-exportability.swift b/test/Sema/access-level-import-classic-exportability.swift index 4720bc8f6f9bf..c59424187f4ab 100644 --- a/test/Sema/access-level-import-classic-exportability.swift +++ b/test/Sema/access-level-import-classic-exportability.swift @@ -16,13 +16,13 @@ /// Check diagnostics. // RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t \ // RUN: -package-name TestPackage -swift-version 5 \ -// RUN: -enable-experimental-feature AccessLevelOnImport -verify +// RUN: -enable-experimental-feature AccessLevelOnImport -verify -verify-ignore-unrelated /// Check diagnostics with library-evolution. // RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t \ // RUN: -package-name TestPackage -swift-version 5 \ // RUN: -enable-library-evolution \ -// RUN: -enable-experimental-feature AccessLevelOnImport -verify +// RUN: -enable-experimental-feature AccessLevelOnImport -verify -verify-ignore-unrelated // REQUIRES: swift_feature_AccessLevelOnImport diff --git a/test/Sema/access-level-import-conforming-types.swift b/test/Sema/access-level-import-conforming-types.swift index ca417cc06426e..b19e298b30324 100644 --- a/test/Sema/access-level-import-conforming-types.swift +++ b/test/Sema/access-level-import-conforming-types.swift @@ -8,9 +8,9 @@ // RUN: %S/Inputs/implementation-only-import-in-decls-helper.swift -I %t \ // RUN: -enable-library-evolution -swift-version 5 -// RUN: %target-typecheck-verify-swift -I %t \ +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %t \ // RUN: -swift-version 5 -package-name pkg -enable-library-evolution -// RUN: %target-typecheck-verify-swift -I %t \ +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %t \ // RUN: -swift-version 5 -package-name pkg internal import BADLibrary // expected-note 9 {{protocol 'BadProto' imported as 'internal' from 'BADLibrary' here}} diff --git a/test/Sema/access-level-import-diag-priority.swift b/test/Sema/access-level-import-diag-priority.swift index fe127f3b351d5..39c88631612bb 100644 --- a/test/Sema/access-level-import-diag-priority.swift +++ b/test/Sema/access-level-import-diag-priority.swift @@ -14,11 +14,11 @@ /// Check diagnostics. // RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t \ -// RUN: -package-name pkg -verify +// RUN: -package-name pkg -verify -verify-ignore-unrelated // RUN: %target-swift-frontend -typecheck %t/PackageTypeImportedAsPackageClient.swift -I %t \ -// RUN: -package-name pkg -verify +// RUN: -package-name pkg -verify -verify-ignore-unrelated // RUN: %target-swift-frontend -typecheck %t/LocalVsImportClient.swift -I %t \ -// RUN: -package-name pkg -verify +// RUN: -package-name pkg -verify -verify-ignore-unrelated //--- PublicLib.swift public struct PublicImportType {} diff --git a/test/Sema/access-level-import-exportability.swift b/test/Sema/access-level-import-exportability.swift index 68f0dc2116cf1..d40af48a650ac 100644 --- a/test/Sema/access-level-import-exportability.swift +++ b/test/Sema/access-level-import-exportability.swift @@ -15,17 +15,17 @@ /// Check diagnostics. // RUN: %target-swift-frontend -typecheck %t/MinimalClient.swift -I %t \ -// RUN: -package-name TestPackage -swift-version 5 -verify +// RUN: -package-name TestPackage -swift-version 5 -verify -verify-ignore-unrelated // RUN: %target-swift-frontend -typecheck %t/CompletenessClient.swift -I %t \ -// RUN: -package-name TestPackage -swift-version 5 -verify +// RUN: -package-name TestPackage -swift-version 5 -verify -verify-ignore-unrelated /// Check diagnostics with library-evolution. // RUN: %target-swift-frontend -typecheck %t/MinimalClient.swift -I %t \ // RUN: -package-name TestPackage -swift-version 5 \ -// RUN: -enable-library-evolution -verify +// RUN: -enable-library-evolution -verify -verify-ignore-unrelated // RUN: %target-swift-frontend -typecheck %t/CompletenessClient.swift -I %t \ // RUN: -package-name TestPackage -swift-version 5 \ -// RUN: -enable-library-evolution -verify +// RUN: -enable-library-evolution -verify -verify-ignore-unrelated //--- PublicLib.swift public protocol PublicImportProto { diff --git a/test/Sema/access-level-import-inlinable.swift b/test/Sema/access-level-import-inlinable.swift index 78fed01e4ad73..c54abd6f68d37 100644 --- a/test/Sema/access-level-import-inlinable.swift +++ b/test/Sema/access-level-import-inlinable.swift @@ -18,7 +18,7 @@ /// Check diagnostics. // RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t \ -// RUN: -enable-library-evolution -swift-version 5 -verify \ +// RUN: -enable-library-evolution -swift-version 5 -verify -verify-ignore-unrelated \ // RUN: -package-name package //--- PublicLib.swift diff --git a/test/Sema/access-level-import-typealias.swift b/test/Sema/access-level-import-typealias.swift index d13f0b50f46ef..064464f128fcf 100644 --- a/test/Sema/access-level-import-typealias.swift +++ b/test/Sema/access-level-import-typealias.swift @@ -7,9 +7,9 @@ // RUN: %target-swift-emit-module-interface(%t/Aliases.swiftinterface) %t/Aliases.swift -I %t // RUN: %target-swift-typecheck-module-from-interface(%t/Aliases.swiftinterface) -I %t -// RUN: %target-swift-frontend -typecheck -verify %t/UsesAliasesNoImport.swift -I %t \ +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/UsesAliasesNoImport.swift -I %t \ // RUN: -swift-version 5 -enable-library-evolution -// RUN: %target-swift-frontend -typecheck -verify %t/UsesAliasesNoImport.swift -I %t \ +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/UsesAliasesNoImport.swift -I %t \ // RUN: -swift-version 5 -enable-library-evolution \ // RUN: -enable-upcoming-feature InternalImportsByDefault diff --git a/test/Sema/accessibility.swift b/test/Sema/accessibility.swift index a766532be8c1b..49d28c12edbdc 100644 --- a/test/Sema/accessibility.swift +++ b/test/Sema/accessibility.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-objc-interop -disable-objc-attr-requires-foundation-module -swift-version 5 -package-name mylib +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-objc-interop -disable-objc-attr-requires-foundation-module -swift-version 5 -package-name mylib /// Test structs with protocols and extensions public protocol PublicProto { diff --git a/test/Sema/accessibility_multi_module.swift b/test/Sema/accessibility_multi_module.swift index 610da6b7043b1..75cd815dfbfb5 100644 --- a/test/Sema/accessibility_multi_module.swift +++ b/test/Sema/accessibility_multi_module.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module -primary-file %S/Inputs/accessibility_multi_other_module.swift -emit-module-path %t/accessibility_multi_other_module.swiftmodule -// RUN: %target-swift-frontend -typecheck -I %t -primary-file %s -verify -verify-ignore-unknown +// RUN: %target-swift-frontend -typecheck -I %t -primary-file %s -verify -verify-ignore-unrelated -verify-ignore-unknown import accessibility_multi_other_module diff --git a/test/Sema/accessibility_package.swift b/test/Sema/accessibility_package.swift index b3254d3fda15a..13234b392b3ff 100644 --- a/test/Sema/accessibility_package.swift +++ b/test/Sema/accessibility_package.swift @@ -1,16 +1,16 @@ // RUN: %empty-directory(%t) // RUN: split-file %s %t -// RUN: %target-swift-frontend -verify -module-name Utils %t/Utils.swift -emit-module -emit-module-path %t/Utils.swiftmodule -package-name myLib +// RUN: %target-swift-frontend -verify -verify-ignore-unrelated -module-name Utils %t/Utils.swift -emit-module -emit-module-path %t/Utils.swiftmodule -package-name myLib // RUN: test -f %t/Utils.swiftmodule -// RUN: %target-swift-frontend -verify -module-name LibGood %t/LibGood.swift -emit-module -emit-module-path %t/LibGood.swiftmodule -package-name myLib -I %t +// RUN: %target-swift-frontend -verify -verify-ignore-unrelated -module-name LibGood %t/LibGood.swift -emit-module -emit-module-path %t/LibGood.swiftmodule -package-name myLib -I %t // RUN: test -f %t/LibGood.swiftmodule -// RUN: %target-swift-frontend -verify -module-name Client %t/Client.swift -emit-module -emit-module-path %t/Client.swiftmodule -package-name client -I %t +// RUN: %target-swift-frontend -verify -verify-ignore-unrelated -module-name Client %t/Client.swift -emit-module -emit-module-path %t/Client.swiftmodule -package-name client -I %t -// RUN: %target-swift-frontend -typecheck -verify %t/LibSamePackage.swift -package-name myLib -I %t -// RUN: %target-swift-frontend -typecheck -verify %t/LibOtherPackage.swift -package-name "otherLib" -I %t +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/LibSamePackage.swift -package-name myLib -I %t +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/LibOtherPackage.swift -package-name "otherLib" -I %t //--- Utils.swift package protocol PackageProto { diff --git a/test/Sema/accessibility_package_import_interface.swift b/test/Sema/accessibility_package_import_interface.swift index 58def57073665..01d5065c09af0 100644 --- a/test/Sema/accessibility_package_import_interface.swift +++ b/test/Sema/accessibility_package_import_interface.swift @@ -44,7 +44,7 @@ // CHECK-DEP-INTER-BC: blob data = 'myPkg' // TEST Lib should error on loading Dep built from interface and accessing package symbols (unless usableFromInline or inlinable) -// RUN: %target-swift-frontend -typecheck %t/Lib.swift -package-name myPkg -I %t -verify +// RUN: %target-swift-frontend -typecheck %t/Lib.swift -package-name myPkg -I %t -verify -verify-ignore-unrelated // TEST Remove and rebuild Dep from source // RUN: rm %t/Dep.swiftmodule @@ -64,7 +64,7 @@ // RUN: -emit-private-module-interface-path %t/LibPass.private.swiftinterface // TEST Loading LibPass and accessing lib func should pass -// RUN: %target-swift-frontend -typecheck %t/Client.swift -package-name myPkg -I %t -verify +// RUN: %target-swift-frontend -typecheck %t/Client.swift -package-name myPkg -I %t -verify -verify-ignore-unrelated // TEST Building LibPass from interface with Dep (built from interface) should succeed with or without package name // Without package name diff --git a/test/Sema/accessibility_private.swift b/test/Sema/accessibility_private.swift index 2d3f5c80b1463..df6e7ac3fb00f 100644 --- a/test/Sema/accessibility_private.swift +++ b/test/Sema/accessibility_private.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -swift-version 4 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 4 class Container { private func foo() {} // expected-note * {{declared here}} diff --git a/test/Sema/atomic-diagnose-var.swift b/test/Sema/atomic-diagnose-var.swift index ad70124221e51..4e68d947c7211 100644 --- a/test/Sema/atomic-diagnose-var.swift +++ b/test/Sema/atomic-diagnose-var.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -disable-availability-checking +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -disable-availability-checking // REQUIRES: synchronization import Synchronization diff --git a/test/Sema/bitwise_copyable.swift b/test/Sema/bitwise_copyable.swift index 87c07e87fe84b..4ef9b6712a53b 100644 --- a/test/Sema/bitwise_copyable.swift +++ b/test/Sema/bitwise_copyable.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift \ +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated \ // RUN: -disable-availability-checking \ // RUN: -enable-experimental-feature Sensitive \ // RUN: -enable-experimental-feature LifetimeDependence \ diff --git a/test/Sema/bitwise_copyable_2.swift b/test/Sema/bitwise_copyable_2.swift index b380bc84ea8cb..5a8e3eb041f89 100644 --- a/test/Sema/bitwise_copyable_2.swift +++ b/test/Sema/bitwise_copyable_2.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift \ +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated \ // RUN: -enable-builtin-module \ // RUN: -enable-experimental-feature LifetimeDependence \ // RUN: -debug-diagnostic-names diff --git a/test/Sema/bitwise_copyable_nonresilient.swift b/test/Sema/bitwise_copyable_nonresilient.swift index 58cfcafa14e2e..db39a49a64e85 100644 --- a/test/Sema/bitwise_copyable_nonresilient.swift +++ b/test/Sema/bitwise_copyable_nonresilient.swift @@ -9,7 +9,7 @@ // RUN: %target-swift-frontend \ // RUN: %t/Downstream.swift \ -// RUN: -typecheck -verify \ +// RUN: -typecheck -verify -verify-ignore-unrelated \ // RUN: -debug-diagnostic-names \ // RUN: -I %t diff --git a/test/Sema/bitwise_copyable_resilience.swift b/test/Sema/bitwise_copyable_resilience.swift index f8777dc6953b6..4f023350dd795 100644 --- a/test/Sema/bitwise_copyable_resilience.swift +++ b/test/Sema/bitwise_copyable_resilience.swift @@ -10,7 +10,7 @@ // RUN: %target-swift-frontend \ // RUN: %t/Downstream.swift \ -// RUN: -typecheck -verify \ +// RUN: -typecheck -verify -verify-ignore-unrelated \ // RUN: -debug-diagnostic-names \ // RUN: -I %t diff --git a/test/Sema/classes_equatable_hashable.swift b/test/Sema/classes_equatable_hashable.swift index 37de0c7691b01..17005e704bb3e 100644 --- a/test/Sema/classes_equatable_hashable.swift +++ b/test/Sema/classes_equatable_hashable.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck -verify -primary-file %s +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -primary-file %s class Foo: Equatable {} // expected-error@-1 {{type 'Foo' does not conform to protocol 'Equatable'}} diff --git a/test/Sema/diag_constantness_check_os_log.swift b/test/Sema/diag_constantness_check_os_log.swift index 72594c3c13a8e..ca3db089a89a5 100644 --- a/test/Sema/diag_constantness_check_os_log.swift +++ b/test/Sema/diag_constantness_check_os_log.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -swift-version 5 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 5 // REQUIRES: VENDOR=apple diff --git a/test/Sema/diag_erroneous_iuo.swift b/test/Sema/diag_erroneous_iuo.swift index a1e44f17e4cde..5a066e0185a2f 100644 --- a/test/Sema/diag_erroneous_iuo.swift +++ b/test/Sema/diag_erroneous_iuo.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -swift-version 5 -verify-additional-prefix swift5- -// RUN: %target-typecheck-verify-swift -swift-version 4 -verify-additional-prefix swift4- +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 5 -verify-additional-prefix swift5- +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 4 -verify-additional-prefix swift4- // These are all legal uses of '!'. struct Fine { diff --git a/test/Sema/diag_non_ephemeral.swift b/test/Sema/diag_non_ephemeral.swift index 6b0ba868f73b0..addd8fa591c7b 100644 --- a/test/Sema/diag_non_ephemeral.swift +++ b/test/Sema/diag_non_ephemeral.swift @@ -2,7 +2,7 @@ // RUN: %target-swift-frontend -emit-module -enable-library-evolution -parse-as-library -o %t -module-name=ModuleA %S/Inputs/diag_non_ephemeral_module1.swift // RUN: %target-swift-frontend -emit-module -enable-library-evolution -parse-as-library -o %t -module-name=ModuleB %S/Inputs/diag_non_ephemeral_module2.swift // RUN: cp %s %t/main.swift -// RUN: %target-swift-frontend -typecheck -verify -enable-invalid-ephemeralness-as-error -I %t %t/main.swift %S/Inputs/diag_non_ephemeral_globals.swift +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -enable-invalid-ephemeralness-as-error -I %t %t/main.swift %S/Inputs/diag_non_ephemeral_globals.swift import ModuleA import ModuleB diff --git a/test/Sema/diag_non_ephemeral_warning.swift b/test/Sema/diag_non_ephemeral_warning.swift index 1b426796ed538..6f79831722775 100644 --- a/test/Sema/diag_non_ephemeral_warning.swift +++ b/test/Sema/diag_non_ephemeral_warning.swift @@ -2,7 +2,7 @@ // RUN: %target-swift-frontend -emit-module -enable-library-evolution -parse-as-library -o %t -module-name=ModuleA %S/Inputs/diag_non_ephemeral_module1.swift // RUN: %target-swift-frontend -emit-module -enable-library-evolution -parse-as-library -o %t -module-name=ModuleB %S/Inputs/diag_non_ephemeral_module2.swift // RUN: cp %s %t/main.swift -// RUN: %target-swift-frontend -typecheck -verify -I %t %t/main.swift %S/Inputs/diag_non_ephemeral_globals.swift +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %t %t/main.swift %S/Inputs/diag_non_ephemeral_globals.swift import ModuleA import ModuleB diff --git a/test/Sema/editor_placeholders.swift b/test/Sema/editor_placeholders.swift index 2d5740a971c3d..0ff89e8617620 100644 --- a/test/Sema/editor_placeholders.swift +++ b/test/Sema/editor_placeholders.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated func foo(_ x: Int) -> Int {} func foo(_ x: Float) -> Float {} diff --git a/test/Sema/enum_conformance_synthesis.swift b/test/Sema/enum_conformance_synthesis.swift index 20f299fd62454..5bd2d939f1af4 100644 --- a/test/Sema/enum_conformance_synthesis.swift +++ b/test/Sema/enum_conformance_synthesis.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck -verify -primary-file %s %S/Inputs/enum_conformance_synthesis_other.swift -verify-ignore-unknown -swift-version 4 +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -primary-file %s %S/Inputs/enum_conformance_synthesis_other.swift -verify-ignore-unknown -swift-version 4 var hasher = Hasher() diff --git a/test/Sema/enum_equatable_conditional.swift b/test/Sema/enum_equatable_conditional.swift index e562924498c55..8f91f2d26feb2 100644 --- a/test/Sema/enum_equatable_conditional.swift +++ b/test/Sema/enum_equatable_conditional.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -swift-version 4 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 4 struct NotEquatable { } diff --git a/test/Sema/enum_post_hoc_raw_representable_with_raw_type.swift b/test/Sema/enum_post_hoc_raw_representable_with_raw_type.swift index f80ba947f7079..00bd708d42b18 100644 --- a/test/Sema/enum_post_hoc_raw_representable_with_raw_type.swift +++ b/test/Sema/enum_post_hoc_raw_representable_with_raw_type.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module -o %t/enum_with_raw_type.swiftmodule %S/Inputs/enum_with_raw_type.swift -// RUN: %target-swift-frontend -I %t -typecheck -verify %s +// RUN: %target-swift-frontend -I %t -typecheck -verify -verify-ignore-unrelated %s import enum_with_raw_type diff --git a/test/Sema/enum_raw_representable.swift b/test/Sema/enum_raw_representable.swift index 0250405fdb0f6..bf5d0b62a12e2 100644 --- a/test/Sema/enum_raw_representable.swift +++ b/test/Sema/enum_raw_representable.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated enum Foo : Int { case a, b, c diff --git a/test/Sema/fixits-derived-conformances.swift b/test/Sema/fixits-derived-conformances.swift index ae47347f770f2..5145287fddd68 100644 --- a/test/Sema/fixits-derived-conformances.swift +++ b/test/Sema/fixits-derived-conformances.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-build-swift -emit-module -emit-library -module-name Types %S/Inputs/fixits-derived-conformances-multifile.swift -o %t/%target-library-name(Types) -// RUN: %target-typecheck-verify-swift %s -I %t +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated %s -I %t import Types diff --git a/test/Sema/has_symbol.swift b/test/Sema/has_symbol.swift index 39f55b42f9907..5ba90e46409de 100644 --- a/test/Sema/has_symbol.swift +++ b/test/Sema/has_symbol.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module -emit-module-path %t/has_symbol_helper.swiftmodule -parse-as-library %S/Inputs/has_symbol/has_symbol_helper.swift -enable-library-evolution -// RUN: %target-typecheck-verify-swift -disable-availability-checking -I %t +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -disable-availability-checking -I %t // UNSUPPORTED: OS=windows-msvc diff --git a/test/Sema/implementation-only-import-in-decls.swift b/test/Sema/implementation-only-import-in-decls.swift index 03c62853fcac2..bc5508157311c 100644 --- a/test/Sema/implementation-only-import-in-decls.swift +++ b/test/Sema/implementation-only-import-in-decls.swift @@ -4,7 +4,7 @@ // RUN: %target-swift-frontend -emit-module -o %t/BADLibrary.swiftmodule %S/Inputs/implementation-only-import-in-decls-helper.swift -I %t \ // RUN: -enable-library-evolution -swift-version 5 -// RUN: %target-typecheck-verify-swift -I %t \ +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %t \ // RUN: -enable-library-evolution -swift-version 5 import NormalLibrary diff --git a/test/Sema/implementation-only-import-library-evolution.swift b/test/Sema/implementation-only-import-library-evolution.swift index beca00620848f..24f63845f2f88 100644 --- a/test/Sema/implementation-only-import-library-evolution.swift +++ b/test/Sema/implementation-only-import-library-evolution.swift @@ -2,7 +2,7 @@ // RUN: %target-swift-frontend -emit-module -o %t/NormalLibrary.swiftmodule %S/Inputs/implementation-only-import-in-decls-public-helper.swift // RUN: %target-swift-frontend -emit-module -o %t/BADLibrary.swiftmodule %S/Inputs/implementation-only-import-in-decls-helper.swift -I %t -// RUN: %target-typecheck-verify-swift -I %t -enable-library-evolution +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %t -enable-library-evolution @_implementationOnly import BADLibrary // expected-warning @-1 {{'@_implementationOnly' is deprecated, use 'internal import' instead}} diff --git a/test/Sema/implementation-only-override.swift b/test/Sema/implementation-only-override.swift index 7a32fb339b678..c74d66e0b46fd 100644 --- a/test/Sema/implementation-only-override.swift +++ b/test/Sema/implementation-only-override.swift @@ -1,5 +1,5 @@ // RUN: %empty-directory(%t) -// RUN: %target-typecheck-verify-swift -I %S/Inputs/implementation-only-override -DERRORS -enable-library-evolution -enable-objc-interop +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %S/Inputs/implementation-only-override -DERRORS -enable-library-evolution -enable-objc-interop // RUN: %target-swift-emit-module-interface(%t/Library.swiftinterface) %s -I %S/Inputs/implementation-only-override -enable-objc-interop // RUN: %target-swift-typecheck-module-from-interface(%t/Library.swiftinterface) -I %S/Inputs/implementation-only-override diff --git a/test/Sema/missing-import-typealias-swift6.swift b/test/Sema/missing-import-typealias-swift6.swift index 5061d2f106300..9cc55582e756d 100644 --- a/test/Sema/missing-import-typealias-swift6.swift +++ b/test/Sema/missing-import-typealias-swift6.swift @@ -7,7 +7,7 @@ // RUN: %target-swift-emit-module-interface(%t/Aliases.swiftinterface) %t/Aliases.swift -I %t // RUN: %target-swift-typecheck-module-from-interface(%t/Aliases.swiftinterface) -I %t -// RUN: %target-swift-frontend -typecheck -verify %t/UsesAliasesNoImport.swift -enable-library-evolution -I %t -swift-version 6 +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/UsesAliasesNoImport.swift -enable-library-evolution -I %t -swift-version 6 // This test is a simplified version of missing-import-typealias.swift that // verifies errors are emitted instead of warnings in Swift 6. diff --git a/test/Sema/missing-import-typealias.swift b/test/Sema/missing-import-typealias.swift index 2860156817f80..bc55f2ec4230b 100644 --- a/test/Sema/missing-import-typealias.swift +++ b/test/Sema/missing-import-typealias.swift @@ -7,10 +7,10 @@ // RUN: %target-swift-emit-module-interface(%t/Aliases.swiftinterface) %t/Aliases.swift -I %t // RUN: %target-swift-typecheck-module-from-interface(%t/Aliases.swiftinterface) -I %t -// RUN: %target-swift-frontend -typecheck -verify %t/UsesAliasesNoImport.swift -enable-library-evolution -I %t -// RUN: %target-swift-frontend -typecheck -verify %t/UsesAliasesImplementationOnlyImport.swift -enable-library-evolution -I %t -// RUN: %target-swift-frontend -typecheck -verify %t/UsesAliasesSPIOnlyImport.swift -enable-library-evolution -I %t -experimental-spi-only-imports -// RUN: %target-swift-frontend -typecheck -verify %t/UsesAliasesWithImport.swift -enable-library-evolution -I %t +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/UsesAliasesNoImport.swift -enable-library-evolution -I %t +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/UsesAliasesImplementationOnlyImport.swift -enable-library-evolution -I %t +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/UsesAliasesSPIOnlyImport.swift -enable-library-evolution -I %t -experimental-spi-only-imports +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/UsesAliasesWithImport.swift -enable-library-evolution -I %t /// With library evolution disabled UsesAliasesNoImport.swift should compile without diagnostics. // RUN: %target-swift-frontend -typecheck %t/UsesAliasesNoImport.swift -I %t | %FileCheck %t/UsesAliasesNoImport.swift --check-prefix=CHECK-NON-RESILIENT --allow-empty diff --git a/test/Sema/package-import-conforming-types.swift b/test/Sema/package-import-conforming-types.swift index 9ae7fd2879c30..d7b6ed0c6201c 100644 --- a/test/Sema/package-import-conforming-types.swift +++ b/test/Sema/package-import-conforming-types.swift @@ -8,9 +8,9 @@ // RUN: %S/Inputs/implementation-only-import-in-decls-helper.swift -I %t \ // RUN: -enable-library-evolution -swift-version 5 -// RUN: %target-typecheck-verify-swift -I %t \ +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %t \ // RUN: -swift-version 5 -package-name pkg -enable-library-evolution -// RUN: %target-typecheck-verify-swift -I %t \ +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %t \ // RUN: -swift-version 5 -package-name pkg package import BADLibrary // expected-note 8 {{protocol 'BadProto' imported as 'package' from 'BADLibrary' here}} diff --git a/test/Sema/public-module-name.swift b/test/Sema/public-module-name.swift index 6bf454d2d75f8..1545c99cb0d21 100644 --- a/test/Sema/public-module-name.swift +++ b/test/Sema/public-module-name.swift @@ -36,7 +36,7 @@ /// First errors in files, then diagnostics in other files. // RUN: %target-swift-frontend -typecheck %t/ClientPublic.swift -o %t -I %t \ // RUN: -enable-library-evolution -swift-version 6 \ -// RUN: -verify +// RUN: -verify -verify-ignore-unrelated // RUN: not %target-swift-frontend -typecheck %t/ClientPublic.swift -o %t -I %t \ // RUN: -enable-library-evolution -swift-version 6 \ // RUN: -diagnostic-style llvm \ @@ -44,7 +44,7 @@ // RUN: %target-swift-frontend -typecheck %t/ClientMiddle.swift -o %t -I %t \ // RUN: -enable-library-evolution -swift-version 6 \ -// RUN: -verify +// RUN: -verify -verify-ignore-unrelated // RUN: not %target-swift-frontend -typecheck %t/ClientMiddle.swift -o %t -I %t \ // RUN: -enable-library-evolution -swift-version 6 \ // RUN: -diagnostic-style llvm \ @@ -53,13 +53,13 @@ /// Test more diagnostics referencing modules. // RUN: %target-swift-frontend -typecheck %t/ClientAccessLevelOnImports.swift -o %t -I %t \ // RUN: -enable-library-evolution -swift-version 6 \ -// RUN: -verify +// RUN: -verify -verify-ignore-unrelated /// Build client against textual swiftinterfaces. // RUN: rm %t/LibCore.swiftmodule %t/LibMiddle.swiftmodule %t/Lib.swiftmodule // RUN: %target-swift-frontend -typecheck %t/ClientPublic.swift -I %t \ // RUN: -enable-library-evolution -swift-version 6 \ -// RUN: -verify +// RUN: -verify -verify-ignore-unrelated // RUN: not %target-swift-frontend -typecheck %t/ClientPublic.swift -o %t -I %t \ // RUN: -enable-library-evolution -swift-version 6 \ // RUN: -diagnostic-style llvm \ @@ -67,7 +67,7 @@ // RUN: %target-swift-frontend -typecheck %t/ClientMiddle.swift -o %t -I %t \ // RUN: -enable-library-evolution -swift-version 6 \ -// RUN: -verify +// RUN: -verify -verify-ignore-unrelated // RUN: not %target-swift-frontend -typecheck %t/ClientMiddle.swift -o %t -I %t \ // RUN: -enable-library-evolution -swift-version 6 \ // RUN: -diagnostic-style llvm \ @@ -75,7 +75,7 @@ // RUN: %target-swift-frontend -typecheck %t/ClientAccessLevelOnImports.swift -o %t -I %t \ // RUN: -enable-library-evolution -swift-version 6 \ -// RUN: -verify +// RUN: -verify -verify-ignore-unrelated //--- LibCore.swift public func ambiguous() {} diff --git a/test/Sema/restricted-imports-priorities.swift b/test/Sema/restricted-imports-priorities.swift index f24a41690503a..d89360d48121b 100644 --- a/test/Sema/restricted-imports-priorities.swift +++ b/test/Sema/restricted-imports-priorities.swift @@ -15,22 +15,22 @@ // RUN: -module-name LibC -emit-module-path %t/LibC.swiftmodule \ // RUN: -swift-version 5 -enable-library-evolution -I %t -// RUN: %target-swift-frontend -typecheck %t/TwoIOI.swift -I %t -verify \ +// RUN: %target-swift-frontend -typecheck %t/TwoIOI.swift -I %t -verify -verify-ignore-unrelated \ // RUN: -swift-version 5 -enable-library-evolution \ // RUN: -experimental-spi-only-imports -verify -// RUN: %target-swift-frontend -typecheck %t/SPIOnlyAndIOI1.swift -I %t -verify \ +// RUN: %target-swift-frontend -typecheck %t/SPIOnlyAndIOI1.swift -I %t -verify -verify-ignore-unrelated \ // RUN: -swift-version 5 -enable-library-evolution \ // RUN: -experimental-spi-only-imports -verify -// RUN: %target-swift-frontend -typecheck %t/SPIOnlyAndIOI2.swift -I %t -verify \ +// RUN: %target-swift-frontend -typecheck %t/SPIOnlyAndIOI2.swift -I %t -verify -verify-ignore-unrelated \ // RUN: -swift-version 5 -enable-library-evolution \ // RUN: -experimental-spi-only-imports -verify -// RUN: %target-swift-frontend -typecheck %t/TwoSPIOnly.swift -I %t -verify \ +// RUN: %target-swift-frontend -typecheck %t/TwoSPIOnly.swift -I %t -verify -verify-ignore-unrelated \ // RUN: -swift-version 5 -enable-library-evolution \ // RUN: -experimental-spi-only-imports -verify -// RUN: %target-swift-frontend -typecheck %t/OneSPIOnly1.swift -I %t -verify \ +// RUN: %target-swift-frontend -typecheck %t/OneSPIOnly1.swift -I %t -verify -verify-ignore-unrelated \ // RUN: -swift-version 5 -enable-library-evolution \ // RUN: -experimental-spi-only-imports -verify -// RUN: %target-swift-frontend -typecheck %t/OneSPIOnly2.swift -I %t -verify \ +// RUN: %target-swift-frontend -typecheck %t/OneSPIOnly2.swift -I %t -verify -verify-ignore-unrelated \ // RUN: -swift-version 5 -enable-library-evolution \ // RUN: -experimental-spi-only-imports -verify diff --git a/test/Sema/struct_equatable_hashable.swift b/test/Sema/struct_equatable_hashable.swift index bb6f82c5ea28f..ae48bc536048c 100644 --- a/test/Sema/struct_equatable_hashable.swift +++ b/test/Sema/struct_equatable_hashable.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck -verify -primary-file %s %S/Inputs/struct_equatable_hashable_other.swift -verify-ignore-unknown -swift-version 4 +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -primary-file %s %S/Inputs/struct_equatable_hashable_other.swift -verify-ignore-unknown -swift-version 4 var hasher = Hasher() diff --git a/test/Sema/typo_correction_limit.swift b/test/Sema/typo_correction_limit.swift index e85c7d308d380..64567106f61ed 100644 --- a/test/Sema/typo_correction_limit.swift +++ b/test/Sema/typo_correction_limit.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -typo-correction-limit 5 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -typo-correction-limit 5 // This is close enough to get typo-correction. func test_short_and_close() { diff --git a/test/Sema/where_clause_across_module_boundaries.swift b/test/Sema/where_clause_across_module_boundaries.swift index d01e4110ee773..311ca6c6859e7 100644 --- a/test/Sema/where_clause_across_module_boundaries.swift +++ b/test/Sema/where_clause_across_module_boundaries.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module -o %t/ModuleA.swiftmodule %S/Inputs/where_clause_across_module_boundaries_module.swift -// RUN: %target-typecheck-verify-swift -I %t +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %t // https://github.com/apple/swift/issues/58084 // Associated Type Inference fails across module boundaries diff --git a/test/Serialization/AllowErrors/invalid-operator.swift b/test/Serialization/AllowErrors/invalid-operator.swift index 00ffc99b89584..61a1f64b5d2df 100644 --- a/test/Serialization/AllowErrors/invalid-operator.swift +++ b/test/Serialization/AllowErrors/invalid-operator.swift @@ -1,7 +1,7 @@ // RUN: %empty-directory(%t) -// RUN: %target-swift-frontend -verify -emit-module -experimental-allow-module-with-compiler-errors %s -o %t/foo.swiftmodule -// RUN: %target-swift-frontend -verify -emit-module -module-name foo %t/foo.swiftmodule +// RUN: %target-swift-frontend -verify -verify-ignore-unrelated -emit-module -experimental-allow-module-with-compiler-errors %s -o %t/foo.swiftmodule +// RUN: %target-swift-frontend -verify -verify-ignore-unrelated -emit-module -module-name foo %t/foo.swiftmodule // rdar://97267326 – Make sure we can handle an operator function without its declaration. struct S { diff --git a/test/Serialization/AllowErrors/invalid-top.swift b/test/Serialization/AllowErrors/invalid-top.swift index 07ba3cc70a601..83af2f8ad52cf 100644 --- a/test/Serialization/AllowErrors/invalid-top.swift +++ b/test/Serialization/AllowErrors/invalid-top.swift @@ -5,7 +5,7 @@ // RUN: %{python} %utils/split_file.py -o %t %s // Errors often only occur during merging, hence creating an empty module here -// RUN: %target-swift-frontend -verify -module-name errors -emit-module -o %t/mods/errorsmain.partial.swiftmodule -experimental-allow-module-with-compiler-errors %t/errors.swift +// RUN: %target-swift-frontend -verify -verify-ignore-unrelated -module-name errors -emit-module -o %t/mods/errorsmain.partial.swiftmodule -experimental-allow-module-with-compiler-errors %t/errors.swift // RUN: %target-swift-frontend -module-name errors -emit-module -o %t/mods/errorsempty.partial.swiftmodule %t/empty.swift // RUN: %target-swift-frontend -module-name errors -emit-module -o %t/mods/errors.swiftmodule -experimental-allow-module-with-compiler-errors %t/mods/errorsmain.partial.swiftmodule %t/mods/errorsempty.partial.swiftmodule diff --git a/test/Serialization/Recovery/conformance-xref.swift b/test/Serialization/Recovery/conformance-xref.swift index f0e261d5f995a..f27fe2fe6476c 100644 --- a/test/Serialization/Recovery/conformance-xref.swift +++ b/test/Serialization/Recovery/conformance-xref.swift @@ -20,7 +20,7 @@ /// No errors when extended recovery is enabled. // RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t \ -// RUN: -experimental-allow-module-with-compiler-errors -verify +// RUN: -experimental-allow-module-with-compiler-errors -verify -verify-ignore-unrelated /// Case 2: Remove a requirement from one lib, leave the other as stale and /// rebuild client. Error on the mismatch. @@ -34,7 +34,7 @@ /// No errors when extended recovery is enabled. // RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t \ -// RUN: -experimental-allow-module-with-compiler-errors -verify +// RUN: -experimental-allow-module-with-compiler-errors -verify -verify-ignore-unrelated /// Combined case: Remove both the conformance and the requirement. /// Fail on the removed conformance only as it was first. diff --git a/test/Serialization/Recovery/typedefs-in-enums.swift b/test/Serialization/Recovery/typedefs-in-enums.swift index 1f935a581a1b2..cbdfb694abb96 100644 --- a/test/Serialization/Recovery/typedefs-in-enums.swift +++ b/test/Serialization/Recovery/typedefs-in-enums.swift @@ -5,7 +5,7 @@ // RUN: %target-swift-ide-test -source-filename=x -print-module -module-to-print Lib -I %t -I %S/Inputs/custom-modules -Xcc -DBAD | %FileCheck -check-prefix CHECK-RECOVERY %s -// RUN: %target-swift-frontend -typecheck -I %t -I %S/Inputs/custom-modules -Xcc -DBAD -DTEST %s -verify +// RUN: %target-swift-frontend -typecheck -I %t -I %S/Inputs/custom-modules -Xcc -DBAD -DTEST %s -verify -verify-ignore-unrelated #if TEST diff --git a/test/Serialization/Recovery/typedefs.swift b/test/Serialization/Recovery/typedefs.swift index 6d6ef13e7de02..569686728b528 100644 --- a/test/Serialization/Recovery/typedefs.swift +++ b/test/Serialization/Recovery/typedefs.swift @@ -10,13 +10,13 @@ // RUN: %FileCheck -check-prefix CHECK-RECOVERY %s < %t.txt // RUN: %FileCheck -check-prefix CHECK-RECOVERY-NEGATIVE %s < %t.txt -// RUN: %target-swift-frontend -typecheck -I %t -I %S/Inputs/custom-modules -Xcc -DBAD -DTEST -DVERIFY %s -verify +// RUN: %target-swift-frontend -typecheck -I %t -I %S/Inputs/custom-modules -Xcc -DBAD -DTEST -DVERIFY %s -verify -verify-ignore-unrelated // RUN: %target-swift-frontend -emit-silgen -I %t -I %S/Inputs/custom-modules -Xcc -DBAD -DTEST %s | %FileCheck -check-prefix CHECK-SIL %s // RUN: %target-swift-frontend -emit-ir -I %t -I %S/Inputs/custom-modules -DTEST %s | %FileCheck --check-prefixes=CHECK-IR,CHECK-IR-%target-runtime %s // RUN: %target-swift-frontend -emit-ir -I %t -I %S/Inputs/custom-modules -Xcc -DBAD -DTEST %s | %FileCheck --check-prefixes=CHECK-IR,CHECK-IR-%target-runtime %s -// RUN: %target-swift-frontend -typecheck -I %t -I %S/Inputs/custom-modules -Xcc -DBAD %S/Inputs/typedefs-helper.swift -verify +// RUN: %target-swift-frontend -typecheck -I %t -I %S/Inputs/custom-modules -Xcc -DBAD %S/Inputs/typedefs-helper.swift -verify -verify-ignore-unrelated #if TEST diff --git a/test/Serialization/Recovery/types-4-to-5.swift b/test/Serialization/Recovery/types-4-to-5.swift index 510942e5f471d..4a0cde5851416 100644 --- a/test/Serialization/Recovery/types-4-to-5.swift +++ b/test/Serialization/Recovery/types-4-to-5.swift @@ -5,7 +5,7 @@ // RUN: %target-swift-ide-test -source-filename=x -print-module -module-to-print Lib -I %t -I %S/Inputs/custom-modules -swift-version 5 | %FileCheck -check-prefix=CHECK-5 %s -// RUN: %target-swift-frontend -typecheck %s -I %t -I %S/Inputs/custom-modules -swift-version 5 -D TEST -verify +// RUN: %target-swift-frontend -typecheck %s -I %t -I %S/Inputs/custom-modules -swift-version 5 -D TEST -verify -verify-ignore-unrelated // REQUIRES: objc_interop diff --git a/test/Serialization/availability_custom_domains.swift b/test/Serialization/availability_custom_domains.swift index b5aa65d96a363..5500c214d9a8d 100644 --- a/test/Serialization/availability_custom_domains.swift +++ b/test/Serialization/availability_custom_domains.swift @@ -8,7 +8,7 @@ // RUN: -enable-experimental-feature CustomAvailability // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %t/client.swift \ -// RUN: -typecheck -verify \ +// RUN: -typecheck -verify -verify-ignore-unrelated \ // RUN: -I %S/../Inputs/custom-modules/availability-domains \ // RUN: -I %t/modules -enable-experimental-feature CustomAvailability diff --git a/test/Serialization/builtin.swift b/test/Serialization/builtin.swift index cce143203088b..18b83685b72c3 100644 --- a/test/Serialization/builtin.swift +++ b/test/Serialization/builtin.swift @@ -1,7 +1,7 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module -parse-stdlib -o %t %S/Inputs/alias_builtin.swift // RUN: llvm-bcanalyzer %t/alias_builtin.swiftmodule | %FileCheck %s -// RUN: %target-swift-frontend -I %t -typecheck %s -verify +// RUN: %target-swift-frontend -I %t -typecheck %s -verify -verify-ignore-unrelated // CHECK-NOT: UnknownCode diff --git a/test/Serialization/extension-of-typealias.swift b/test/Serialization/extension-of-typealias.swift index 7aa7d81197ffb..e440630c9265e 100644 --- a/test/Serialization/extension-of-typealias.swift +++ b/test/Serialization/extension-of-typealias.swift @@ -1,7 +1,7 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module -module-name Library -o %t -D LIBRARY %s // RUN: %target-swift-ide-test -print-module -module-to-print=Library -I %t -source-filename=%s | %FileCheck %s -// RUN: %target-swift-frontend -typecheck -I %t %s -verify +// RUN: %target-swift-frontend -typecheck -I %t %s -verify -verify-ignore-unrelated // Check that base types of extensions are desugared. This isn't necessarily // the behavior we want long-term, but it's the behavior we need right now. diff --git a/test/Serialization/failed-clang-module.swift b/test/Serialization/failed-clang-module.swift index 09438bfdbe81f..59ecc07b7c354 100644 --- a/test/Serialization/failed-clang-module.swift +++ b/test/Serialization/failed-clang-module.swift @@ -13,7 +13,7 @@ // RUN: %target-swift-frontend -emit-module %S/Inputs/SwiftModB.swift -module-name SwiftModB -F %t -o %t -module-cache-path %t/mcp // RUN: %target-swift-frontend -typecheck %s -I %t -module-cache-path %t/mcp -// RUN: %target-swift-frontend -typecheck %s -Xcc -DFAIL -I %t -module-cache-path %t/mcp -show-diagnostics-after-fatal -verify -verify-ignore-unknown +// RUN: %target-swift-frontend -typecheck %s -Xcc -DFAIL -I %t -module-cache-path %t/mcp -show-diagnostics-after-fatal -verify -verify-ignore-unrelated -verify-ignore-unknown import SwiftModB // expected-error {{missing required module}} _ = TyB() // expected-error {{cannot find 'TyB' in scope}} diff --git a/test/Serialization/lazy-typecheck.swift b/test/Serialization/lazy-typecheck.swift index 9a219e7ced3c9..b07f42d263f6c 100644 --- a/test/Serialization/lazy-typecheck.swift +++ b/test/Serialization/lazy-typecheck.swift @@ -4,19 +4,19 @@ // (1) Build the module normally and verify that a client can deserialize it and use its public declarations. // RUN: %target-swift-frontend -swift-version 5 %S/../Inputs/lazy_typecheck.swift -module-name lazy_typecheck -enable-library-evolution -parse-as-library -package-name Package -DFLAG -emit-module -emit-module-path %t/baseline/lazy_typecheck.swiftmodule -// RUN: %target-swift-frontend -package-name Package -typecheck -verify %S/../Inputs/lazy_typecheck_client.swift -DFLAG -I %t/baseline +// RUN: %target-swift-frontend -package-name Package -typecheck -verify -verify-ignore-unrelated %S/../Inputs/lazy_typecheck_client.swift -DFLAG -I %t/baseline // (2) Verify that a module built with -experimental-lazy-typecheck, -experimental-skip-all-function-bodies, // and -experimental-skip-non-exportable-decls can be used by the same client as in (1). // RUN: %target-swift-frontend -swift-version 5 %S/../Inputs/lazy_typecheck.swift -module-name lazy_typecheck -enable-library-evolution -parse-as-library -package-name Package -DFLAG -emit-module -emit-module-path %t/lazy-skip-all/lazy_typecheck.swiftmodule -debug-forbid-typecheck-prefix NoTypecheck -experimental-lazy-typecheck -experimental-skip-all-function-bodies -experimental-skip-non-exportable-decls -// RUN: %target-swift-frontend -package-name Package -typecheck -verify %S/../Inputs/lazy_typecheck_client.swift -DFLAG -I %t/lazy-skip-all +// RUN: %target-swift-frontend -package-name Package -typecheck -verify -verify-ignore-unrelated %S/../Inputs/lazy_typecheck_client.swift -DFLAG -I %t/lazy-skip-all // (2a) Verify that -experimental-lazy-typecheck and -experimental-skip-non-exportable-decls do not require // -enable-library-evolution if -experimental-skip-all-function-bodies is specified. // RUN: %target-swift-frontend -swift-version 5 %S/../Inputs/lazy_typecheck.swift -module-name lazy_typecheck -parse-as-library -package-name Package -DFLAG -emit-module -emit-module-path %t/lazy-skip-all-non-resilient/lazy_typecheck.swiftmodule -debug-forbid-typecheck-prefix NoTypecheck -experimental-lazy-typecheck -experimental-skip-all-function-bodies -experimental-skip-non-exportable-decls -// RUN: %target-swift-frontend -package-name Package -typecheck -verify %S/../Inputs/lazy_typecheck_client.swift -DFLAG -I %t/lazy-skip-all-non-resilient +// RUN: %target-swift-frontend -package-name Package -typecheck -verify -verify-ignore-unrelated %S/../Inputs/lazy_typecheck_client.swift -DFLAG -I %t/lazy-skip-all-non-resilient // (3) Verify that a module built with -experimental-lazy-typecheck, -experimental-skip-non-inlinable-function-bodies, // and -experimental-skip-non-exportable-decls can be used by the same client as in (1). // RUN: %target-swift-frontend -swift-version 5 %S/../Inputs/lazy_typecheck.swift -module-name lazy_typecheck -enable-library-evolution -parse-as-library -package-name Package -DFLAG -emit-module -emit-module-path %t/lazy-skip-non-inlinable/lazy_typecheck.swiftmodule -debug-forbid-typecheck-prefix NoTypecheck -experimental-lazy-typecheck -experimental-skip-non-inlinable-function-bodies -experimental-skip-non-exportable-decls -// RUN: %target-swift-frontend -package-name Package -typecheck -verify %S/../Inputs/lazy_typecheck_client.swift -DFLAG -I %t/lazy-skip-non-inlinable +// RUN: %target-swift-frontend -package-name Package -typecheck -verify -verify-ignore-unrelated %S/../Inputs/lazy_typecheck_client.swift -DFLAG -I %t/lazy-skip-non-inlinable diff --git a/test/Serialization/objc_method_table.swift b/test/Serialization/objc_method_table.swift index e81fede4183fc..87f445bd0506b 100644 --- a/test/Serialization/objc_method_table.swift +++ b/test/Serialization/objc_method_table.swift @@ -1,7 +1,7 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module -disable-objc-attr-requires-foundation-module -o %t %S/Inputs/objc_method_decls.swift // RUN: llvm-bcanalyzer %t/objc_method_decls.swiftmodule | %FileCheck %s -// RUN: %target-swift-frontend -typecheck -disable-objc-attr-requires-foundation-module -I %t %s -verify +// RUN: %target-swift-frontend -typecheck -disable-objc-attr-requires-foundation-module -I %t %s -verify -verify-ignore-unrelated // REQUIRES: objc_interop diff --git a/test/Serialization/property_wrappers.swift b/test/Serialization/property_wrappers.swift index 3ea9f8fcaad2e..877009b78bbf3 100644 --- a/test/Serialization/property_wrappers.swift +++ b/test/Serialization/property_wrappers.swift @@ -2,7 +2,7 @@ // RUN: %empty-directory(%t-scratch) // RUN: %target-swift-frontend -emit-module -o %t-scratch/def_property_wrappers~partial.swiftmodule -primary-file %S/Inputs/def_property_wrappers.swift -module-name def_property_wrappers -enable-testing // RUN: %target-swift-frontend -merge-modules -emit-module -parse-as-library -enable-testing %t-scratch/def_property_wrappers~partial.swiftmodule -module-name def_property_wrappers -o %t/def_property_wrappers.swiftmodule -// RUN: %target-swift-frontend -typecheck -I%t -verify %s -verify-ignore-unknown +// RUN: %target-swift-frontend -typecheck -I%t -verify -verify-ignore-unrelated %s -verify-ignore-unknown @testable import def_property_wrappers diff --git a/test/Serialization/search-paths.swift b/test/Serialization/search-paths.swift index 54b61e50bc0e8..3f3cd9ce90a72 100644 --- a/test/Serialization/search-paths.swift +++ b/test/Serialization/search-paths.swift @@ -5,7 +5,7 @@ // RUN: %target-swift-frontend -emit-module -o %t/Frameworks/has_alias.framework/Modules/has_alias.swiftmodule/%target-swiftmodule-name %S/Inputs/alias.swift -module-name has_alias // RUN: %target-swift-frontend -emit-module -o %t -I %t/secret -F %t/Frameworks -Fsystem %t/SystemFrameworks -parse-as-library %S/Inputs/has_xref.swift -// RUN: %target-swift-frontend %s -typecheck -I %t -verify -show-diagnostics-after-fatal +// RUN: %target-swift-frontend %s -typecheck -I %t -verify -verify-ignore-unrelated -show-diagnostics-after-fatal // Try again, treating has_xref as a main file to force serialization to occur. // RUN: %target-swift-frontend -emit-module -o %t -I %t/secret -F %t/Frameworks -Fsystem %t/SystemFrameworks %S/Inputs/has_xref.swift @@ -19,7 +19,7 @@ // Make sure -no-serialize-debugging-options has the desired effect. // RUN: %target-swift-frontend -emit-module -o %t -I %t/secret -F %t/Frameworks -Fsystem %t/SystemFrameworks -parse-as-library %S/Inputs/has_xref.swift -application-extension -no-serialize-debugging-options -// RUN: %target-swift-frontend %s -typecheck -I %t -verify -show-diagnostics-after-fatal +// RUN: %target-swift-frontend %s -typecheck -I %t -verify -verify-ignore-unrelated -show-diagnostics-after-fatal // Make sure we don't end up with duplicate search paths. // RUN: %target-swiftc_driver -emit-module -o %t/has_xref.swiftmodule -I %t/secret -F %t/Frameworks -Fsystem %t/SystemFrameworks -parse-as-library %S/Inputs/has_xref.swift %S/../Inputs/empty.swift -Xfrontend -serialize-debugging-options diff --git a/test/StringProcessing/Parse/forward-slash-regex.swift b/test/StringProcessing/Parse/forward-slash-regex.swift index 4b74a1ef6f862..791eb8b3f61b8 100644 --- a/test/StringProcessing/Parse/forward-slash-regex.swift +++ b/test/StringProcessing/Parse/forward-slash-regex.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-bare-slash-regex -disable-availability-checking -typo-correction-limit 0 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-bare-slash-regex -disable-availability-checking -typo-correction-limit 0 // REQUIRES: swift_swift_parser // REQUIRES: concurrency diff --git a/test/StringProcessing/Sema/regex_builder_already_imported.swift b/test/StringProcessing/Sema/regex_builder_already_imported.swift index bd200d784d5b9..e7f9b7a08a9b7 100644 --- a/test/StringProcessing/Sema/regex_builder_already_imported.swift +++ b/test/StringProcessing/Sema/regex_builder_already_imported.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-bare-slash-regex -disable-availability-checking +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-bare-slash-regex -disable-availability-checking import RegexBuilder diff --git a/test/TypeCoercion/integer_literals.swift b/test/TypeCoercion/integer_literals.swift index 6ec8c4c55bfa9..86c44578faf65 100644 --- a/test/TypeCoercion/integer_literals.swift +++ b/test/TypeCoercion/integer_literals.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated typealias IntegerLiteralType = Int32 diff --git a/test/attr/ApplicationMain/attr_NSApplicationMain_multi_file/another_delegate.swift b/test/attr/ApplicationMain/attr_NSApplicationMain_multi_file/another_delegate.swift index a7458932b8e25..9cc6278f0c77c 100644 --- a/test/attr/ApplicationMain/attr_NSApplicationMain_multi_file/another_delegate.swift +++ b/test/attr/ApplicationMain/attr_NSApplicationMain_multi_file/another_delegate.swift @@ -1,10 +1,10 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify %s %S/delegate.swift +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated %s %S/delegate.swift // Serialized partial AST support: // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -module-name main -emit-module-path %t.swiftmodule -primary-file %s %S/delegate.swift -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -module-name main -parse-as-library -typecheck %t.swiftmodule -primary-file %S/delegate.swift -verify -verify-ignore-unknown +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -module-name main -parse-as-library -typecheck %t.swiftmodule -primary-file %S/delegate.swift -verify -verify-ignore-unrelated -verify-ignore-unknown -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -module-name main -parse-as-library -typecheck -enable-upcoming-feature DeprecateApplicationMain %t.swiftmodule -primary-file %S/delegate.swift -verify -verify-ignore-unknown -verify-additional-prefix deprecated- +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -module-name main -parse-as-library -typecheck -enable-upcoming-feature DeprecateApplicationMain %t.swiftmodule -primary-file %S/delegate.swift -verify -verify-ignore-unrelated -verify-ignore-unknown -verify-additional-prefix deprecated- // REQUIRES: objc_interop // REQUIRES: swift_feature_DeprecateApplicationMain diff --git a/test/attr/ApplicationMain/attr_main_multi_file/main2.swift b/test/attr/ApplicationMain/attr_main_multi_file/main2.swift index 5717584488722..337851b5488ca 100644 --- a/test/attr/ApplicationMain/attr_main_multi_file/main2.swift +++ b/test/attr/ApplicationMain/attr_main_multi_file/main2.swift @@ -1,8 +1,8 @@ -// RUN: %target-swift-frontend -typecheck -verify %s %S/main1.swift +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %s %S/main1.swift // Serialized partial AST support: // RUN: %target-swift-frontend -module-name main -emit-module-path %t.swiftmodule -primary-file %s %S/main1.swift -// RUN: %target-swift-frontend -module-name main -parse-as-library -typecheck %t.swiftmodule -primary-file %S/main1.swift -verify -verify-ignore-unknown +// RUN: %target-swift-frontend -module-name main -parse-as-library -typecheck %t.swiftmodule -primary-file %S/main1.swift -verify -verify-ignore-unrelated -verify-ignore-unknown @main // expected-error{{'main' attribute can only apply to one type in a module}} class EvilMain { diff --git a/test/attr/attr_availability_async_rename.swift b/test/attr/attr_availability_async_rename.swift index 21b30ed962a25..2d2526423e350 100644 --- a/test/attr/attr_availability_async_rename.swift +++ b/test/attr/attr_availability_async_rename.swift @@ -1,8 +1,8 @@ // REQUIRES: concurrency // REQUIRES: objc_interop -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs/custom-modules -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -parse-as-library -I %S/Inputs/custom-modules +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -I %S/Inputs/custom-modules +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -parse-as-library -I %S/Inputs/custom-modules import ObjcAsync diff --git a/test/attr/attr_usableFromInline_protocol_hole.swift b/test/attr/attr_usableFromInline_protocol_hole.swift index 434f5351cde5c..a59d8639fd45f 100644 --- a/test/attr/attr_usableFromInline_protocol_hole.swift +++ b/test/attr/attr_usableFromInline_protocol_hole.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module -o %t/Lib.swiftmodule %S/Inputs/attr_usableFromInline_protocol_hole_helper.swift -// RUN: %target-typecheck-verify-swift -I %t -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %t -verify-ignore-unknown import Lib diff --git a/test/attr/dynamicReplacement.swift b/test/attr/dynamicReplacement.swift index 275432b23964a..ab048f2daba7b 100644 --- a/test/attr/dynamicReplacement.swift +++ b/test/attr/dynamicReplacement.swift @@ -2,7 +2,7 @@ // RUN: %target-swift-frontend -emit-module -swift-version 5 -enable-implicit-dynamic %S/Inputs/dynamicReplacementA.swift -o %t -module-name A // RUN: %target-swift-frontend -emit-module -swift-version 5 -enable-implicit-dynamic -c %S/Inputs/dynamicReplacementB.swift -o %t -I %t -module-name B // RUN: %target-swift-frontend -emit-module -swift-version 5 -enable-implicit-dynamic -c %S/Inputs/dynamicReplacementC.swift -o %t -I %t -module-name C -// RUN: %target-typecheck-verify-swift -swift-version 5 -enable-implicit-dynamic -I %t +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 5 -enable-implicit-dynamic -I %t import A import B import C diff --git a/test/attr/global_actor.swift b/test/attr/global_actor.swift index 459e79285945d..51088ed816952 100644 --- a/test/attr/global_actor.swift +++ b/test/attr/global_actor.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck -verify %s -disable-availability-checking -package-name myPkg +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %s -disable-availability-checking -package-name myPkg // REQUIRES: concurrency actor SomeActor { } diff --git a/test/attr/open.swift b/test/attr/open.swift index 9a8fb1172f708..2cb96960770e4 100644 --- a/test/attr/open.swift +++ b/test/attr/open.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-build-swift -emit-module %S/Inputs/OpenHelpers.swift -o %t/OpenHelpers.swiftmodule -// RUN: %target-typecheck-verify-swift -I %t +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %t import OpenHelpers diff --git a/test/decl/class/inheritance_across_modules.swift b/test/decl/class/inheritance_across_modules.swift index 360706abbb974..cfc6b708c7ba0 100644 --- a/test/decl/class/inheritance_across_modules.swift +++ b/test/decl/class/inheritance_across_modules.swift @@ -3,7 +3,7 @@ // RUN: %target-swift-frontend -emit-module-path %t/MyModule.swiftmodule %t/Inputs/MyModule.swift -// RUN: %target-swift-frontend -typecheck -verify -I %t %t/test.swift +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %t %t/test.swift //--- Inputs/MyModule.swift open class MySuperclassA { diff --git a/test/decl/enum/bool_raw_value.swift b/test/decl/enum/bool_raw_value.swift index 6e6166e7d397b..f8df772e65c28 100644 --- a/test/decl/enum/bool_raw_value.swift +++ b/test/decl/enum/bool_raw_value.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated extension Bool: @retroactive ExpressibleByIntegerLiteral { public init(integerLiteral value: Int) { self = value != 0 diff --git a/test/decl/ext/objc_implementation.swift b/test/decl/ext/objc_implementation.swift index 1b7f852347815..e8a825db6e616 100644 --- a/test/decl/ext/objc_implementation.swift +++ b/test/decl/ext/objc_implementation.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -import-objc-header %S/Inputs/objc_implementation.h -enable-experimental-feature ObjCImplementation -enable-experimental-feature CImplementation -target %target-stable-abi-triple +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -import-objc-header %S/Inputs/objc_implementation.h -enable-experimental-feature ObjCImplementation -enable-experimental-feature CImplementation -target %target-stable-abi-triple // REQUIRES: objc_interop // REQUIRES: swift_feature_CImplementation // REQUIRES: swift_feature_ObjCImplementation diff --git a/test/decl/ext/objc_implementation_class_extension.swift b/test/decl/ext/objc_implementation_class_extension.swift index b2db2672e7f7e..0908f21e3f1f1 100644 --- a/test/decl/ext/objc_implementation_class_extension.swift +++ b/test/decl/ext/objc_implementation_class_extension.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -import-underlying-module -Xcc -fmodule-map-file=%S/Inputs/objc_implementation_class_extension.modulemap -target %target-stable-abi-triple -swift-version 5 -enable-library-evolution +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -import-underlying-module -Xcc -fmodule-map-file=%S/Inputs/objc_implementation_class_extension.modulemap -target %target-stable-abi-triple -swift-version 5 -enable-library-evolution // REQUIRES: objc_interop @_implementationOnly import objc_implementation_class_extension_internal diff --git a/test/decl/ext/objc_implementation_conflicts.swift b/test/decl/ext/objc_implementation_conflicts.swift index 400764bd0c46c..2243570d5f6a7 100644 --- a/test/decl/ext/objc_implementation_conflicts.swift +++ b/test/decl/ext/objc_implementation_conflicts.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -import-objc-header %S/Inputs/objc_implementation.h -target %target-stable-abi-triple -// RUN: %target-typecheck-verify-swift -DPRIVATE_MODULE -Xcc -fmodule-map-file=%S/Inputs/objc_implementation_private.modulemap -target %target-stable-abi-triple +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -import-objc-header %S/Inputs/objc_implementation.h -target %target-stable-abi-triple +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -DPRIVATE_MODULE -Xcc -fmodule-map-file=%S/Inputs/objc_implementation_private.modulemap -target %target-stable-abi-triple // REQUIRES: objc_interop diff --git a/test/decl/ext/objc_implementation_deployment_target.swift b/test/decl/ext/objc_implementation_deployment_target.swift index 0735cb2225ecd..41d3b79691672 100644 --- a/test/decl/ext/objc_implementation_deployment_target.swift +++ b/test/decl/ext/objc_implementation_deployment_target.swift @@ -1,5 +1,5 @@ // Hardcode x86_64 macOS because Apple Silicon was born ABI-stable -// RUN: %target-typecheck-verify-swift -import-objc-header %S/Inputs/objc_implementation.h -target x86_64-apple-macosx10.14.3 -enable-experimental-feature ObjCImplementation +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -import-objc-header %S/Inputs/objc_implementation.h -target x86_64-apple-macosx10.14.3 -enable-experimental-feature ObjCImplementation // REQUIRES: objc_interop // REQUIRES: OS=macosx // REQUIRES: swift_feature_ObjCImplementation diff --git a/test/decl/ext/objc_implementation_early_adopter.swift b/test/decl/ext/objc_implementation_early_adopter.swift index 3170083a269c1..30adc38254698 100644 --- a/test/decl/ext/objc_implementation_early_adopter.swift +++ b/test/decl/ext/objc_implementation_early_adopter.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -import-objc-header %S/Inputs/objc_implementation.h -enable-experimental-feature ObjCImplementation -enable-experimental-feature CImplementation -target %target-stable-abi-triple +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -import-objc-header %S/Inputs/objc_implementation.h -enable-experimental-feature ObjCImplementation -enable-experimental-feature CImplementation -target %target-stable-abi-triple // REQUIRES: objc_interop // REQUIRES: swift_feature_CImplementation // REQUIRES: swift_feature_ObjCImplementation diff --git a/test/decl/func/functions.swift b/test/decl/func/functions.swift index 92542cc96a103..96dd8398a2036 100644 --- a/test/decl/func/functions.swift +++ b/test/decl/func/functions.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-objc-interop +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-objc-interop infix operator ==== infix operator <<<< diff --git a/test/decl/init/resilience-cross-module.swift b/test/decl/init/resilience-cross-module.swift index b14c2486e4ed6..cbeb40be323b9 100644 --- a/test/decl/init/resilience-cross-module.swift +++ b/test/decl/init/resilience-cross-module.swift @@ -3,11 +3,11 @@ // RUN: %target-swift-frontend -emit-module -enable-library-evolution -emit-module-path=%t/resilient_struct.swiftmodule -module-name=resilient_struct %S/../../Inputs/resilient_struct.swift // RUN: %target-swift-frontend -emit-module -enable-library-evolution -emit-module-path=%t/resilient_protocol.swiftmodule -module-name=resilient_protocol %S/../../Inputs/resilient_protocol.swift -// RUN: %target-swift-frontend -typecheck -swift-version 4 -verify -I %t %s -// RUN: %target-swift-frontend -typecheck -swift-version 4 -verify -enable-library-evolution -I %t %s +// RUN: %target-swift-frontend -typecheck -swift-version 4 -verify -verify-ignore-unrelated -I %t %s +// RUN: %target-swift-frontend -typecheck -swift-version 4 -verify -verify-ignore-unrelated -enable-library-evolution -I %t %s -// RUN: %target-swift-frontend -typecheck -swift-version 5 -verify -I %t %s -// RUN: %target-swift-frontend -typecheck -swift-version 5 -verify -enable-library-evolution -I %t %s +// RUN: %target-swift-frontend -typecheck -swift-version 5 -verify -verify-ignore-unrelated -I %t %s +// RUN: %target-swift-frontend -typecheck -swift-version 5 -verify -verify-ignore-unrelated -enable-library-evolution -I %t %s import resilient_struct import resilient_protocol diff --git a/test/decl/objc_redeclaration.swift b/test/decl/objc_redeclaration.swift index 9c196ac31d21f..297f536a945ba 100644 --- a/test/decl/objc_redeclaration.swift +++ b/test/decl/objc_redeclaration.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -module-name ZZZ %s -disable-objc-attr-requires-foundation-module -verify -verify-ignore-unknown +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -module-name ZZZ %s -disable-objc-attr-requires-foundation-module -verify -verify-ignore-unrelated -verify-ignore-unknown import Foundation diff --git a/test/decl/operator/lookup.swift b/test/decl/operator/lookup.swift index fb861ce5b7a92..791c87c80cabe 100644 --- a/test/decl/operator/lookup.swift +++ b/test/decl/operator/lookup.swift @@ -5,7 +5,7 @@ // RUN: %target-swift-frontend -emit-module %S/Inputs/lookup_moduleB.swift -module-name B -o %t -I %t // RUN: %target-swift-frontend -emit-module %S/Inputs/lookup_moduleA.swift -module-name A -o %t -I %t // RUN: %target-swift-frontend -emit-module %S/Inputs/lookup_module_exportsAC.swift -module-name ExportsAC -o %t -I %t -// RUN: %target-swift-frontend -typecheck -verify -primary-file %s %S/Inputs/lookup_other.swift %S/Inputs/lookup_other2.swift %S/Inputs/lookup_other_noncompat.swift -I %t -enable-new-operator-lookup +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -primary-file %s %S/Inputs/lookup_other.swift %S/Inputs/lookup_other2.swift %S/Inputs/lookup_other_noncompat.swift -I %t -enable-new-operator-lookup import ExportsAC import B diff --git a/test/decl/operator/lookup_compatibility.swift b/test/decl/operator/lookup_compatibility.swift index 08d52d3e97b51..7d62c2bf5cfca 100644 --- a/test/decl/operator/lookup_compatibility.swift +++ b/test/decl/operator/lookup_compatibility.swift @@ -5,7 +5,7 @@ // RUN: %target-swift-frontend -emit-module %S/Inputs/lookup_moduleB.swift -module-name B -o %t -I %t // RUN: %target-swift-frontend -emit-module %S/Inputs/lookup_moduleA.swift -module-name A -o %t -I %t // RUN: %target-swift-frontend -emit-module %S/Inputs/lookup_module_exportsAC.swift -module-name ExportsAC -o %t -I %t -// RUN: %target-swift-frontend -typecheck -verify -primary-file %s %S/Inputs/lookup_other.swift %S/Inputs/lookup_other2.swift %S/Inputs/lookup_other_compat.swift -I %t +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -primary-file %s %S/Inputs/lookup_other.swift %S/Inputs/lookup_other2.swift %S/Inputs/lookup_other_compat.swift -I %t import ExportsAC import B diff --git a/test/decl/protocol/associated_type_overrides_conformances_cross_module.swift b/test/decl/protocol/associated_type_overrides_conformances_cross_module.swift index 86920f46630e1..f1437fc8eee9f 100644 --- a/test/decl/protocol/associated_type_overrides_conformances_cross_module.swift +++ b/test/decl/protocol/associated_type_overrides_conformances_cross_module.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -D M -emit-module -module-name M -parse-as-library -o %t %s -// RUN: %target-typecheck-verify-swift -I %t +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %t #if M diff --git a/test/decl/protocol/conforms/failure.swift b/test/decl/protocol/conforms/failure.swift index ebf5c0a166d95..4fe3ff14877f1 100644 --- a/test/decl/protocol/conforms/failure.swift +++ b/test/decl/protocol/conforms/failure.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated protocol P1 { func foo() // expected-note {{protocol requires function 'foo()'}} diff --git a/test/decl/protocol/conforms/fixit_stub_2.swift b/test/decl/protocol/conforms/fixit_stub_2.swift index 1e6f5ecc178fa..048e1399c528a 100644 --- a/test/decl/protocol/conforms/fixit_stub_2.swift +++ b/test/decl/protocol/conforms/fixit_stub_2.swift @@ -1,7 +1,7 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend %S/Inputs/fixit_stub_mutability_proto_module.swift -emit-module -parse-as-library -o %t -// RUN: %target-swift-frontend -typecheck %s -I %t -verify +// RUN: %target-swift-frontend -typecheck %s -I %t -verify -verify-ignore-unrelated protocol P0_A { associatedtype T } // expected-note{{protocol requires nested type 'T'}} protocol P0_B { associatedtype T } diff --git a/test/decl/protocol/conforms/fixit_stub_amiguity.swift b/test/decl/protocol/conforms/fixit_stub_amiguity.swift index 40c981a571221..a8189a8453357 100644 --- a/test/decl/protocol/conforms/fixit_stub_amiguity.swift +++ b/test/decl/protocol/conforms/fixit_stub_amiguity.swift @@ -1,7 +1,7 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend %S/Inputs/fixit_stub_ambiguity_module.swift -module-name Ambiguous -emit-module -parse-as-library -o %t -// RUN: %target-swift-frontend -typecheck %s -I %t -verify +// RUN: %target-swift-frontend -typecheck %s -I %t -verify -verify-ignore-unrelated import Ambiguous diff --git a/test/decl/protocol/conforms/objc_async.swift b/test/decl/protocol/conforms/objc_async.swift index 4ae407b86de68..8c6c19bb3d8cb 100644 --- a/test/decl/protocol/conforms/objc_async.swift +++ b/test/decl/protocol/conforms/objc_async.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -I %S/Inputs/custom-modules -target %target-swift-5.1-abi-triple %s -verify -verify-ignore-unknown +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -I %S/Inputs/custom-modules -target %target-swift-5.1-abi-triple %s -verify -verify-ignore-unrelated -verify-ignore-unknown // REQUIRES: objc_interop // REQUIRES: concurrency diff --git a/test/decl/protocol/conforms/objc_renamed.swift b/test/decl/protocol/conforms/objc_renamed.swift index da76d82b5a324..5dc3e65f340b1 100644 --- a/test/decl/protocol/conforms/objc_renamed.swift +++ b/test/decl/protocol/conforms/objc_renamed.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated %s // REQUIRES: objc_interop diff --git a/test/decl/protocol/conforms/placement.swift b/test/decl/protocol/conforms/placement.swift index 955f8332a0277..34da6e172b6b8 100644 --- a/test/decl/protocol/conforms/placement.swift +++ b/test/decl/protocol/conforms/placement.swift @@ -2,7 +2,7 @@ // RUN: %target-swift-frontend %S/Inputs/placement_module_A.swift -emit-module -parse-as-library -o %t // RUN: %target-swift-frontend -I %t %S/Inputs/placement_module_B.swift -emit-module -parse-as-library -o %t -// RUN: %target-swift-frontend -typecheck -primary-file %s %S/Inputs/placement_2.swift -I %t -verify +// RUN: %target-swift-frontend -typecheck -primary-file %s %S/Inputs/placement_2.swift -I %t -verify -verify-ignore-unrelated // Tests for the placement of conformances as well as conflicts // between conformances that come from different sources. diff --git a/test/decl/protocol/conforms/redundant_conformance.swift b/test/decl/protocol/conforms/redundant_conformance.swift index 41d8b1953f376..13ce00474c823 100644 --- a/test/decl/protocol/conforms/redundant_conformance.swift +++ b/test/decl/protocol/conforms/redundant_conformance.swift @@ -2,7 +2,7 @@ // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/redundant_conformance_A.swift // RUN: %target-swift-frontend -emit-module -o %t -I %t %S/Inputs/redundant_conformance_B.swift -// RUN: %target-typecheck-verify-swift -I %t +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %t import redundant_conformance_A import redundant_conformance_B diff --git a/test/decl/protocol/conforms/redundant_conformance_same_conditions.swift b/test/decl/protocol/conforms/redundant_conformance_same_conditions.swift index c5c7502546bdd..c3f624aeece76 100644 --- a/test/decl/protocol/conforms/redundant_conformance_same_conditions.swift +++ b/test/decl/protocol/conforms/redundant_conformance_same_conditions.swift @@ -2,7 +2,7 @@ // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/redundant_conformance_A.swift // RUN: %target-swift-frontend -emit-module -o %t -I %t %S/Inputs/redundant_conformance_B.swift -// RUN: %target-typecheck-verify-swift -I %t +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %t import redundant_conformance_A import redundant_conformance_B diff --git a/test/decl/protocol/conforms/typed_throws.swift b/test/decl/protocol/conforms/typed_throws.swift index f030b2031d3ee..157b02ca42d9c 100644 --- a/test/decl/protocol/conforms/typed_throws.swift +++ b/test/decl/protocol/conforms/typed_throws.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -parse-as-library +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -parse-as-library enum MyError: Error { case failed diff --git a/test/decl/protocol/deserialized_witness_mismatch.swift b/test/decl/protocol/deserialized_witness_mismatch.swift index 9a37b2d6b3488..6705156121807 100644 --- a/test/decl/protocol/deserialized_witness_mismatch.swift +++ b/test/decl/protocol/deserialized_witness_mismatch.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend %S/Inputs/deserialized_witness_mismatch_other.swift -emit-module-path %t/deserialized_witness_mismatch_other.swiftmodule -// RUN: %target-swift-frontend -I %t/ %s -typecheck -verify +// RUN: %target-swift-frontend -I %t/ %s -typecheck -verify -verify-ignore-unrelated // Deserialized computed properties don't have a PatternBindingDecl, so // make sure we don't expect to find one. diff --git a/test/decl/protocol/objc_error_convention_conflict.swift b/test/decl/protocol/objc_error_convention_conflict.swift index abe2c1eb62012..1610cadc1c762 100644 --- a/test/decl/protocol/objc_error_convention_conflict.swift +++ b/test/decl/protocol/objc_error_convention_conflict.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify %s -import-objc-header %S/Inputs/objc_error_convention_conflict.h +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -verify-ignore-unrelated %s -import-objc-header %S/Inputs/objc_error_convention_conflict.h // REQUIRES: objc_interop class CallerXYImpl: CallerX, CallerY { diff --git a/test/decl/protocol/req/witness_fix_its.swift b/test/decl/protocol/req/witness_fix_its.swift index 2b923ab040dd8..1148bbbf5eb5d 100644 --- a/test/decl/protocol/req/witness_fix_its.swift +++ b/test/decl/protocol/req/witness_fix_its.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module -o %t/OtherOS.swiftmodule -module-name OtherOS %S/Inputs/witness_fix_its_other_module.swift -parse-as-library -// RUN: %target-typecheck-verify-swift -I %t/ +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -I %t/ prefix operator ^^^ postfix operator ^^^^ diff --git a/test/decl/protocol/special/Actor.swift b/test/decl/protocol/special/Actor.swift index 9a42697489511..b6a1298092e9f 100644 --- a/test/decl/protocol/special/Actor.swift +++ b/test/decl/protocol/special/Actor.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated // REQUIRES: concurrency // Synthesis of conformances for actors. diff --git a/test/decl/protocol/special/case_iterable/case_iterable_unsupported.swift b/test/decl/protocol/special/case_iterable/case_iterable_unsupported.swift index f707e5017207c..ded431bc969d2 100644 --- a/test/decl/protocol/special/case_iterable/case_iterable_unsupported.swift +++ b/test/decl/protocol/special/case_iterable/case_iterable_unsupported.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck -verify -primary-file %s %S/../Inputs/case_iterable_other.swift -verify-additional-prefix unsupported- -verify-ignore-unknown +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -primary-file %s %S/../Inputs/case_iterable_other.swift -verify-additional-prefix unsupported- -verify-ignore-unknown extension FromOtherFile: CaseIterable {} // expected-error {{extension outside of file declaring enum 'FromOtherFile' prevents automatic synthesis of 'allCases' for protocol 'CaseIterable'}} expected-note {{add stubs for conformance}} diff --git a/test/decl/protocol/special/coding/class_codable_codingkeys_typealias.swift b/test/decl/protocol/special/coding/class_codable_codingkeys_typealias.swift index c62afac107629..17476481e555e 100644 --- a/test/decl/protocol/special/coding/class_codable_codingkeys_typealias.swift +++ b/test/decl/protocol/special/coding/class_codable_codingkeys_typealias.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown // Simple classes with all Codable properties whose CodingKeys come from a // typealias should get derived conformance to Codable. diff --git a/test/decl/protocol/special/coding/class_codable_computed_vars.swift b/test/decl/protocol/special/coding/class_codable_computed_vars.swift index 1f4088be122ce..0962f87f9d6d9 100644 --- a/test/decl/protocol/special/coding/class_codable_computed_vars.swift +++ b/test/decl/protocol/special/coding/class_codable_computed_vars.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown // Classes with computed members should get synthesized conformance to Codable, // but their lazy and computed members should be skipped as part of the diff --git a/test/decl/protocol/special/coding/class_codable_default_initializer.swift b/test/decl/protocol/special/coding/class_codable_default_initializer.swift index 017aaf726f349..43892518b50c7 100644 --- a/test/decl/protocol/special/coding/class_codable_default_initializer.swift +++ b/test/decl/protocol/special/coding/class_codable_default_initializer.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown // A class with no initializers (which has non-initialized properties so a // default constructor can be synthesized) should produce an error. diff --git a/test/decl/protocol/special/coding/class_codable_excluded_optional_properties.swift b/test/decl/protocol/special/coding/class_codable_excluded_optional_properties.swift index 1b2d1ccb5f6a5..3aa08cf0739da 100644 --- a/test/decl/protocol/special/coding/class_codable_excluded_optional_properties.swift +++ b/test/decl/protocol/special/coding/class_codable_excluded_optional_properties.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated class ClassWithNonExcludedLetMembers : Codable { // expected-error {{class 'ClassWithNonExcludedLetMembers' has no initializers}} // expected-error@-1 {{type 'ClassWithNonExcludedLetMembers' does not conform to protocol 'Decodable'}} diff --git a/test/decl/protocol/special/coding/class_codable_failure_diagnostics.swift b/test/decl/protocol/special/coding/class_codable_failure_diagnostics.swift index e06724325099c..8fb36a5fd8a97 100644 --- a/test/decl/protocol/special/coding/class_codable_failure_diagnostics.swift +++ b/test/decl/protocol/special/coding/class_codable_failure_diagnostics.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -verify -verify-ignore-unrelated // Codable class with non-Codable property. class C1 : Codable { diff --git a/test/decl/protocol/special/coding/class_codable_inheritance.swift b/test/decl/protocol/special/coding/class_codable_inheritance.swift index f20702bb7f16e..f07ce4432986d 100644 --- a/test/decl/protocol/special/coding/class_codable_inheritance.swift +++ b/test/decl/protocol/special/coding/class_codable_inheritance.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown class SimpleClass : Codable { var x: Int = 1 diff --git a/test/decl/protocol/special/coding/class_codable_inheritance_diagnostics.swift b/test/decl/protocol/special/coding/class_codable_inheritance_diagnostics.swift index aeac7d871e470..042f77ee907c9 100644 --- a/test/decl/protocol/special/coding/class_codable_inheritance_diagnostics.swift +++ b/test/decl/protocol/special/coding/class_codable_inheritance_diagnostics.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown // Non-Decodable superclasses of synthesized Decodable classes must implement // init(). diff --git a/test/decl/protocol/special/coding/class_codable_invalid_codingkeys.swift b/test/decl/protocol/special/coding/class_codable_invalid_codingkeys.swift index a4ce3323a8785..8187c4dfea24c 100644 --- a/test/decl/protocol/special/coding/class_codable_invalid_codingkeys.swift +++ b/test/decl/protocol/special/coding/class_codable_invalid_codingkeys.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown // Classes with a CodingKeys entity which is not a type should not derive // conformance. diff --git a/test/decl/protocol/special/coding/class_codable_member_type_lookup.swift b/test/decl/protocol/special/coding/class_codable_member_type_lookup.swift index a5aff44830681..43653e6ca641b 100644 --- a/test/decl/protocol/special/coding/class_codable_member_type_lookup.swift +++ b/test/decl/protocol/special/coding/class_codable_member_type_lookup.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -package-name myPkg +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -package-name myPkg // A top-level CodingKeys type to fall back to in lookups below. public enum CodingKeys : String, CodingKey { diff --git a/test/decl/protocol/special/coding/class_codable_non_strong_vars.swift b/test/decl/protocol/special/coding/class_codable_non_strong_vars.swift index cfe2497a2322e..e0a0da1578e59 100644 --- a/test/decl/protocol/special/coding/class_codable_non_strong_vars.swift +++ b/test/decl/protocol/special/coding/class_codable_non_strong_vars.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown // Classes with Codable properties (with non-strong ownership) should get // derived conformance to Codable. diff --git a/test/decl/protocol/special/coding/class_codable_nonconforming_property.swift b/test/decl/protocol/special/coding/class_codable_nonconforming_property.swift index 34ee37d3e57e3..1dca870132a43 100644 --- a/test/decl/protocol/special/coding/class_codable_nonconforming_property.swift +++ b/test/decl/protocol/special/coding/class_codable_nonconforming_property.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown struct NonCodable : Hashable { func hash(into hasher: inout Hasher) {} diff --git a/test/decl/protocol/special/coding/class_codable_simple.swift b/test/decl/protocol/special/coding/class_codable_simple.swift index b3404223592b1..6c98c1f65c3e2 100644 --- a/test/decl/protocol/special/coding/class_codable_simple.swift +++ b/test/decl/protocol/special/coding/class_codable_simple.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown // Simple classes with all Codable properties should get derived conformance to // Codable. diff --git a/test/decl/protocol/special/coding/class_codable_simple_conditional.swift b/test/decl/protocol/special/coding/class_codable_simple_conditional.swift index 6dd447e6508d5..a3fb8541aedef 100644 --- a/test/decl/protocol/special/coding/class_codable_simple_conditional.swift +++ b/test/decl/protocol/special/coding/class_codable_simple_conditional.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -swift-version 4 class Conditional { var x: T diff --git a/test/decl/protocol/special/coding/class_codable_simple_conditional_final.swift b/test/decl/protocol/special/coding/class_codable_simple_conditional_final.swift index e41e64271d82b..210e067c3400a 100644 --- a/test/decl/protocol/special/coding/class_codable_simple_conditional_final.swift +++ b/test/decl/protocol/special/coding/class_codable_simple_conditional_final.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -swift-version 4 final class Conditional { var x: T diff --git a/test/decl/protocol/special/coding/class_codable_simple_conditional_final_separate.swift b/test/decl/protocol/special/coding/class_codable_simple_conditional_final_separate.swift index fec5d2a8277c1..bd3057996da01 100644 --- a/test/decl/protocol/special/coding/class_codable_simple_conditional_final_separate.swift +++ b/test/decl/protocol/special/coding/class_codable_simple_conditional_final_separate.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -swift-version 4 final class Conditional { var x: T diff --git a/test/decl/protocol/special/coding/class_codable_simple_conditional_separate.swift b/test/decl/protocol/special/coding/class_codable_simple_conditional_separate.swift index 0033a58b734a8..4fb99e7921c1b 100644 --- a/test/decl/protocol/special/coding/class_codable_simple_conditional_separate.swift +++ b/test/decl/protocol/special/coding/class_codable_simple_conditional_separate.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -swift-version 4 class Conditional { var x: T diff --git a/test/decl/protocol/special/coding/class_codable_simple_extension.swift b/test/decl/protocol/special/coding/class_codable_simple_extension.swift index 90b21c3331f00..2aeb8bc991c53 100644 --- a/test/decl/protocol/special/coding/class_codable_simple_extension.swift +++ b/test/decl/protocol/special/coding/class_codable_simple_extension.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -swift-version 4 // Non-final classes where Codable conformance is added in extensions should // only be able to derive conformance for Encodable. diff --git a/test/decl/protocol/special/coding/class_codable_simple_extension_final.swift b/test/decl/protocol/special/coding/class_codable_simple_extension_final.swift index c6b323f9fd462..e6eb29bca72dd 100644 --- a/test/decl/protocol/special/coding/class_codable_simple_extension_final.swift +++ b/test/decl/protocol/special/coding/class_codable_simple_extension_final.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -swift-version 4 // Simple final classes where Codable conformance is added in extensions should // be able to derive conformance for both Codable protocols. diff --git a/test/decl/protocol/special/coding/class_codable_simple_multi.swift b/test/decl/protocol/special/coding/class_codable_simple_multi.swift index 1c6245e1d41d5..61aaf4cc616c0 100644 --- a/test/decl/protocol/special/coding/class_codable_simple_multi.swift +++ b/test/decl/protocol/special/coding/class_codable_simple_multi.swift @@ -1,2 +1,2 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown %S/Inputs/class_codable_simple_multi1.swift %S/Inputs/class_codable_simple_multi2.swift -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown %S/Inputs/class_codable_simple_multi2.swift %S/Inputs/class_codable_simple_multi1.swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown %S/Inputs/class_codable_simple_multi1.swift %S/Inputs/class_codable_simple_multi2.swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown %S/Inputs/class_codable_simple_multi2.swift %S/Inputs/class_codable_simple_multi1.swift diff --git a/test/decl/protocol/special/coding/enum_codable_case_identifier_overloads.swift b/test/decl/protocol/special/coding/enum_codable_case_identifier_overloads.swift index 3007f89c4c00e..91192900cc9ed 100644 --- a/test/decl/protocol/special/coding/enum_codable_case_identifier_overloads.swift +++ b/test/decl/protocol/special/coding/enum_codable_case_identifier_overloads.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown // Simple enums with all Codable parameters whose CodingKeys come from a // typealias should get derived conformance to Codable. diff --git a/test/decl/protocol/special/coding/enum_codable_codingkeys_typealias.swift b/test/decl/protocol/special/coding/enum_codable_codingkeys_typealias.swift index 17b53610f3fe6..86ba2445d3bb5 100644 --- a/test/decl/protocol/special/coding/enum_codable_codingkeys_typealias.swift +++ b/test/decl/protocol/special/coding/enum_codable_codingkeys_typealias.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown // Simple enums with all Codable parameters whose CodingKeys come from a // typealias should get derived conformance to Codable. diff --git a/test/decl/protocol/special/coding/enum_codable_conflicting_parameter_identifier.swift b/test/decl/protocol/special/coding/enum_codable_conflicting_parameter_identifier.swift index 43e71ea7ef80c..efaf70573b894 100644 --- a/test/decl/protocol/special/coding/enum_codable_conflicting_parameter_identifier.swift +++ b/test/decl/protocol/special/coding/enum_codable_conflicting_parameter_identifier.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown enum Duplicate : Codable { // expected-error {{type 'Duplicate' does not conform to protocol 'Decodable'}} // expected-error@-1 {{type 'Duplicate' does not conform to protocol 'Encodable'}} diff --git a/test/decl/protocol/special/coding/enum_codable_excluded_optional_properties.swift b/test/decl/protocol/special/coding/enum_codable_excluded_optional_properties.swift index d308bc7306278..6fd719067c24f 100644 --- a/test/decl/protocol/special/coding/enum_codable_excluded_optional_properties.swift +++ b/test/decl/protocol/special/coding/enum_codable_excluded_optional_properties.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated enum EnumWithNonExcludedOptionalParameters : Codable { // expected-error {{type 'EnumWithNonExcludedOptionalParameters' does not conform to protocol 'Decodable'}} // expected-error@-1 {{type 'EnumWithNonExcludedOptionalParameters' does not conform to protocol 'Encodable'}} diff --git a/test/decl/protocol/special/coding/enum_codable_failure_diagnostics.swift b/test/decl/protocol/special/coding/enum_codable_failure_diagnostics.swift index 6a4435c742cfb..d107c60a7e393 100644 --- a/test/decl/protocol/special/coding/enum_codable_failure_diagnostics.swift +++ b/test/decl/protocol/special/coding/enum_codable_failure_diagnostics.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -verify -verify-ignore-unrelated // Codable enum with non-Codable parameter. enum E1 : Codable { diff --git a/test/decl/protocol/special/coding/enum_codable_invalid_codingkeys.swift b/test/decl/protocol/special/coding/enum_codable_invalid_codingkeys.swift index 656301d860495..4c0745b27f5eb 100644 --- a/test/decl/protocol/special/coding/enum_codable_invalid_codingkeys.swift +++ b/test/decl/protocol/special/coding/enum_codable_invalid_codingkeys.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown // Enums with a CodingKeys entity which is not a type should not derive // conformance. diff --git a/test/decl/protocol/special/coding/enum_codable_nonconforming_property.swift b/test/decl/protocol/special/coding/enum_codable_nonconforming_property.swift index ef3a55befdd9b..2619cdefc13a5 100644 --- a/test/decl/protocol/special/coding/enum_codable_nonconforming_property.swift +++ b/test/decl/protocol/special/coding/enum_codable_nonconforming_property.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown enum NonCodable : Hashable { func hash(into hasher: inout Hasher) {} diff --git a/test/decl/protocol/special/coding/enum_codable_simple.swift b/test/decl/protocol/special/coding/enum_codable_simple.swift index 39a655020a0c3..1158d9bc4c263 100644 --- a/test/decl/protocol/special/coding/enum_codable_simple.swift +++ b/test/decl/protocol/special/coding/enum_codable_simple.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown // Simple enums with all Codable parameters should get derived conformance to // Codable. diff --git a/test/decl/protocol/special/coding/enum_codable_simple_conditional.swift b/test/decl/protocol/special/coding/enum_codable_simple_conditional.swift index bb8af6d96e4a0..e5b9383f39416 100644 --- a/test/decl/protocol/special/coding/enum_codable_simple_conditional.swift +++ b/test/decl/protocol/special/coding/enum_codable_simple_conditional.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -swift-version 4 enum Conditional { case a(x: T, y: T?) diff --git a/test/decl/protocol/special/coding/enum_codable_simple_conditional_separate.swift b/test/decl/protocol/special/coding/enum_codable_simple_conditional_separate.swift index 4d7cf1470b8c3..7b6d5abbc153d 100644 --- a/test/decl/protocol/special/coding/enum_codable_simple_conditional_separate.swift +++ b/test/decl/protocol/special/coding/enum_codable_simple_conditional_separate.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -swift-version 4 enum Conditional { case a(x: T, y: T?) diff --git a/test/decl/protocol/special/coding/enum_codable_simple_extension.swift b/test/decl/protocol/special/coding/enum_codable_simple_extension.swift index 66d4d3ae82a2d..9930908725217 100644 --- a/test/decl/protocol/special/coding/enum_codable_simple_extension.swift +++ b/test/decl/protocol/special/coding/enum_codable_simple_extension.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -swift-version 4 // Simple enums where Codable conformance is added in extensions should derive // conformance. diff --git a/test/decl/protocol/special/coding/enum_codable_simple_extension_flipped.swift b/test/decl/protocol/special/coding/enum_codable_simple_extension_flipped.swift index 2c6fcb0793a39..d8e73537cebd9 100644 --- a/test/decl/protocol/special/coding/enum_codable_simple_extension_flipped.swift +++ b/test/decl/protocol/special/coding/enum_codable_simple_extension_flipped.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -swift-version 4 // Simple enums where Codable conformance is added in extensions should derive // conformance, no matter which order the extension and type occur in. diff --git a/test/decl/protocol/special/coding/enum_codable_simple_multi.swift b/test/decl/protocol/special/coding/enum_codable_simple_multi.swift index 457c41d332018..71fb7ea5a3fd8 100644 --- a/test/decl/protocol/special/coding/enum_codable_simple_multi.swift +++ b/test/decl/protocol/special/coding/enum_codable_simple_multi.swift @@ -1,2 +1,2 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown %S/Inputs/enum_codable_simple_multi1.swift %S/Inputs/enum_codable_simple_multi2.swift -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown %S/Inputs/enum_codable_simple_multi2.swift %S/Inputs/enum_codable_simple_multi1.swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown %S/Inputs/enum_codable_simple_multi1.swift %S/Inputs/enum_codable_simple_multi2.swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown %S/Inputs/enum_codable_simple_multi2.swift %S/Inputs/enum_codable_simple_multi1.swift diff --git a/test/decl/protocol/special/coding/enum_coding_key.swift b/test/decl/protocol/special/coding/enum_coding_key.swift index 74163dbafea33..b5bb4bf9c5037 100644 --- a/test/decl/protocol/special/coding/enum_coding_key.swift +++ b/test/decl/protocol/special/coding/enum_coding_key.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown // Enums with no raw type conforming to CodingKey should get implicit derived // conformance of methods. diff --git a/test/decl/protocol/special/coding/iuo_crash.swift b/test/decl/protocol/special/coding/iuo_crash.swift index 63b3a61143d41..f1d2ea1be7e26 100644 --- a/test/decl/protocol/special/coding/iuo_crash.swift +++ b/test/decl/protocol/special/coding/iuo_crash.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown // Crash due to codable synthesis with implicitly unwrapped optionals of // ill-formed types. diff --git a/test/decl/protocol/special/coding/property_wrappers_codable.swift b/test/decl/protocol/special/coding/property_wrappers_codable.swift index dcd821761e9c5..8bc58dd6fe61c 100644 --- a/test/decl/protocol/special/coding/property_wrappers_codable.swift +++ b/test/decl/protocol/special/coding/property_wrappers_codable.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown @propertyWrapper struct Wrapper { diff --git a/test/decl/protocol/special/coding/struct_codable_codingkeys_typealias.swift b/test/decl/protocol/special/coding/struct_codable_codingkeys_typealias.swift index ab298dff67f3f..ce67ed88fa1ed 100644 --- a/test/decl/protocol/special/coding/struct_codable_codingkeys_typealias.swift +++ b/test/decl/protocol/special/coding/struct_codable_codingkeys_typealias.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown // Simple structs with all Codable properties whose CodingKeys come from a // typealias should get derived conformance to Codable. diff --git a/test/decl/protocol/special/coding/struct_codable_computed_vars.swift b/test/decl/protocol/special/coding/struct_codable_computed_vars.swift index 054c7d77f9fb1..11480cfc58096 100644 --- a/test/decl/protocol/special/coding/struct_codable_computed_vars.swift +++ b/test/decl/protocol/special/coding/struct_codable_computed_vars.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown // Structs with computed members should get synthesized conformance to Codable, // but their lazy and computed members should be skipped as part of the diff --git a/test/decl/protocol/special/coding/struct_codable_excluded_optional_properties.swift b/test/decl/protocol/special/coding/struct_codable_excluded_optional_properties.swift index 84e9b9c3022ec..f8f7e93a34374 100644 --- a/test/decl/protocol/special/coding/struct_codable_excluded_optional_properties.swift +++ b/test/decl/protocol/special/coding/struct_codable_excluded_optional_properties.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated struct StructWithNonExcludedLetMembers : Codable { // expected-error {{type 'StructWithNonExcludedLetMembers' does not conform to protocol 'Decodable'}} // expected-error@-1 {{type 'StructWithNonExcludedLetMembers' does not conform to protocol 'Encodable'}} diff --git a/test/decl/protocol/special/coding/struct_codable_failure_diagnostics.swift b/test/decl/protocol/special/coding/struct_codable_failure_diagnostics.swift index 4928fb44ecc68..7574a1f3d8a93 100644 --- a/test/decl/protocol/special/coding/struct_codable_failure_diagnostics.swift +++ b/test/decl/protocol/special/coding/struct_codable_failure_diagnostics.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -verify -verify-ignore-unrelated // Codable struct with non-Codable property. struct S1 : Codable { diff --git a/test/decl/protocol/special/coding/struct_codable_invalid_codingkeys.swift b/test/decl/protocol/special/coding/struct_codable_invalid_codingkeys.swift index 13f1777ce52f5..9718721dff8d2 100644 --- a/test/decl/protocol/special/coding/struct_codable_invalid_codingkeys.swift +++ b/test/decl/protocol/special/coding/struct_codable_invalid_codingkeys.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown // Structs with a CodingKeys entity which is not a type should not derive // conformance. diff --git a/test/decl/protocol/special/coding/struct_codable_member_type_lookup.swift b/test/decl/protocol/special/coding/struct_codable_member_type_lookup.swift index e55e9747c1376..c1170c9b6da54 100644 --- a/test/decl/protocol/special/coding/struct_codable_member_type_lookup.swift +++ b/test/decl/protocol/special/coding/struct_codable_member_type_lookup.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -package-name myPkg +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -package-name myPkg // A top-level CodingKeys type to fall back to in lookups below. public enum CodingKeys : String, CodingKey { diff --git a/test/decl/protocol/special/coding/struct_codable_non_strong_vars.swift b/test/decl/protocol/special/coding/struct_codable_non_strong_vars.swift index 2d02f4a63c5f6..40614d204c90d 100644 --- a/test/decl/protocol/special/coding/struct_codable_non_strong_vars.swift +++ b/test/decl/protocol/special/coding/struct_codable_non_strong_vars.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown // Structs with Codable properties (with non-strong ownership) should get // derived conformance to Codable. diff --git a/test/decl/protocol/special/coding/struct_codable_nonconforming_property.swift b/test/decl/protocol/special/coding/struct_codable_nonconforming_property.swift index 934d182b66a76..31366c3575c56 100644 --- a/test/decl/protocol/special/coding/struct_codable_nonconforming_property.swift +++ b/test/decl/protocol/special/coding/struct_codable_nonconforming_property.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown struct NonCodable : Hashable { func hash(into hasher: inout Hasher) {} diff --git a/test/decl/protocol/special/coding/struct_codable_simple.swift b/test/decl/protocol/special/coding/struct_codable_simple.swift index 13b835fd82efa..6b7252e8954a0 100644 --- a/test/decl/protocol/special/coding/struct_codable_simple.swift +++ b/test/decl/protocol/special/coding/struct_codable_simple.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown // Simple structs with all Codable properties should get derived conformance to // Codable. diff --git a/test/decl/protocol/special/coding/struct_codable_simple_conditional.swift b/test/decl/protocol/special/coding/struct_codable_simple_conditional.swift index 836c8dcb73897..90ba5f0796db2 100644 --- a/test/decl/protocol/special/coding/struct_codable_simple_conditional.swift +++ b/test/decl/protocol/special/coding/struct_codable_simple_conditional.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -swift-version 4 struct Conditional { var x: T diff --git a/test/decl/protocol/special/coding/struct_codable_simple_conditional_separate.swift b/test/decl/protocol/special/coding/struct_codable_simple_conditional_separate.swift index 40b2f3e0d225f..f5efa13064f2e 100644 --- a/test/decl/protocol/special/coding/struct_codable_simple_conditional_separate.swift +++ b/test/decl/protocol/special/coding/struct_codable_simple_conditional_separate.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -swift-version 4 struct Conditional { var x: T diff --git a/test/decl/protocol/special/coding/struct_codable_simple_extension.swift b/test/decl/protocol/special/coding/struct_codable_simple_extension.swift index 89923f2db3cf0..0631a91d21d15 100644 --- a/test/decl/protocol/special/coding/struct_codable_simple_extension.swift +++ b/test/decl/protocol/special/coding/struct_codable_simple_extension.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -swift-version 4 // Simple structs where Codable conformance is added in extensions should derive // conformance. diff --git a/test/decl/protocol/special/coding/struct_codable_simple_extension_flipped.swift b/test/decl/protocol/special/coding/struct_codable_simple_extension_flipped.swift index c1000f7bac836..9bda11057d2a7 100644 --- a/test/decl/protocol/special/coding/struct_codable_simple_extension_flipped.swift +++ b/test/decl/protocol/special/coding/struct_codable_simple_extension_flipped.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown -swift-version 4 // Simple structs where Codable conformance is added in extensions should derive // conformance, no matter which order the extension and type occur in. diff --git a/test/decl/protocol/special/coding/struct_codable_simple_multi.swift b/test/decl/protocol/special/coding/struct_codable_simple_multi.swift index 0f6c47cfa0ae0..d2d775cdd0bc0 100644 --- a/test/decl/protocol/special/coding/struct_codable_simple_multi.swift +++ b/test/decl/protocol/special/coding/struct_codable_simple_multi.swift @@ -1,2 +1,2 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown %S/Inputs/struct_codable_simple_multi1.swift %S/Inputs/struct_codable_simple_multi2.swift -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown %S/Inputs/struct_codable_simple_multi2.swift %S/Inputs/struct_codable_simple_multi1.swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown %S/Inputs/struct_codable_simple_multi1.swift %S/Inputs/struct_codable_simple_multi2.swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown %S/Inputs/struct_codable_simple_multi2.swift %S/Inputs/struct_codable_simple_multi1.swift diff --git a/test/decl/protocol/special/comparable/comparable_unsupported.swift b/test/decl/protocol/special/comparable/comparable_unsupported.swift index bb2b39994775c..e8d9a2da9f8aa 100644 --- a/test/decl/protocol/special/comparable/comparable_unsupported.swift +++ b/test/decl/protocol/special/comparable/comparable_unsupported.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown // Automatic synthesis of Comparable is only supported for enums for now. diff --git a/test/decl/typealias/generic.swift b/test/decl/typealias/generic.swift index 46995b8896481..082a22f39f3fb 100644 --- a/test/decl/typealias/generic.swift +++ b/test/decl/typealias/generic.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated struct MyType { // expected-note {{generic struct 'MyType' declared here}} // expected-note @-1 {{arguments to generic parameter 'TyB' ('S' and 'Int') are expected to be equal}} diff --git a/test/decl/var/properties.swift b/test/decl/var/properties.swift index 69a3fffd6943e..ad1f6e8ba9843 100644 --- a/test/decl/var/properties.swift +++ b/test/decl/var/properties.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated func markUsed(_ t: T) {} diff --git a/test/embedded/attr-unavailable-in-embedded.swift b/test/embedded/attr-unavailable-in-embedded.swift index b35f0a1c171b3..9e5b93fe8227d 100644 --- a/test/embedded/attr-unavailable-in-embedded.swift +++ b/test/embedded/attr-unavailable-in-embedded.swift @@ -2,7 +2,7 @@ // RUN: %{python} %utils/split_file.py -o %t %s // RUN: %target-swift-frontend -emit-module -o %t/MyModule.swiftmodule %t/MyModule.swift -parse-stdlib -enable-experimental-feature Embedded -parse-as-library -// RUN: %target-swift-frontend -typecheck -verify -I %t %t/Main.swift -parse-stdlib -enable-experimental-feature Embedded +// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -I %t %t/Main.swift -parse-stdlib -enable-experimental-feature Embedded // REQUIRES: swift_in_compiler // REQUIRES: swift_feature_Embedded diff --git a/test/embedded/mirror.swift b/test/embedded/mirror.swift index 6578381fd30b2..432d3e33d172b 100644 --- a/test/embedded/mirror.swift +++ b/test/embedded/mirror.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-emit-ir -verify %s -enable-experimental-feature Embedded -wmo +// RUN: %target-swift-emit-ir -verify -verify-ignore-unrelated %s -enable-experimental-feature Embedded -wmo // REQUIRES: swift_in_compiler // REQUIRES: optimized_stdlib diff --git a/test/embedded/multi-module-debug-info.swift b/test/embedded/multi-module-debug-info.swift index 644e40bb51b8d..458b091537369 100644 --- a/test/embedded/multi-module-debug-info.swift +++ b/test/embedded/multi-module-debug-info.swift @@ -2,7 +2,7 @@ // RUN: %{python} %utils/split_file.py -o %t %s // RUN: %target-swift-frontend -emit-module -o %t/MyModule.swiftmodule %t/MyModule.swift -enable-experimental-feature Embedded -parse-as-library -// RUN: %target-swift-frontend -c -I %t %t/Main.swift -enable-experimental-feature Embedded -verify -o /dev/null +// RUN: %target-swift-frontend -c -I %t %t/Main.swift -enable-experimental-feature Embedded -verify -verify-ignore-unrelated -o /dev/null // REQUIRES: OS=macosx || OS=linux-gnu // REQUIRES: swift_feature_Embedded diff --git a/test/expr/expressions.swift b/test/expr/expressions.swift index d84994169fbb4..878b73a439553 100644 --- a/test/expr/expressions.swift +++ b/test/expr/expressions.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated //===----------------------------------------------------------------------===// // Tests and samples. diff --git a/test/expr/primary/keypath/keypath-objc.swift b/test/expr/primary/keypath/keypath-objc.swift index 2bdfbcffdc0a0..34373e2570a8d 100644 --- a/test/expr/primary/keypath/keypath-objc.swift +++ b/test/expr/primary/keypath/keypath-objc.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library %s -verify +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library %s -verify -verify-ignore-unrelated import ObjectiveC import Foundation diff --git a/test/expr/unary/if_expr.swift b/test/expr/unary/if_expr.swift index 50aa0562fc409..f7775d99ff97c 100644 --- a/test/expr/unary/if_expr.swift +++ b/test/expr/unary/if_expr.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -disable-availability-checking +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -disable-availability-checking // MARK: Functions diff --git a/test/expr/unary/keypath/salvage-with-other-type-errors.swift b/test/expr/unary/keypath/salvage-with-other-type-errors.swift index ea840d762d508..d676ebecd0dd2 100644 --- a/test/expr/unary/keypath/salvage-with-other-type-errors.swift +++ b/test/expr/unary/keypath/salvage-with-other-type-errors.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated // Ensure that key path exprs can tolerate being re-type-checked when necessary // to diagnose other errors in adjacent exprs. diff --git a/test/expr/unary/switch_expr.swift b/test/expr/unary/switch_expr.swift index c2e8e48467ef2..a23f421451a8e 100644 --- a/test/expr/unary/switch_expr.swift +++ b/test/expr/unary/switch_expr.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -disable-availability-checking +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -disable-availability-checking // MARK: Functions diff --git a/test/stdlib/ArrayDiagnostics.swift b/test/stdlib/ArrayDiagnostics.swift index f61451af26f48..011105bc400f7 100644 --- a/test/stdlib/ArrayDiagnostics.swift +++ b/test/stdlib/ArrayDiagnostics.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated class NotEquatable {} diff --git a/test/stdlib/BinaryIntegerRequirements.swift b/test/stdlib/BinaryIntegerRequirements.swift index a4dc016950ed5..3dddb8c91459a 100644 --- a/test/stdlib/BinaryIntegerRequirements.swift +++ b/test/stdlib/BinaryIntegerRequirements.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -swift-version 4 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 4 struct MyInt: FixedWidthInteger { // expected-error {{type 'MyInt' does not conform to protocol 'BinaryInteger'}} expected-note {{add stubs for conformance}} typealias IntegerLiteralType = Int diff --git a/test/stdlib/DispatchRenames.swift b/test/stdlib/DispatchRenames.swift index d6d717a980409..047d5318c0138 100644 --- a/test/stdlib/DispatchRenames.swift +++ b/test/stdlib/DispatchRenames.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift %import-libdispatch +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated %import-libdispatch // REQUIRES: libdispatch import Dispatch diff --git a/test/stdlib/FloatingPointDiagnostics.swift b/test/stdlib/FloatingPointDiagnostics.swift index 54e3955c849dd..ef7cabb89ea78 100644 --- a/test/stdlib/FloatingPointDiagnostics.swift +++ b/test/stdlib/FloatingPointDiagnostics.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated func unavailableModulo(description: String = "") { _ = 42.0 % 2 // expected-error {{For floating point numbers use truncatingRemainder}} diff --git a/test/stdlib/IntegerDiagnostics.swift b/test/stdlib/IntegerDiagnostics.swift index cdb0cd4e345f9..f8222c52d9f5b 100644 --- a/test/stdlib/IntegerDiagnostics.swift +++ b/test/stdlib/IntegerDiagnostics.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -swift-version 4 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 4 func signedBitPattern() { _ = Int64(bitPattern: 0.0) // expected-error {{Please use Int64(bitPattern: UInt64) in combination with Double.bitPattern property.}} diff --git a/test/stdlib/KeyPathAppending.swift b/test/stdlib/KeyPathAppending.swift index 0e94e527474bc..9eb438079f515 100644 --- a/test/stdlib/KeyPathAppending.swift +++ b/test/stdlib/KeyPathAppending.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated // Check that all combinations of key paths produce the expected result type // and choose the expected overloads. diff --git a/test/stdlib/Random.swift b/test/stdlib/Random.swift index 8a8c2258d4320..6ad63f2edcb52 100644 --- a/test/stdlib/Random.swift +++ b/test/stdlib/Random.swift @@ -9,7 +9,7 @@ // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors // //===----------------------------------------------------------------------===// -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated struct Jawn { } diff --git a/test/stdlib/StringCompatibilityDiagnostics.swift b/test/stdlib/StringCompatibilityDiagnostics.swift index c69144f71fffa..b9cf48bca381e 100644 --- a/test/stdlib/StringCompatibilityDiagnostics.swift +++ b/test/stdlib/StringCompatibilityDiagnostics.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck -swift-version 5 %s -verify +// RUN: %target-swift-frontend -typecheck -swift-version 5 %s -verify -verify-ignore-unrelated func testPopFirst() { let str = "abc" diff --git a/test/stdlib/StringDiagnostics.swift b/test/stdlib/StringDiagnostics.swift index 3a53a26c69ee0..7978947436c54 100644 --- a/test/stdlib/StringDiagnostics.swift +++ b/test/stdlib/StringDiagnostics.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated // REQUIRES: objc_interop diff --git a/test/stdlib/UnavailableStringAPIs.swift.gyb b/test/stdlib/UnavailableStringAPIs.swift.gyb index 30fe07b37cb80..d4984a2701ffb 100644 --- a/test/stdlib/UnavailableStringAPIs.swift.gyb +++ b/test/stdlib/UnavailableStringAPIs.swift.gyb @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %gyb -D_runtime=%target-runtime %s -o %t/main.swift -// RUN: %line-directive %t/main.swift -- %target-swift-frontend -typecheck -verify %t/main.swift +// RUN: %line-directive %t/main.swift -- %target-swift-frontend -typecheck -verify -verify-ignore-unrelated %t/main.swift func test_StringSubscriptByInt( x: String, diff --git a/test/stdlib/UnicodeScalarDiagnostics.swift b/test/stdlib/UnicodeScalarDiagnostics.swift index 863fdde2ae5da..ca5c452563977 100644 --- a/test/stdlib/UnicodeScalarDiagnostics.swift +++ b/test/stdlib/UnicodeScalarDiagnostics.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated // FIXME: The clarity of these diagnostics could be improved. // diff --git a/test/stdlib/UnsafePointerDiagnostics.swift b/test/stdlib/UnsafePointerDiagnostics.swift index eb843b30622ed..53c5bffece4e2 100644 --- a/test/stdlib/UnsafePointerDiagnostics.swift +++ b/test/stdlib/UnsafePointerDiagnostics.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-invalid-ephemeralness-as-error -disable-objc-interop +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-invalid-ephemeralness-as-error -disable-objc-interop // Test availability attributes on UnsafePointer initializers. // Assume the original source contains no UnsafeRawPointer types. diff --git a/test/stdlib/UnsafePointerDiagnostics_warning.swift b/test/stdlib/UnsafePointerDiagnostics_warning.swift index 108be85487ec1..9e5d9a0d50cc6 100644 --- a/test/stdlib/UnsafePointerDiagnostics_warning.swift +++ b/test/stdlib/UnsafePointerDiagnostics_warning.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -disable-objc-interop +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -disable-objc-interop // Test that we get a custom diagnostic for an ephemeral conversion to non-ephemeral param for an Unsafe[Mutable][Raw][Buffer]Pointer init. func unsafePointerInitEphemeralConversions() { diff --git a/test/stdlib/simd_diagnostics.swift b/test/stdlib/simd_diagnostics.swift index 289921e4769cc..d6e2c12fa9f0a 100644 --- a/test/stdlib/simd_diagnostics.swift +++ b/test/stdlib/simd_diagnostics.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated // FIXME: No simd module on linux rdar://problem/20795411 // XFAIL: OS=linux-gnu, OS=windows-msvc, OS=openbsd, OS=linux-android, OS=linux-androideabi, OS=freebsd diff --git a/test/stmt/errors.swift b/test/stmt/errors.swift index aa6f943d80c10..964ce3b30d82a 100644 --- a/test/stmt/errors.swift +++ b/test/stmt/errors.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated enum MSV : Error { case Foo, Bar, Baz diff --git a/test/stmt/foreach.swift b/test/stmt/foreach.swift index 293aefb54a380..caea79b6cfa2a 100644 --- a/test/stmt/foreach.swift +++ b/test/stmt/foreach.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated // Bad containers and ranges struct BadContainer1 { diff --git a/test/type/builtin_types.swift b/test/type/builtin_types.swift index 2d54a255a1701..5ca582129601e 100644 --- a/test/type/builtin_types.swift +++ b/test/type/builtin_types.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -parse-stdlib +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -parse-stdlib import Swift diff --git a/test/type/explicit_existential.swift b/test/type/explicit_existential.swift index ed629adbd7cde..8127e162eac30 100644 --- a/test/type/explicit_existential.swift +++ b/test/type/explicit_existential.swift @@ -1,14 +1,14 @@ -// RUN: %target-typecheck-verify-swift \ +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated \ // RUN: -verify-additional-prefix default-swift-mode- -// RUN: %target-typecheck-verify-swift -swift-version 6 \ +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -swift-version 6 \ // RUN: -verify-additional-prefix swift-6- -// RUN: %target-typecheck-verify-swift -enable-upcoming-feature ExistentialAny \ +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-upcoming-feature ExistentialAny \ // RUN: -verify-additional-prefix default-swift-mode- \ // RUN: -verify-additional-prefix explicit-any- -// RUN: %target-typecheck-verify-swift -enable-upcoming-feature ExistentialAny:migrate \ +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-upcoming-feature ExistentialAny:migrate \ // To verify that the message is not followed by // "; this will be an error ...". // RUN: -verify-additional-prefix default-swift-mode- \ diff --git a/test/type/implicit_some/explicit_existential.swift b/test/type/implicit_some/explicit_existential.swift index f830cfa0699b6..0d33cc42ff893 100644 --- a/test/type/implicit_some/explicit_existential.swift +++ b/test/type/implicit_some/explicit_existential.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -disable-availability-checking -enable-experimental-feature ImplicitSome +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -disable-availability-checking -enable-experimental-feature ImplicitSome // REQUIRES: swift_feature_ImplicitSome diff --git a/test/type/nested_types.swift b/test/type/nested_types.swift index c86370af598dc..acd2ae16a87a4 100644 --- a/test/type/nested_types.swift +++ b/test/type/nested_types.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -module-name test +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -module-name test struct X { typealias MyInt = Int diff --git a/test/type/objc_direct.swift b/test/type/objc_direct.swift index e0ef19e47ffc4..2b2682e262f41 100644 --- a/test/type/objc_direct.swift +++ b/test/type/objc_direct.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-objc-interop -import-objc-header %S/../Inputs/objc_direct.h +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -enable-objc-interop -import-objc-header %S/../Inputs/objc_direct.h // REQUIRES: objc_interop diff --git a/test/type/types.swift b/test/type/types.swift index d78b46771b64c..ba577308b748f 100644 --- a/test/type/types.swift +++ b/test/type/types.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated var a : Int diff --git a/validation-test/Sema/SwiftUI/rdar57201781.swift b/validation-test/Sema/SwiftUI/rdar57201781.swift index 548bfc2ba68e3..2fedad32ed5ca 100644 --- a/validation-test/Sema/SwiftUI/rdar57201781.swift +++ b/validation-test/Sema/SwiftUI/rdar57201781.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -target %target-cpu-apple-macosx10.15 -swift-version 5 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -target %target-cpu-apple-macosx10.15 -swift-version 5 // REQUIRES: objc_interop // REQUIRES: OS=macosx diff --git a/validation-test/Sema/SwiftUI/rdar57410798.swift b/validation-test/Sema/SwiftUI/rdar57410798.swift index 9f2cc67f03889..e56889ce3816f 100644 --- a/validation-test/Sema/SwiftUI/rdar57410798.swift +++ b/validation-test/Sema/SwiftUI/rdar57410798.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -target %target-cpu-apple-macosx10.15 -swift-version 5 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -target %target-cpu-apple-macosx10.15 -swift-version 5 // REQUIRES: objc_interop // REQUIRES: OS=macosx diff --git a/validation-test/Sema/SwiftUI/rdar74447308.swift b/validation-test/Sema/SwiftUI/rdar74447308.swift index ee1601eb79e7b..d59653ac9070d 100644 --- a/validation-test/Sema/SwiftUI/rdar74447308.swift +++ b/validation-test/Sema/SwiftUI/rdar74447308.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -target %target-cpu-apple-macosx10.15 -swift-version 5 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -target %target-cpu-apple-macosx10.15 -swift-version 5 // REQUIRES: objc_interop // REQUIRES: OS=macosx diff --git a/validation-test/Sema/SwiftUI/rdar84580119.swift b/validation-test/Sema/SwiftUI/rdar84580119.swift index aa7b333acf8ce..20c0164e08c8a 100644 --- a/validation-test/Sema/SwiftUI/rdar84580119.swift +++ b/validation-test/Sema/SwiftUI/rdar84580119.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -target %target-cpu-apple-macosx10.15 -swift-version 5 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -target %target-cpu-apple-macosx10.15 -swift-version 5 // REQUIRES: objc_interop // REQUIRES: OS=macosx diff --git a/validation-test/Sema/SwiftUI/rdar88256059.swift b/validation-test/Sema/SwiftUI/rdar88256059.swift index 4ddbbe90603c5..9a3b55def709e 100644 --- a/validation-test/Sema/SwiftUI/rdar88256059.swift +++ b/validation-test/Sema/SwiftUI/rdar88256059.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -target %target-cpu-apple-macosx10.15 -swift-version 5 +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -target %target-cpu-apple-macosx10.15 -swift-version 5 // REQUIRES: objc_interop // REQUIRES: OS=macosx diff --git a/validation-test/Sema/protocol_typo_correction.swift b/validation-test/Sema/protocol_typo_correction.swift index fef105a6189c2..5e7c13a3a089b 100644 --- a/validation-test/Sema/protocol_typo_correction.swift +++ b/validation-test/Sema/protocol_typo_correction.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %target-swift-frontend -emit-module -D LIB %s -o %t/Lib.swiftmodule -// RUN: %target-swift-frontend -I %t -typecheck %s -verify +// RUN: %target-swift-frontend -I %t -typecheck %s -verify -verify-ignore-unrelated // REQUIRES: objc_interop #if LIB diff --git a/validation-test/Sema/type_checker_crashers_fixed/rdar141012049.swift b/validation-test/Sema/type_checker_crashers_fixed/rdar141012049.swift index 9c2f747ca9d2e..cd132c2afa4cb 100644 --- a/validation-test/Sema/type_checker_crashers_fixed/rdar141012049.swift +++ b/validation-test/Sema/type_checker_crashers_fixed/rdar141012049.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated func test(_ v: [Int]) { let result = v.filter { }.flatMap(\.wrong) { diff --git a/validation-test/Sema/type_checker_crashers_fixed/rdar45470505.swift b/validation-test/Sema/type_checker_crashers_fixed/rdar45470505.swift index c49d4f2ef18d3..bf3f88ac8ee0e 100644 --- a/validation-test/Sema/type_checker_crashers_fixed/rdar45470505.swift +++ b/validation-test/Sema/type_checker_crashers_fixed/rdar45470505.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated extension BinaryInteger { init(bytes: [UInt8]) { fatalError() } diff --git a/validation-test/compiler_crashers_2_fixed/issue-61031.swift b/validation-test/compiler_crashers_2_fixed/issue-61031.swift index 177d6f04b287c..9ae81ffdebc8f 100644 --- a/validation-test/compiler_crashers_2_fixed/issue-61031.swift +++ b/validation-test/compiler_crashers_2_fixed/issue-61031.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated public struct Wrapped: Sequence where Values: Sequence { public var values: Values diff --git a/validation-test/stdlib/CollectionDiagnostics.swift b/validation-test/stdlib/CollectionDiagnostics.swift index 42e84834ca3de..583c2f3523caf 100644 --- a/validation-test/stdlib/CollectionDiagnostics.swift +++ b/validation-test/stdlib/CollectionDiagnostics.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -verify-ignore-unknown +// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -verify-ignore-unknown import StdlibUnittest import StdlibCollectionUnittest diff --git a/validation-test/stdlib/FixedPointDiagnostics.swift.gyb b/validation-test/stdlib/FixedPointDiagnostics.swift.gyb index 2b2df2812c0d2..3f9c887c2ed00 100644 --- a/validation-test/stdlib/FixedPointDiagnostics.swift.gyb +++ b/validation-test/stdlib/FixedPointDiagnostics.swift.gyb @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) // RUN: %gyb %s -o %t/main.swift -// RUN: %line-directive %t/main.swift -- %target-swift-frontend -typecheck -verify -swift-version 4.2 %t/main.swift +// RUN: %line-directive %t/main.swift -- %target-swift-frontend -typecheck -verify -verify-ignore-unrelated -swift-version 4.2 %t/main.swift func testUnaryMinusInUnsigned() { var a: UInt8 = -(1) // expected-error {{no '-' candidates produce the expected contextual result type 'UInt8'}} expected-note * {{}} expected-warning * {{}}