Skip to content

Commit 0a0571a

Browse files
committed
Revert "Update LocalizationFormat to use diagnosticIDStringFor"
The depenedency on libAST this introduced is causing build time regressions. This reverts commit ea86221.
1 parent 283abc0 commit 0a0571a

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

lib/Localization/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,3 @@ add_swift_host_library(swiftLocalization STATIC
44

55
LLVM_LINK_COMPONENTS
66
support)
7-
target_link_libraries(swiftLocalization PRIVATE
8-
swiftAST)

lib/Localization/LocalizationFormat.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
//===----------------------------------------------------------------------===//
1616

1717
#include "swift/Localization/LocalizationFormat.h"
18-
#include "swift/AST/DiagnosticEngine.h"
1918
#include "swift/Basic/Range.h"
2019
#include "llvm/ADT/Optional.h"
2120
#include "llvm/ADT/SmallString.h"
@@ -40,6 +39,12 @@ enum LocalDiagID : uint32_t {
4039
NumDiags
4140
};
4241

42+
static constexpr const char *const diagnosticNameStrings[] = {
43+
#define DIAG(KIND, ID, Options, Text, Signature) " [" #ID "]",
44+
#include "swift/AST/DiagnosticsAll.def"
45+
"<not a diagnostic>",
46+
};
47+
4348
} // namespace
4449

4550
namespace llvm {
@@ -110,9 +115,9 @@ LocalizationProducer::getMessageOr(swift::DiagID id,
110115
if (localizedMessage.empty())
111116
return defaultMessage;
112117
if (printDiagnosticNames) {
113-
llvm::StringRef diagnosticID(DiagnosticEngine::diagnosticIDStringFor(id));
118+
llvm::StringRef diagnosticName(diagnosticNameStrings[(unsigned)id]);
114119
auto localizedDebugDiagnosticMessage =
115-
localizationSaver.save(localizedMessage.str() + " [" + diagnosticID.str() + "]");
120+
localizationSaver.save(localizedMessage.str() + diagnosticName.str());
116121
return localizedDebugDiagnosticMessage;
117122
}
118123
return localizedMessage;

0 commit comments

Comments
 (0)