averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into manual-main-merge

Browse Source 
Conflicts:
  - `lib/Driver/ToolChains.cpp` conflicting with the `addAllArgs` rename
    for multiple options
This commit is contained in:
Ben Barham
2024-09-16 13:53:18 -07:00
parent 0358c9eab7 0bd4e4e921
commit a7b50f357f
487 changed files with 8947 additions and 6026 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/Localization/LocalizationFormat.cpp
View File

@@ -34,17 +34,11 @@
namespace {
enum LocalDiagID : uint32_t {
#define DIAG(KIND, ID, Options, Text, Signature) ID,
#define DIAG(KIND, ID, Group, Options, Text, Signature) ID,
#include "swift/AST/DiagnosticsAll.def"
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 swift {
@@ -96,12 +90,6 @@ LocalizationProducer::getMessageOr(swift::DiagID id,
auto localizedMessage = getMessage(id);
if (localizedMessage.empty())
return defaultMessage;
if (printDiagnosticNames) {
llvm::StringRef diagnosticName(diagnosticNameStrings[(unsigned)id]);
auto localizedDebugDiagnosticMessage =
localizationSaver.save(localizedMessage.str() + diagnosticName.str());
return localizedDebugDiagnosticMessage;
}
return localizedMessage;
}
@@ -110,9 +98,8 @@ LocalizationProducerState LocalizationProducer::getState() const {
}
SerializedLocalizationProducer::SerializedLocalizationProducer(
std::unique_ptr<llvm::MemoryBuffer> buffer, bool printDiagnosticNames)
: LocalizationProducer(printDiagnosticNames), Buffer(std::move(buffer)) {
}
std::unique_ptr<llvm::MemoryBuffer> buffer)
: LocalizationProducer(), Buffer(std::move(buffer)) {}
bool SerializedLocalizationProducer::initializeImpl() {
auto base =
@@ -133,8 +120,8 @@ SerializedLocalizationProducer::getMessage(swift::DiagID id) const {
}
std::unique_ptr<LocalizationProducer>
LocalizationProducer::producerFor(llvm::StringRef locale, llvm::StringRef path,
bool printDiagnosticNames) {
LocalizationProducer::producerFor(llvm::StringRef locale,
llvm::StringRef path) {
llvm::SmallString<128> filePath(path);
llvm::sys::path::append(filePath, locale);
llvm::sys::path::replace_extension(filePath, ".db");
@@ -144,13 +131,13 @@ LocalizationProducer::producerFor(llvm::StringRef locale, llvm::StringRef path,
if (llvm::sys::fs::exists(filePath)) {
if (auto file = llvm::MemoryBuffer::getFile(filePath)) {
return std::make_unique<diag::SerializedLocalizationProducer>(
std::move(file.get()), printDiagnosticNames);
std::move(file.get()));
}
} else {
llvm::sys::path::replace_extension(filePath, ".strings");
if (llvm::sys::fs::exists(filePath)) {
return std::make_unique<diag::StringsLocalizationProducer>(
filePath.str(), printDiagnosticNames);
filePath.str());
}
}
@@ -207,7 +194,7 @@ void StringsLocalizationProducer::forEachAvailable(
void StringsLocalizationProducer::readStringsFile(
llvm::MemoryBuffer *in, std::vector<std::string> &diagnostics) {
std::map<std::string, unsigned> diagLocs;
#define DIAG(KIND, ID, Options, Text, Signature) \
#define DIAG(KIND, ID, Group, Options, Text, Signature) \
diagLocs[#ID] = static_cast<unsigned>(LocalDiagID::ID);
#include "swift/AST/DiagnosticsAll.def"
#undef DIAG