Store type string alongside LLVM types in spec

Author: frabert

include/anvill/Declarations.h

@@ -66,6 +66,9 @@ struct ValueDecl {
 
   // Type of this value.
   llvm::Type *type{nullptr};
+
+  // Untranslated type string of this value.
+  std::string type_string;
 };
 
 // A value declaration corresponding with a named parameter.
@@ -105,6 +108,9 @@ struct VariableDecl {
   // `0x14` there is also an `int`.
   llvm::Type *type{nullptr};
 
+  // Untranslated type string of this variable.
+  std::string type_string;
+
   // Address of this global variable.
   std::uint64_t address{0};
 

lib/JSON.cpp

@@ -361,6 +361,7 @@ JSONTranslator::DecodeValue(const llvm::json::Object *obj, const char *desc,
 
   if (auto maybe_type_str = obj->getString("type")) {
     std::string spec = maybe_type_str->str();
+    decl.type_string = spec;
     auto type_spec_res = type_translator.DecodeFromString(spec);
     if (!type_spec_res.Succeeded()) {
       std::stringstream ss;
@@ -754,6 +755,7 @@ JSONTranslator::DecodeGlobalVar(const llvm::json::Object *obj) const {
 
   anvill::VariableDecl decl;
   decl.type = type;
+  decl.type_string = spec;
   decl.address = address;
   return decl;
 }