Merge pull request #37507 from benlangmuir/revert-dep-change

Revert "Update LocalizationFormat to use diagnosticIDStringFor"

Author: benlangmuir

lib/Localization/CMakeLists.txt

@@ -4,5 +4,3 @@ add_swift_host_library(swiftLocalization STATIC
 
   LLVM_LINK_COMPONENTS
     support)
-target_link_libraries(swiftLocalization PRIVATE
-  swiftAST)

lib/Localization/LocalizationFormat.cpp

@@ -15,7 +15,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "swift/Localization/LocalizationFormat.h"
-#include "swift/AST/DiagnosticEngine.h"
 #include "swift/Basic/Range.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SmallString.h"
@@ -40,6 +39,12 @@ enum LocalDiagID : uint32_t {
   NumDiags
 };
 
+static constexpr const char *const diagnosticNameStrings[] = {
+#define DIAG(KIND, ID, Options, Text, Signature) " [" #ID "]",
+#include "swift/AST/DiagnosticsAll.def"
+    "<not a diagnostic>",
+};
+
 } // namespace
 
 namespace llvm {
@@ -110,9 +115,9 @@ LocalizationProducer::getMessageOr(swift::DiagID id,
   if (localizedMessage.empty())
     return defaultMessage;
   if (printDiagnosticNames) {
-    llvm::StringRef diagnosticID(DiagnosticEngine::diagnosticIDStringFor(id));
+    llvm::StringRef diagnosticName(diagnosticNameStrings[(unsigned)id]);
     auto localizedDebugDiagnosticMessage =
-        localizationSaver.save(localizedMessage.str() + " [" + diagnosticID.str() + "]");
+        localizationSaver.save(localizedMessage.str() + diagnosticName.str());
     return localizedDebugDiagnosticMessage;
   }
   return localizedMessage;