Update to LLVM 17

.cargo/config.toml

@@ -18,7 +18,7 @@ rustflags = [
 
 [env]
 LLVM_SYS_150_PREFIX = { value = "./target-llvm/target-final/", relative = true, force = false }
-RUST_BACKTRACE = { value = "full" }
+RUST_BACKTRACE = { value = "0" }
 RUST_LOG = { value = "vm=trace" }
 
 [tools.clippy]

Cargo.toml

@@ -4,6 +4,6 @@ members = [
     "solidity_adapter",
     "coverage_watcher",
     "benchmark_analyzer",
-    "fuzz"
+    "fuzzer"
 ]
 resolver = "2"

LLVM.lock

@@ -1,2 +1,2 @@
 url = "https://github.com/matter-labs/era-compiler-llvm"
-branch = "main"
+branch = "dev-17"

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-1307-update-to-llvm-17" }
+era-compiler-solidity = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "az-cpr-1307-update-to-llvm-17" }
+era-compiler-vyper = { git = "https://github.com/matter-labs/era-compiler-vyper", branch = "az-cpr-1307-update-to-llvm-17" }
 
 # 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-15"
+branch = "llvm-17"
 default-features = false
-features = ["llvm15-0", "no-libffi-linking", "target-eravm", "target-evm"]
+features = ["llvm17-0", "no-libffi-linking", "target-eravm", "target-evm"]

fuzz/Cargo.toml → fuzzer/Cargo.toml

@@ -7,22 +7,6 @@ edition = "2021"
 [package.metadata]
 cargo-fuzz = true
 
-[dependencies]
-libfuzzer-sys = "0.4"
-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" }
-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" }
-anyhow = "1.0"
-semver = { version = "1.0", features = ["serde"] }
-
-[dependencies.compiler-tester]
-path = "../compiler_tester"
-
-[dependencies.solidity-adapter]
-path = "../solidity_adapter"
-
-
 [[bin]]
 name = "demo"
 path = "fuzz_targets/demo.rs"
@@ -36,3 +20,17 @@ path = "fuzz_targets/optimizer_bug.rs"
 test = false
 doc = false
 bench = false
+
+[dependencies]
+anyhow = "1.0"
+semver = { version = "1.0", features = ["serde"] }
+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 = "az-cpr-1307-update-to-llvm-17" }
+era-compiler-solidity = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "az-cpr-1307-update-to-llvm-17" }
+
+compiler-tester = { path = "../compiler_tester" }
+solidity-adapter = { path = "../solidity_adapter" }

solidity_adapter/src/test/function_call/parser/syntax/tree/literal/alignment.rs

@@ -15,6 +15,12 @@ pub enum Alignment {
     Default,
 }
 
+impl Default for Alignment {
+    fn default() -> Self {
+        Self::Default
+    }
+}
+
 impl Alignment {
     ///
     /// A shortcut constructor.
@@ -29,11 +35,4 @@ impl Alignment {
     pub fn right() -> Self {
         Self::Right
     }
-
-    ///
-    /// A shortcut constructor.
-    ///
-    pub fn default() -> Self {
-        Self::Default
-    }
 }