Use uint32_t in DiagnosticNodes

Author: HassanElDesouky

include/swift/AST/LocalizationFormat.h

@@ -18,26 +18,29 @@
 #ifndef SWIFT_LOCALIZATIONFORMAT_H
 #define SWIFT_LOCALIZATIONFORMAT_H
 
+#include "llvm/ADT/StringRef.h"
 #include "llvm/Support/YAMLParser.h"
 #include "llvm/Support/YAMLTraits.h"
+#include <string>
+#include <type_traits>
 
 namespace {
-enum LocalDiagID : uint32_t;
+enum class DiagID : uint32_t;
 }
 
 namespace swift {
 namespace diag {
 
 struct DiagnosticNode {
-  LocalDiagID id;
+  uint32_t id;
   std::string msg;
 };
 
 class LocalizationProducer {
 public:
   /// If the  message isn't available/localized in the current `yaml` file,
   /// return the fallback default message.
-  virtual llvm::StringRef getMessageOr(LocalDiagID id,
+  virtual llvm::StringRef getMessageOr(DiagID id,
                                        llvm::StringRef defaultMessage) const {
     return defaultMessage;
   }
@@ -49,7 +52,7 @@ class YAMLLocalizationProducer final : public LocalizationProducer {
 public:
   std::vector<std::string> diagnostics;
   explicit YAMLLocalizationProducer(std::string locale, std::string path);
-  llvm::StringRef getMessageOr(LocalDiagID id,
+  llvm::StringRef getMessageOr(DiagID id,
                                llvm::StringRef defaultMessage) const override;
 };
 

lib/AST/DiagnosticEngine.cpp

@@ -1018,11 +1018,11 @@ const char *DiagnosticEngine::diagnosticStringFor(const DiagID id,
   }
   auto defaultMessage = diagnosticStrings[(unsigned)id];
   if (localization) {
-    const std::string &localizedMessage =
-        localization.get()->getMessageOr((LocalDiagID)id, defaultMessage);
-    return localizedMessage.c_str();
+    auto localizedMessage =
+        localization.get()->getMessageOr(id, defaultMessage);
+    return localizedMessage.data();
   }
-  return diagnosticStrings[(unsigned)id];
+  return defaultMessage;
 }
 
 const char *InFlightDiagnostic::fixItStringFor(const FixItID id) {

lib/AST/LocalizationFormat.cpp

@@ -16,9 +16,14 @@
 //===----------------------------------------------------------------------===//
 
 #include "swift/AST/LocalizationFormat.h"
+#include "llvm/ADT/SmallString.h"
+#include "llvm/ADT/StringRef.h"
 #include "llvm/Support/CommandLine.h"
+#include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/YAMLParser.h"
 #include "llvm/Support/YAMLTraits.h"
+#include <string>
+#include <type_traits>
 
 namespace {
 enum LocalDiagID : uint32_t {
@@ -41,8 +46,16 @@ template <> struct ScalarEnumerationTraits<LocalDiagID> {
 
 template <> struct MappingTraits<swift::diag::DiagnosticNode> {
   static void mapping(IO &io, swift::diag::DiagnosticNode &node) {
-    io.mapRequired("id", node.id);
+    // Cast `uint32_t` to `LocalDiagID` to use `diagID` at
+    // ScalarEnumerationTraits, because EnumerationTraits has to have an `id` of
+    // type `LocalDiagID`
+    auto diagID = static_cast<LocalDiagID>(node.id);
+    io.mapRequired("id", diagID);
     io.mapRequired("msg", node.msg);
+    // We will need to cast `diagID` back again to unsigned int, and assign it
+    // to `node.id` because we will need the `uint32_t` value as it'll be used
+    // to retrieve diagnostic nodes later.
+    node.id = (unsigned)diagID;
   }
 };