[DiagnosticVerifier] Verify all diagnostics by default

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 <unknown>, that is controlled by VerifyIgnoreUnknown.
+  bool VerifyIgnoreUnrelated = false;
+
   /// Indicates whether diagnostic passes should be skipped.
   bool SkipDiagnosticPasses = false;
 

include/swift/Frontend/DiagnosticVerifier.h

@@ -99,18 +99,19 @@ class DiagnosticVerifier : public DiagnosticConsumer {
   ArrayRef<std::string> AdditionalFilePaths;
   bool AutoApplyFixes;
   bool IgnoreUnknown;
+  bool IgnoreUnrelated;
   bool UseColor;
   ArrayRef<std::string> AdditionalExpectedPrefixes;
 
 public:
   explicit DiagnosticVerifier(SourceManager &SM, ArrayRef<unsigned> BufferIDs,
                               ArrayRef<std::string> AdditionalFilePaths,
                               bool AutoApplyFixes, bool IgnoreUnknown,
-                              bool UseColor,
+                              bool IgnoreUnrelated, bool UseColor,
                               ArrayRef<std::string> 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<CapturedDiagnosticInfo> &CapturedDiagnostics) const;
+
   bool
   verifyUnknown(std::vector<CapturedDiagnosticInfo> &CapturedDiagnostics) const;
 

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 '<unknown>' 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<"<module-name>">,
   HelpText<"Verify the generic signatures in the given module">;

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);

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<CapturedDiagnosticInfo> &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 <unknown>, all errors are unexpected.
     Result.HadUnexpectedDiag |= HadError;
   }
+  if (!IgnoreUnrelated) {
+    bool HadError = verifyUnrelated(CapturedDiagnostics);
+    Result.HadError |= HadError;
+    Result.HadUnexpectedDiag |= HadError;
+  }
 
   if (Result.HadUnexpectedDiag)
     printRemainingDiagnostics();

lib/Frontend/Frontend.cpp

@@ -434,8 +434,8 @@ bool CompilerInstance::setupDiagnosticVerifierIfNeeded() {
     DiagVerifier = std::make_unique<DiagnosticVerifier>(
         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());
   }

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
 

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) {

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
 

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.

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<A, B> {
   associatedtype A  // expected-note {{multiple matching types named 'A'}}

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 "<unknown>: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.

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
 

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
 

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
 

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
 

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

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
 

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
 

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
 

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
 

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.

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}}

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

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'}}

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
 

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
 

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

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

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

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
 

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