Merge pull request #71230 from hborla/swift-6-statistics

Author: hborla

include/swift/AST/DiagnosticEngine.h

@@ -22,6 +22,7 @@
 #include "swift/AST/DeclNameLoc.h"
 #include "swift/AST/DiagnosticConsumer.h"
 #include "swift/AST/TypeLoc.h"
+#include "swift/Basic/Statistic.h"
 #include "swift/Basic/Version.h"
 #include "swift/Localization/LocalizationFormat.h"
 #include "llvm/ADT/BitVector.h"
@@ -888,6 +889,10 @@ namespace swift {
     /// until a specific language version, e.g. Swift 6.
     version::Version languageVersion;
 
+    /// The stats reporter used to keep track of Swift 6 errors
+    /// diagnosed via \c warnUntilSwiftVersion(6).
+    UnifiedStatsReporter *statsReporter = nullptr;
+
     /// Whether we are actively pretty-printing a declaration as part of
     /// diagnostics.
     bool IsPrettyPrintingDecl = false;
@@ -959,6 +964,10 @@ namespace swift {
 
     void setLanguageVersion(version::Version v) { languageVersion = v; }
 
+    void setStatsReporter(UnifiedStatsReporter *stats) {
+      statsReporter = stats;
+    }
+
     void setLocalization(StringRef locale, StringRef path) {
       assert(!locale.empty());
       assert(!path.empty());

include/swift/Basic/Statistics.def

@@ -252,6 +252,10 @@ FRONTEND_STATISTIC(Sema, NumTypesDeserialized)
 /// Number of lazy iterable declaration contexts left unloaded.
 FRONTEND_STATISTIC(Sema, NumUnloadedLazyIterableDeclContexts)
 
+/// Number of Swift 6 errors, including those that are downgraded to
+/// warnings in Swift 5 mode.
+FRONTEND_STATISTIC(Sema, NumSwift6Errors)
+
 /// Number of lookups into a module and its imports.
 
 /// All type check requests go into the Sema area.

lib/AST/DiagnosticEngine.cpp

@@ -334,6 +334,12 @@ InFlightDiagnostic::warnUntilSwiftVersion(unsigned majorVersion) {
       .wrapIn(diag::error_in_future_swift_version, majorVersion);
   }
 
+  if (majorVersion == 6) {
+    if (auto stats = Engine->statsReporter) {
+      ++stats->getFrontendCounters().NumSwift6Errors;
+    }
+  }
+
   return *this;
 }
 

lib/Frontend/Frontend.cpp

@@ -375,6 +375,7 @@ void CompilerInstance::setupStatsReporter() {
   // Hand the stats reporter down to the ASTContext so the rest of the compiler
   // can use it.
   getASTContext().setStatsReporter(Reporter.get());
+  Diagnostics.setStatsReporter(Reporter.get());
   Stats = std::move(Reporter);
 }