feat: add the lld llvm-config request

compiler_tester/Cargo.toml

@@ -43,9 +43,9 @@ zkevm_opcode_defs = { git = "https://github.com/matter-labs/era-zkevm_opcode_def
 zkevm_tester = { git = "https://github.com/matter-labs/era-zkevm_tester", branch = "v1.4.1" }
 
 era-compiler-common = { git = "https://github.com/matter-labs/era-compiler-common", branch = "main" }
-era-compiler-llvm-context = { git = "https://github.com/matter-labs/era-compiler-llvm-context", branch = "main" }
-era-compiler-solidity = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "main" }
-era-compiler-vyper = { git = "https://github.com/matter-labs/era-compiler-vyper", branch = "main" }
+era-compiler-llvm-context = { git = "https://github.com/matter-labs/era-compiler-llvm-context", branch = "az-cpr-1664-support-linking-deploy-and-runtime-code" }
+era-compiler-solidity = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "az-cpr-1664-support-linking-deploy-and-runtime-code" }
+era-compiler-vyper = { git = "https://github.com/matter-labs/era-compiler-vyper", branch = "az-cpr-1664-support-linking-deploy-and-runtime-code" }
 
 # era-compiler-common = { path = "../../era-compiler-common" }
 # era-compiler-llvm-context = { path = "../../era-compiler-llvm-context" }
@@ -67,6 +67,6 @@ features = ["blocking"]
 
 [dependencies.inkwell]
 git = "https://github.com/matter-labs-forks/inkwell"
-branch = "llvm-17"
+branch = "az-cpr-1664-support-linking-deploy-and-runtime-code"
 default-features = false
 features = ["llvm17-0", "no-libffi-linking", "target-eravm", "target-evm"]

compiler_tester/src/compilers/llvm.rs

@@ -120,7 +120,6 @@ impl Compiler for LLVMCompiler {
                     .map_err(|error| anyhow::anyhow!(error.to_string()))?;
                 let optimizer =
                     era_compiler_llvm_context::Optimizer::new(mode.llvm_optimizer_settings.clone());
-                let source_hash = sha3::Keccak256::digest(source.as_bytes()).into();
 
                 let context = era_compiler_llvm_context::EVMContext::<
                     era_compiler_llvm_context::EVMDummyDependency,
@@ -133,8 +132,8 @@ impl Compiler for LLVMCompiler {
                     true,
                     debug_config.clone(),
                 );
-                let build = context.build(path, Some(source_hash))?;
-                let build = EVMBuild::new(era_compiler_llvm_context::EVMBuild::default(), build);
+                let build = context.build(path, None)?;
+                let build = EVMBuild::new(build.as_slice().to_vec(), vec![]);
 
                 Ok((path.to_owned(), build))
             })

compiler_tester/src/vm/evm/input/build.rs

@@ -8,19 +8,16 @@
 #[derive(Debug, Clone)]
 pub struct Build {
     /// The contract deploy build.
-    pub deploy_build: era_compiler_llvm_context::EVMBuild,
+    pub deploy_build: Vec<u8>,
     /// The contract runtime build.
-    pub runtime_build: era_compiler_llvm_context::EVMBuild,
+    pub runtime_build: Vec<u8>,
 }
 
 impl Build {
     ///
     /// A shortcut constructor.
     ///
-    pub fn new(
-        deploy_build: era_compiler_llvm_context::EVMBuild,
-        runtime_build: era_compiler_llvm_context::EVMBuild,
-    ) -> Self {
+    pub fn new(deploy_build: Vec<u8>, runtime_build: Vec<u8>) -> Self {
         Self {
             deploy_build,
             runtime_build,

compiler_tester/src/vm/evm/mod.rs

@@ -89,9 +89,9 @@ impl<'evm> EVM<'evm> {
         constructor_args: Vec<u8>,
     ) -> anyhow::Result<ExecutionResult> {
         let bytecode = self.known_contracts.values().next().unwrap();
-        let mut deploy_code = bytecode.deploy_build.bytecode.to_owned();
+        let mut deploy_code = bytecode.deploy_build.to_owned();
         deploy_code.extend(constructor_args);
-        let runtime_code = bytecode.runtime_build.bytecode.to_owned();
+        let runtime_code = bytecode.runtime_build.to_owned();
 
         self.runtime
             .balances

fuzzer/Cargo.toml

@@ -30,8 +30,8 @@ libfuzzer-sys = "0.4"
 zkevm-assembly = { git = "https://github.com/matter-labs/era-zkEVM-assembly", branch = "v1.4.1" }
 zkevm_tester = { git = "https://github.com/matter-labs/era-zkevm_tester", branch = "v1.4.1" }
 
-era-compiler-llvm-context = { git = "https://github.com/matter-labs/era-compiler-llvm-context", branch = "main" }
-era-compiler-solidity = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "main" }
+era-compiler-llvm-context = { git = "https://github.com/matter-labs/era-compiler-llvm-context", branch = "az-cpr-1664-support-linking-deploy-and-runtime-code" }
+era-compiler-solidity = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "az-cpr-1664-support-linking-deploy-and-runtime-code" }
 
 compiler-tester = { path = "../compiler_tester" }
 solidity-adapter = { path = "../solidity_adapter" }