Diagnose the use of -disable-access-checking with strict safety checking

Author: DougGregor

include/swift/AST/DiagnosticsFrontend.def

@@ -589,9 +589,9 @@ ERROR(experimental_not_supported_in_production,none,
       "experimental feature '%0' cannot be enabled in production compiler",
       (StringRef))
 
-GROUPED_WARNING(Ounchecked_with_strict_safety,Unsafe,none,
-      "'-Ounchecked' is not memory-safe and should not be combined with "
-      "strict memory safety checking", ())
+GROUPED_WARNING(command_line_conflicts_with_strict_safety,Unsafe,none,
+      "'%0' is not memory-safe and should not be combined with "
+      "strict memory safety checking", (StringRef))
 
 #define UNDEFINE_DIAGNOSTIC_MACROS
 #include "DefineDiagnosticMacros.h"

lib/Frontend/CompilerInvocation.cpp

@@ -3840,7 +3840,15 @@ bool CompilerInvocation::parseArgs(
   if (LangOpts.hasFeature(Feature::WarnUnsafe)) {
     if (SILOpts.RemoveRuntimeAsserts ||
         SILOpts.AssertConfig == SILOptions::Unchecked) {
-      Diags.diagnose(SourceLoc(), diag::Ounchecked_with_strict_safety);
+      Diags.diagnose(SourceLoc(),
+                     diag::command_line_conflicts_with_strict_safety,
+                     "-Ounchecked");
+    }
+
+    if (!LangOpts.EnableAccessControl) {
+      Diags.diagnose(SourceLoc(),
+                     diag::command_line_conflicts_with_strict_safety,
+                     "-disable-access-control");
     }
   }
 

test/Unsafe/unsafe_Ounchecked.swift renamed to test/Unsafe/unsafe_command_line.swift

@@ -1,5 +1,6 @@
-// RUN: %target-swift-frontend -typecheck -enable-experimental-feature WarnUnsafe -Ounchecked %s 2>&1 | %FileCheck %s
+// RUN: %target-swift-frontend -typecheck -enable-experimental-feature WarnUnsafe -Ounchecked -disable-access-control %s 2>&1 | %FileCheck %s
 
 // REQUIRES: swift_feature_WarnUnsafe
 
 // CHECK: warning: '-Ounchecked' is not memory-safe
+// CHECK: warning: '-disable-access-control' is not memory-safe