[CodeGen] implement '.metadata' for Yul.

Author: Jinkela

include/soll/Basic/DiagnosticParseKinds.inc

@@ -33,4 +33,3 @@ DIAG(err_multiple_fallbacks, CLASS_ERROR, (unsigned)diag::Severity::Error, "mult
 DIAG(warn_virtual_already_specified, CLASS_WARNING, (unsigned)diag::Severity::Warning, "Virtual already specified.", 0, false, 1)
 DIAG(warn_override_already_specified, CLASS_WARNING, (unsigned)diag::Severity::Warning, "Override already specified.", 0, false, 1)
 DIAG(err_multiinherited_unsupport, CLASS_ERROR, (unsigned)diag::Severity::Error, "Multinherited overrided is not supported!", 0, false, 1)
-DIAG(warn_yul_metadata, CLASS_WARNING, (unsigned)diag::Severity::Warning, "soll currently does not attach '.metadata' to wasm bytecode.", 0, false, 1)

lib/CodeGen/CodeGenModule.cpp

@@ -1619,7 +1619,10 @@ void CodeGenModule::emitYulObject(const YulObject *YO) {
   }
   assert(nullptr != YO->getCode());
   if (YO->getName() == ".metadata") {
-    // TODO: attach '.metadata' to wasm bytecode.
+    // ignore sub-object and code
+    for (const auto *D : YO->getDataList()) {
+      emitYulDataInMetadata(D);
+    }
     return;
   }
   for (const auto *O : YO->getObjectList()) {
@@ -1659,11 +1662,31 @@ void CodeGenModule::emitYulCode(const YulCode *YC, llvm::StringRef Name) {
 void CodeGenModule::emitYulData(const YulData *YD) {
   llvm::StringRef Name = YD->getUniqueName();
   std::string Data = YD->getBody()->getValue();
+  if (YD->getName() == ".metadata") {
+    llvm::SmallVector<llvm::Metadata *, 8> Ops;
+    llvm::StringRef Name = YD->getName();
+    std::string Data = YD->getBody()->getValue();
+    Ops.push_back(llvm::MDString::get(VMContext, Name));
+    Ops.push_back(llvm::MDString::get(VMContext, Data));
+    auto MD = getModule().getOrInsertNamedMetadata("wasm.custom_sections");
+    MD->addOperand(llvm::MDTuple::get(VMContext, Ops));
+    return;
+  }
   llvm::GlobalVariable *Variable =
       createGlobalString(VMContext, getModule(), Data, Name);
   YulDataMap.try_emplace(YD, Variable);
 }
 
+void CodeGenModule::emitYulDataInMetadata(const YulData *YD) {
+  llvm::SmallVector<llvm::Metadata *, 8> Ops;
+  std::string Name = ".metadata." + YD->getName().str();
+  std::string Data = YD->getBody()->getValue();
+  Ops.push_back(llvm::MDString::get(VMContext, Name));
+  Ops.push_back(llvm::MDString::get(VMContext, Data));
+  auto MD = getModule().getOrInsertNamedMetadata("wasm.custom_sections");
+  MD->addOperand(llvm::MDTuple::get(VMContext, Ops));
+}
+
 std::string CodeGenModule::getMangledName(const CallableVarDecl *CVD) {
   // XXX: Implement mangling
   std::string Name = CVD->getUniqueName().str() + '(';

lib/CodeGen/CodeGenModule.h

@@ -254,6 +254,7 @@ class CodeGenModule : public CodeGenTypeCache {
 
   void emitYulCode(const YulCode *YC, llvm::StringRef Name);
   void emitYulData(const YulData *YD);
+  void emitYulDataInMetadata(const YulData *YD);
   void emitAsmVarDecl(const AsmVarDecl *VD);
 
   void emitABILoad(const FunctionDecl *FD, llvm::BasicBlock *Loader,

lib/Parse/ParseYul.cpp

@@ -53,9 +53,6 @@ unique_ptr<YulObject> Parser::parseYulObject() {
   ConsumeToken();
 
   auto Name = stringUnquote(std::string(Tok.getLiteralData(), Tok.getLength()));
-  if (Name == ".metadata") {
-    Diag(diag::warn_yul_metadata);
-  }
 
   ConsumeStringToken();
   ExpectAndConsume(tok::l_brace);