[Misc] update llvm version to 12

Author: Jinkela

CMakeLists.txt

@@ -44,6 +44,9 @@ include_directories(BEFORE
 include_directories("${LLVM_BINARY_DIR}/include" "${LLVM_INCLUDE_DIR}")
 link_directories("${LLVM_LIBRARY_DIR}")
 
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+find_package(Threads REQUIRED)
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_EXTENSIONS OFF)
 if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")

include/soll/AST/ASTContext.h

@@ -4,8 +4,8 @@
 #include "soll/Frontend/FrontendOptions.h"
 #include <llvm/ADT/APInt.h>
 #include <llvm/ADT/IntrusiveRefCntPtr.h>
+#include <llvm/ADT/StringMap.h>
 #include <llvm/IR/Value.h>
-
 namespace soll {
 
 class ASTContext : public llvm::RefCountedBase<ASTContext> {

include/soll/Basic/FileManager.h

@@ -2,6 +2,8 @@
 #pragma once
 #include "soll/Basic/FileSystemOptions.h"
 #include <llvm/ADT/IntrusiveRefCntPtr.h>
+#include <llvm/ADT/StringMap.h>
+#include <llvm/Support/Allocator.h>
 #include <llvm/Support/VirtualFileSystem.h>
 #include <map>
 #include <memory>

include/soll/Basic/IdentifierTable.h

@@ -3,6 +3,7 @@
 #include "soll/Basic/TokenKinds.h"
 #include <llvm/ADT/StringMap.h>
 #include <llvm/ADT/StringRef.h>
+#include <llvm/Support/Allocator.h>
 
 namespace soll {
 

lib/CodeGen/BackendUtil.cpp

@@ -6,6 +6,7 @@
 #include "soll/Basic/TargetOptions.h"
 #include "soll/CodeGen/LoweringInteger.h"
 #include <llvm/ADT/Triple.h>
+#include <llvm/Analysis/AliasAnalysis.h>
 #include <llvm/Analysis/TargetLibraryInfo.h>
 #include <llvm/Analysis/TargetTransformInfo.h>
 #include <llvm/Bitcode/BitcodeWriterPass.h>
@@ -142,7 +143,10 @@ void EmitAssemblyHelper::EmitAssembly(
     TheModule->setDataLayout(TM->createDataLayout());
   }
 
-#if LLVM_VERSION_MAJOR >= 9
+#if LLVM_VERSION_MAJOR >= 12
+  llvm::PassBuilder PB(false, TM.get(), llvm::PipelineTuningOptions(),
+                       llvm::None);
+#elif LLVM_VERSION_MAJOR >= 9
   llvm::PassBuilder PB(TM.get(), llvm::PipelineTuningOptions(), llvm::None);
 #else
   llvm::PassBuilder PB(TM.get(), llvm::None);
@@ -183,19 +187,24 @@ void EmitAssemblyHelper::EmitAssembly(
   default:
     break;
   case O1:
-    MPM.addPass(PB.buildPerModuleDefaultPipeline(llvm::PassBuilder::O1));
+    MPM.addPass(PB.buildPerModuleDefaultPipeline(
+        llvm::PassBuilder::OptimizationLevel::O1));
     break;
   case O2:
-    MPM.addPass(PB.buildPerModuleDefaultPipeline(llvm::PassBuilder::O2));
+    MPM.addPass(PB.buildPerModuleDefaultPipeline(
+        llvm::PassBuilder::OptimizationLevel::O2));
     break;
   case O3:
-    MPM.addPass(PB.buildPerModuleDefaultPipeline(llvm::PassBuilder::O3));
+    MPM.addPass(PB.buildPerModuleDefaultPipeline(
+        llvm::PassBuilder::OptimizationLevel::O3));
     break;
   case Os:
-    MPM.addPass(PB.buildPerModuleDefaultPipeline(llvm::PassBuilder::Os));
+    MPM.addPass(PB.buildPerModuleDefaultPipeline(
+        llvm::PassBuilder::OptimizationLevel::Os));
     break;
   case Oz:
-    MPM.addPass(PB.buildPerModuleDefaultPipeline(llvm::PassBuilder::Oz));
+    MPM.addPass(PB.buildPerModuleDefaultPipeline(
+        llvm::PassBuilder::OptimizationLevel::Oz));
     break;
   }
   MPM.addPass(llvm::AlwaysInlinerPass());

lib/CodeGen/CodeGenAction.cpp

@@ -7,6 +7,7 @@
 #include "llvm/Support/Alignment.h"
 #include <lld/Common/Driver.h>
 #include <llvm/IR/ConstantFolder.h>
+#include <llvm/IR/DerivedTypes.h>
 #include <llvm/IR/DiagnosticInfo.h>
 #include <llvm/IR/IRBuilder.h>
 #include <llvm/Support/ToolOutputFile.h>
@@ -131,7 +132,10 @@ class BackendConsumer : public ASTConsumer {
     llvm::BasicBlock *Entry =
         llvm::BasicBlock::Create(VMContext, "entry", Func);
     Builder.SetInsertPoint(Entry);
-    llvm::Value *Result = llvm::UndefValue::get(Module.getTypeByName("bytes"));
+    // llvm::Value *Result =
+    // llvm::UndefValue::get(Module.getTypeByName("bytes"));
+    llvm::Value *Result = llvm::UndefValue::get(
+        llvm::StructType::getTypeByName(VMContext, "bytes"));
     Result = Builder.CreateInsertValue(Result, Builder.getIntN(256, Length), 0);
     Result = Builder.CreateInsertValue(
         Result, Builder.CreateBitCast(GV, Builder.getInt8PtrTy()), 1);
@@ -181,7 +185,7 @@ class BackendConsumer : public ASTConsumer {
     if (auto Error = removeExports(Wasm->TmpName)) {
       llvm::consumeError(Wasm->discard());
       llvm::consumeError(Object->discard());
-      return Error;
+      return std::move(Error);
     }
 
     auto Binary = llvm::MemoryBuffer::getFile(Wasm->TmpName);
@@ -289,7 +293,7 @@ std::unique_ptr<ASTConsumer>
 CodeGenAction::CreateASTConsumer(CompilerInstance &CI, llvm::StringRef InFile) {
   return std::make_unique<BackendConsumer>(
       Action, CI.getDiagnostics(), CI.getCodeGenOpts(), CI.getTargetOpts(),
-      InFile, *VMContext, CI.GetOutputStreamFunc());
+      InFile.str(), *VMContext, CI.GetOutputStreamFunc());
 }
 
 EmitAssemblyAction::EmitAssemblyAction(llvm::LLVMContext *VMContext)

lib/CodeGen/CodeGenModule.cpp

@@ -1605,7 +1605,7 @@ void CodeGenModule::emitStructDecl(const StructDecl *SD) {
 
 void CodeGenModule::emitYulObject(const YulObject *YO) {
   {
-    const std::string Name = YO->getUniqueName();
+    const std::string Name = YO->getUniqueName().str();
     emitNestedObjectGetter(Name + ".object");
     NestedEntries.emplace_back(Name + ".main", Name + ".object", nullptr);
     /*
@@ -1627,6 +1627,21 @@ void CodeGenModule::emitYulObject(const YulObject *YO) {
   }
   for (const auto *O : YO->getObjectList()) {
     emitYulObject(O);
+    // FIXME
+    {
+      const std::string Name = O->getName().str();
+      emitNestedObjectGetter(Name + ".object");
+      NestedEntries.emplace_back(Name + ".main", Name + ".object", nullptr);
+      /*
+      llvm::Function *DataSize = llvm::Function::Create(
+          llvm::FunctionType::get(Int256Ty, false),
+          llvm::Function::InternalLinkage, ".datasize", TheModule);
+      llvm::Function *DataOffset = llvm::Function::Create(
+          llvm::FunctionType::get(Int8PtrTy, false),
+          llvm::Function::InternalLinkage, ".dataoffset", TheModule);
+      */
+      // LookupYulDataOrYulObject.try_emplace(Name, O);
+    }
     getEntry().clear();
     getEntry().resize(1);
   }

lib/Frontend/FrontendAction.cpp

@@ -53,7 +53,7 @@ bool FrontendAction::BeginSourceFile(CompilerInstance &CI,
 
     CI.createASTContext();
 
-    std::string PresumedInputFile = getCurrentFileOrBufferName();
+    std::string PresumedInputFile = getCurrentFileOrBufferName().str();
 
     std::unique_ptr<ASTConsumer> Consumer =
         CreateASTConsumer(CI, PresumedInputFile);

lib/Parse/Parser.cpp

@@ -717,7 +717,7 @@ Parser::parseFunctionHeader(bool ForceEmptyName, bool AllowModifiers) {
     if (AllowModifiers && Tok.is(tok::identifier)) {
       Diag(diag::err_unimplemented_token) << tok::identifier;
 
-      std::string ModifierName = Tok.getIdentifierInfo()->getName();
+      std::string ModifierName = Tok.getIdentifierInfo()->getName().str();
       ConsumeToken(); // identifier
 
       std::vector<ExprPtr> Arguments;
@@ -963,7 +963,7 @@ Parser::parseVariableDeclaration(VarDeclParserOptions const &Options,
 
 std::unique_ptr<EventDecl> Parser::parseEventDefinition() {
   const SourceLocation Begin = Tok.getLocation();
-  const std::string Name = Tok.getIdentifierInfo()->getName();
+  const std::string Name = Tok.getIdentifierInfo()->getName().str();
   ConsumeToken(); // identifier
   VarDeclParserOptions Options;
   Options.AllowIndexed = true;
@@ -989,7 +989,7 @@ void Parser::parseUserDefinedTypeName() {
 std::unique_ptr<IdentifierPath>
 Parser::parseIdentifierPath(tok::TokenKind SplitTok) {
   assert(Tok.isAnyIdentifier());
-  std::vector<std::string> path{Tok.getIdentifierInfo()->getName()};
+  std::vector<std::string> path{Tok.getIdentifierInfo()->getName().str()};
   ConsumeToken(); // identifier
 
   while (Tok.is(SplitTok)) {

test/yul/metadata.yul

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+// RUN: %soll --lang=Yul %s
+object "metadata_x" {
+	code {
+		// sstore(dataoffset(".metadata.x"), 0)
+        let size := datasize("x")
+	}
+
+	object ".metadata" {
+		code {}
+		data "x" "ABC"
+	}
+
+    data "x" "CDE"
+}