Update to LLVM 17 (#6)

Signed-off-by: Vladimir Radosavljevic <[email protected]>
Co-authored-by: Anton Baliasnikov <[email protected]>

.cargo/config.toml

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

.github/workflows/benchmarks.yml

@@ -46,9 +46,9 @@ jobs:
       - name: Define branches
         run: |
           if [ "${{ matrix.type }}" = "candidate" ]; then
-            echo "COMPILER_TESTER_BRANCH_NAME=${{ github.event.inputs.compiler_tester_candidate_branch || 'main' }}" >> $GITHUB_ENV
+            echo "COMPILER_TESTER_BRANCH_NAME=${{ github.event.inputs.compiler_tester_candidate_branch || github.head_ref }}" >> $GITHUB_ENV
           else
-            echo "COMPILER_TESTER_BRANCH_NAME=${{ github.event.inputs.compiler_tester_reference_branch || 'main' }}" >> $GITHUB_ENV
+            echo "COMPILER_TESTER_BRANCH_NAME=${{ github.event.inputs.compiler_tester_reference_branch || github.event.repository.default_branch }}" >> $GITHUB_ENV
           fi
 
       - name: Checkout compiler-tester
@@ -64,10 +64,7 @@ jobs:
           debug: ${{ github.event.inputs.llvm_build_type || 'release' }}
 
       - name: Benchmark
-        env:
-          RUST_BACKTRACE: full
         run: |
-          export LLVM_SYS_150_PREFIX="$(pwd)/target-llvm/target-final/"
           cargo build --verbose --release --bin 'compiler-tester'
           cargo build --verbose --release --manifest-path /usr/local/cargo/git/checkouts/era-compiler-solidity-*/*/Cargo.toml --target-dir './target-zksolc/'
           cargo build --verbose --release --manifest-path /usr/local/cargo/git/checkouts/era-compiler-vyper-*/*/Cargo.toml --target-dir './target-zkvyper/'

.github/workflows/tests.yaml

@@ -28,8 +28,6 @@ jobs:
 
       - name: Run tests
         run: |
-          export RUST_BACKTRACE='full'
-          export LLVM_SYS_150_PREFIX="$(pwd)/target-llvm/target-final/"
           cargo build --verbose --release --bin 'compiler-tester'
           cargo build --verbose --release --manifest-path /usr/local/cargo/git/checkouts/era-compiler-solidity-*/*/Cargo.toml --target-dir './target-zksolc/'
           cargo build --verbose --release --manifest-path /usr/local/cargo/git/checkouts/era-compiler-vyper-*/*/Cargo.toml --target-dir './target-zkvyper/'

Cargo.toml

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

compiler_tester/Cargo.toml

@@ -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

@@ -8,22 +8,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"
@@ -37,3 +21,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 = "main" }
+era-compiler-solidity = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "main" }
+
+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
-    }
 }