Disable large contract test on firefox

This reverts commit 69d81c9682.

.github/actions/get-emsdk/action.yml

@@ -1,20 +0,0 @@
-name: "get emsdk"
-inputs:
-  version:
-    description: ""
-    required: false
-    default: "3.1.64"
-
-
-runs:
-  using: "composite"
-  steps:
-
-    - name: install emsdk
-      shell: bash
-      run: |
-        git clone https://github.com/emscripten-core/emsdk.git ./emsdk/
-        cd emsdk
-        git checkout tags/${{ inputs.version }}
-        ./emsdk install ${{ inputs.version }}
-        ./emsdk activate ${{ inputs.version }}

.github/actions/get-llvm/action.yml

@@ -1,91 +0,0 @@
-# example:
-#
-#       - name: get llvm
-#         uses: ./.github/actions/get-llvm
-#         with:
-#           releasePrefix: llvm-
-#           artifactArch: macos-arm64
-#           dir: target-llvm/macos
-
-name: "get llvm"
-inputs:
-  artifactArch:
-    required: true
-  releasePrefix:
-    description: "LLVM release tag prefix to search"
-    required: false
-    default: "llvm-"
-  dir:
-    description: "Archive extract path (`tar -C`)"
-    required: false
-    default: "./"
-  stripComponents:
-    description: "Strip UMBER leading components from file names on extraction (`tar --strip-components`)"
-    required: false
-    default: 0
-
-
-runs:
-  using: "composite"
-  steps:
-    - name: find asset
-      id: find
-      uses: actions/github-script@v7
-      env:
-        releasePrefix: ${{ inputs.releasePrefix }}
-        artifactArch: ${{ inputs.artifactArch }}
-      with:
-        result-encoding: string
-        script: |
-          let page = 1;
-          let releases = [];
-
-          let releasePrefix = process.env.releasePrefix
-          let artifactArch = process.env.artifactArch
-
-          do {
-            const res = await github.rest.repos.listReleases({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              per_page: 50,
-              page,
-            });
-
-            releases = res.data
-            releases.sort((a, b) => {
-              return (a.published_at < b.published_at) ? 1 : ((a.published_at > b.published_at) ? -1 : 0);
-            });
-
-            let llvmLatestRelease = releases.find(release => {
-              return release.tag_name.startsWith(releasePrefix);
-            });
-            if (llvmLatestRelease){
-                let asset = llvmLatestRelease.assets.find(asset =>{
-                    return asset.name.includes(artifactArch);
-                });
-                if (!asset){
-                  core.setFailed(`Artifact for '${artifactArch}' not found in release ${llvmLatestRelease.tag_name} (${llvmLatestRelease.html_url})`);
-                  process.exit();
-                }
-                return asset.browser_download_url;
-            }
-
-            page++;
-          } while(releases.length > 0);
-
-          core.setFailed(`No LLVM releases with '${releasePrefix}' atifacts found! Please release LLVM before running this workflow.`);
-          process.exit();
-
-    - name: download
-      shell: bash
-      run: |
-        mkdir -p ${{ inputs.dir }}
-        curl -sSLo llvm.tar.gz ${{ steps.find.outputs.result }}
-        ls -al
-
-    - name: unpack
-      shell: bash
-      run: |
-        tar -xf llvm.tar.gz -C ${{ inputs.dir }} --strip-components=${{ inputs.stripComponents }}
-        rm llvm.tar.gz
-        ls -al ${{ inputs.dir }}

.github/workflows/build-revive-wasm.yml

@@ -6,48 +6,63 @@ on:
     branches: ["main"]
   workflow_dispatch:
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 env:
   CARGO_TERM_COLOR: always
   REVIVE_WASM_INSTALL_DIR: ${{ github.workspace }}/target/wasm32-unknown-emscripten/release
+  BUN_VERSION: 1.1.43
 
 jobs:
   build-revive-wasm:
-    runs-on: ubuntu-24.04
+    runs-on: parity-large
     defaults:
       run:
         shell: bash
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install Rust stable toolchain
+      - name: Cache LLVM build
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+        id: cache-llvm
+        uses: actions/cache@v3
         with:
+          path: |
+            target-llvm/emscripten/target-final
+            target-llvm/gnu/target-final
+          # Use a unique key based on LLVM version or configuration files to avoid cache invalidation
+          key: llvm-build-${{ runner.os }}-${{ hashFiles('LLVM.lock', 'Cargo.toml', 'Cargo.lock', 'crates/llvm-builder/**', '.github/workflows/build-revive-wasm.yml') }}
+
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update && sudo apt-get install -y cmake ninja-build curl git libssl-dev pkg-config clang lld
+
+      - name: Install Rust stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
           toolchain: stable
           components: rust-src
           target: wasm32-unknown-emscripten
-          rustflags: ""
 
-      - name: get llvm gnu
+      - name: Install LLVM build dependencies
-        uses: ./.github/actions/get-llvm
+        run: |
-        with:
+          make install-llvm-builder
-          artifactArch: x86_64-linux-gnu
+          revive-llvm --target-env emscripten clone
-      - name: get llvm emscripten
-        uses: ./.github/actions/get-llvm
-        with:
-          artifactArch: emscripten
-
-      - name: install emsdk
-        uses: ./.github/actions/get-emsdk
 
       - name: Setup revive environment variables
         run: |
           echo "LLVM_SYS_181_PREFIX=$(pwd)/target-llvm/gnu/target-final" >> $GITHUB_ENV
           echo "REVIVE_LLVM_TARGET_PREFIX=$(pwd)/target-llvm/emscripten/target-final" >> $GITHUB_ENV
 
+      - name: Build host LLVM
+        if: steps.cache-llvm.outputs.cache-hit != 'true'
+        run: |
+          revive-llvm build --llvm-projects lld --llvm-projects clang
+
+      - name: Build target LLVM
+        if: steps.cache-llvm.outputs.cache-hit != 'true'
+        run: |
+          source emsdk/emsdk_env.sh
+          revive-llvm --target-env emscripten build --llvm-projects lld
+
       - run: |
           rustup show
           cargo --version
@@ -56,6 +71,11 @@ jobs:
           cmake --version
           bash --version
 
+      - name: Use Cached LLVM
+        if: steps.cache-llvm.outputs.cache-hit == 'true'
+        run: |
+          echo "Using cached LLVM"
+
       - name: Build revive
         run: |
           source emsdk/emsdk_env.sh
@@ -93,6 +113,21 @@ jobs:
         with:
           node-version: "20"
 
+      - name: Install Bun on Windows
+        if: runner.os == 'Windows'
+        run: |
+          Set-ExecutionPolicy RemoteSigned -Scope CurrentUser
+          iex (new-object net.webclient).downloadstring('https://get.scoop.sh')
+          scoop install bun@${{ env.BUN_VERSION }}
+          scoop install wget
+          Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH
+
+      - name: Install Bun on macOS and Linux
+        if: runner.os != 'Windows'
+        run: |
+          curl -fsSL https://bun.sh/install | bash -s bun-v${{ env.BUN_VERSION }}
+          echo "$HOME/.bun/bin" >> $GITHUB_PATH
+
       - name: Install packages
         run: npm install
 

.github/workflows/release-llvm.yml

@@ -1,171 +0,0 @@
-name: Release LLVM
-
-on:
-  workflow_dispatch:
-    inputs:
-      llvm_version:
-        type: string
-        required: true
-        description: llvm version in "x.x.x" format, e.g. "18.1.8"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  create-release:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    outputs:
-      version: ${{ steps.resolve-version.outputs.version }}
-    steps:
-      - id: resolve-version
-        run: |
-          echo "version=llvm-${{ inputs.llvm_version }}-revive.${GITHUB_SHA:0:7}" >> $GITHUB_OUTPUT
-
-      - name: create release
-        uses: softprops/action-gh-release@v2
-        with:
-          name: "LLVM binaries release: ${{ steps.resolve-version.outputs.version }}"
-          body: "This release includes binaries of LLVM, used to compile revive itself"
-          make_latest: "false"
-          tag_name: ${{ steps.resolve-version.outputs.version }}
-
-  build-macos:
-    strategy:
-      matrix:
-        os: [macos-14, macos-13]
-        include:
-          - os: macos-13
-            arch: x64
-          - os: macos-14
-            arch: arm64
-    needs: create-release
-    runs-on: ${{ matrix.os }}
-    name: "build-macos-${{ matrix.arch }}"
-    env:
-      RUST_LOG: trace
-    permissions:
-      contents: write # for uploading assets to release
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: install macos deps
-        run: |
-          brew install ninja
-
-      - name: versions
-        run: |
-          rustup show
-          cargo --version
-          cmake --version
-          echo "bash:" && bash --version
-          echo "ninja:" && ninja --version
-          echo "clang:" && clang --version
-
-      - name: Build LLVM
-        run: |
-          make install-llvm
-
-      - name: clean
-        # check removed files
-        run: |
-          cd target-llvm/gnu/target-final/bin/
-          rm diagtool llvm-libtool-darwin llvm-lipo llvm-pdbutil llvm-dwarfdump llvm-nm llvm-readobj llvm-cfi-verify \
-             sancov llvm-debuginfo-analyzer llvm-objdump llvm-profgen llvm-extract llvm-jitlink llvm-c-test llvm-gsymutil llvm-dwp \
-             dsymutil llvm-dwarfutil llvm-exegesis lli clang-rename bugpoint clang-extdef-mapping clang-refactor c-index-test \
-             llvm-reduce llvm-lto clang-linker-wrapper llc llvm-lto2
-
-      - name: package artifacts
-        run: |
-          tar -czf "${{ needs.create-release.outputs.version }}-macos-${{ matrix.arch }}.tar.gz" target-llvm/gnu/target-final
-
-      - name: upload archive to release
-        uses: softprops/action-gh-release@v2
-        with:
-          make_latest: "false"
-          tag_name: ${{ needs.create-release.outputs.version }}
-          files: |
-            ${{ needs.create-release.outputs.version }}-macos-${{ matrix.arch }}.tar.gz
-
-
-  build-linux-all:
-    needs: create-release
-    runs-on: parity-large
-    env:
-      RUST_LOG: trace
-    permissions:
-      contents: write # for uploading assets to release
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: install linux deps
-        run: |
-          sudo apt-get update && sudo apt-get install -y cmake ninja-build curl git libssl-dev pkg-config clang lld musl
-
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: stable
-          components: rust-src
-          target: wasm32-unknown-emscripten
-          rustflags: ""
-
-      - name: versions
-        run: |
-          rustup show
-          cargo --version
-          cmake --version
-          echo "bash:" && bash --version
-          echo "ninja:" && ninja --version
-          echo "clang:" && clang --version
-
-      - name: Build host LLVM
-        run: |
-          make install-llvm
-
-      - name: Build gnu LLVM
-        run: |
-          revive-llvm clone
-          revive-llvm build --llvm-projects lld --llvm-projects clang
-
-      - name: Build musl LLVM
-        run: |
-          revive-llvm --target-env musl build --llvm-projects lld --llvm-projects clang
-
-      - name: Build emscripten LLVM
-        run: |
-          revive-llvm --target-env emscripten clone
-          source emsdk/emsdk_env.sh
-          revive-llvm --target-env emscripten build --llvm-projects lld
-
-      - name: clean
-        # check removed files
-        run: |
-          for target in gnu emscripten musl; do
-            cd target-llvm/${target}/target-final/bin/
-            rm -rf diagtool llvm-libtool-darwin llvm-lipo llvm-pdbutil llvm-dwarfdump llvm-nm llvm-readobj llvm-cfi-verify \
-               sancov llvm-debuginfo-analyzer llvm-objdump llvm-profgen llvm-extract llvm-jitlink llvm-c-test llvm-gsymutil llvm-dwp \
-               dsymutil llvm-dwarfutil llvm-exegesis lli clang-rename bugpoint clang-extdef-mapping clang-refactor c-index-test \
-               llvm-reduce llvm-lto clang-linker-wrapper llc llvm-lto2 llvm-otool llvm-readelf
-            cd -
-          done
-
-      - name: package artifacts
-        run: |
-          tar -czf "${{ needs.create-release.outputs.version }}-x86_64-linux-gnu-linux.tar.gz" target-llvm/gnu/target-final
-          tar -czf "${{ needs.create-release.outputs.version }}-x86_64-linux-musl.tar.gz" target-llvm/musl/target-final
-          tar -czf "${{ needs.create-release.outputs.version }}-wasm32-unknown-emscripten.tar.gz" target-llvm/emscripten/target-final
-
-      - name: upload archive to release
-        uses: softprops/action-gh-release@v2
-        with:
-          make_latest: "false"
-          tag_name: ${{ needs.create-release.outputs.version }}
-          files: |
-            ${{ needs.create-release.outputs.version }}-x86_64-linux-gnu-linux.tar.gz
-            ${{ needs.create-release.outputs.version }}-x86_64-linux-musl.tar.gz
-            ${{ needs.create-release.outputs.version }}-wasm32-unknown-emscripten.tar.gz

.github/workflows/release.yml

@@ -1,334 +0,0 @@
-name: Release
-run-name: Release ${{ github.ref_name }}
-on:
-  push:
-    branches:
-      - "main"
-  pull_request:
-    types: [opened, synchronize, reopened, ready_for_review, labeled]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  #rust-musl-cross:x86_64-musl
-  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:68b86bc7cb2867259e6b233415a665ff4469c28b57763e78c3bfea1c68091561
-  RUST_LOG: trace
-
-jobs:
-  tag:
-    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'release-test')
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: write
-    outputs:
-      TAG: ${{ steps.versions.outputs.TAG }}
-      PKG_VER: ${{ steps.versions.outputs.PKG_VER }}
-      RELEASE_NOTES: ${{ steps.versions.outputs.RELEASE_NOTES }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-tags: "true"
-          fetch-depth: 0
-
-      - name: Versions
-        id: versions
-        run: |
-          export CURRENT_TAG=$(git describe --tags --abbrev=0 --exclude "llvm-*")
-          export PKG_VER=v$(cat Cargo.toml | grep -A 5 package] | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d " ")
-          echo "Current tag $CURRENT_TAG"
-          echo "Package version $PKG_VER"
-          #
-          echo "PKG_VER=$PKG_VER" >> $GITHUB_OUTPUT
-          if [[ $CURRENT_TAG == $PKG_VER  ]];
-            then
-              echo "Tag is up to date. Nothing to do.";
-              export TAG=old;
-            else
-              echo "Tag was updated.";
-              export TAG=new;
-            fi
-          echo "TAG=$TAG" >> $GITHUB_OUTPUT
-
-          # Generating release notes early, in order to avoid checkout at the last step
-          export RELEASE_NOTES="$(sed '/^## '${PKG_VER}'/,/^## v/!d' CHANGELOG.md | sed -e '1d' -e '$d')"
-
-          echo "Release notes:"
-          echo "$RELEASE_NOTES"
-
-          echo 'RELEASE_NOTES<<EOF' >> $GITHUB_OUTPUT
-          echo "$RELEASE_NOTES" >> $GITHUB_OUTPUT
-          echo 'EOF' >> $GITHUB_OUTPUT
-
-  build-macos:
-    strategy:
-      matrix:
-        os: [macos-14, macos-13]
-        include:
-          - os: macos-13
-            arch: x64
-          - os: macos-14
-            arch: arm64
-    if: ${{ needs.tag.outputs.TAG == 'new' }}
-    runs-on: ${{ matrix.os }}
-    name: build-macos
-    needs: [tag]
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: get llvm
-        uses: ./.github/actions/get-llvm
-        with:
-          releasePrefix: llvm-
-          artifactArch: macos-${{ matrix.arch }}
-          dir: ./
-
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: stable
-          components: rust-src
-          target: wasm32-unknown-emscripten
-          rustflags: ""
-
-      - name: install macos deps
-        run: |
-          brew install ninja
-
-      - name: versions
-        run: |
-          rustup show
-          cargo --version
-          cmake --version
-          echo "bash:" && bash --version
-          echo "ninja:" && ninja --version
-          echo "clang:" && clang --version
-
-      - name: build revive
-        run: |
-          export LLVM_SYS_181_PREFIX=$PWD/target-llvm/gnu/target-final
-          make install-bin
-          cp ./target/release/resolc ./target/release/resolc-${{ matrix.arch }}
-
-      - name: check revive
-        run: |
-          mkdir solc
-          curl -sSLo solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.28/solc-macos
-          chmod +x solc/solc
-          PATH=$PWD/solc:$PATH
-          result=$(./target/release/resolc-${{ matrix.arch }} --bin crates/integration/contracts/flipper.sol)
-          echo $result
-          if [[ $result == *'0x50564d'* ]]; then exit 0; else exit 1; fi
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: "revive-macos-${{ matrix.arch }}"
-          path: |
-            ./target/release/resolc-${{ matrix.arch }}
-          retention-days: 1
-
-  macos-universal-binary:
-    runs-on: macos-14
-    needs: [build-macos]
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: revive-macos-*
-          path: revive-macos
-
-      - name: run lipo
-        run: |
-          lipo revive-macos/revive-macos-arm64/resolc-arm64 revive-macos/revive-macos-x64/resolc-x64 -create -output resolc-macos
-
-      - name: compress macos artifact
-        run: |
-          chmod +x resolc-macos
-          tar -czf resolc-macos.tar.gz ./resolc-macos
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: revive-macos
-          path: |
-            resolc-macos.tar.gz
-          retention-days: 1
-
-  build-linux-all:
-    if: ${{ needs.tag.outputs.TAG == 'new' }}
-    runs-on: parity-large
-    needs: [tag]
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: install linux deps
-        run: |
-          sudo apt-get update && sudo apt-get install -y cmake ninja-build \
-          curl git libssl-dev pkg-config clang lld musl
-
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: stable
-          components: rust-src
-          target: wasm32-unknown-emscripten
-          rustflags: ""
-
-      - name: versions
-        run: |
-          rustup show
-          cargo --version
-          cmake --version
-          echo "bash:" && bash --version
-          echo "ninja:" && ninja --version
-          echo "clang:" && clang --version
-
-      - name: get llvm musl
-        uses: ./.github/actions/get-llvm
-        with:
-          releasePrefix: llvm-
-          artifactArch: x86_64-linux-musl
-          dir: ./
-
-      # Build revive
-
-      - name: build musl
-        run: |
-          mkdir resolc-out
-          docker run -v $PWD:/opt/revive $RUST_MUSL_CROSS_IMAGE /bin/bash -c "
-           cd /opt/revive
-           apt update && apt upgrade -y && apt install -y pkg-config
-           export LLVM_SYS_181_PREFIX=/opt/revive/target-llvm/musl/target-final
-           make install-bin
-           cp /root/.cargo/bin/resolc /opt/revive/resolc-out/resolc-static-linux
-           "
-
-      - name: check musl
-        run: |
-          mkdir solc
-          curl -sSLo solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.28/solc-static-linux
-          chmod +x solc/solc
-          PATH=$PWD/solc:$PATH
-          result=$(./resolc-out/resolc-static-linux --bin crates/integration/contracts/flipper.sol)
-          echo $result
-          if [[ $result == *'0x50564d'* ]]; then exit 0; else exit 1; fi
-
-      - name: compress musl artifact
-        run: |
-          tar --strip-components 2 -czf resolc-static-linux.tar.gz ./resolc-out/resolc-static-linux
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: revive-linux
-          path: |
-            ./resolc-static-linux.tar.gz
-          retention-days: 1
-
-      - name: Set Up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: "20"
-
-      - name: get llvm emscripten
-        uses: ./.github/actions/get-llvm
-        with:
-          artifactArch: emscripten
-
-      - name: install emsdk
-        uses: ./.github/actions/get-emsdk
-
-      - name: build wasm
-        run: |
-          export LLVM_SYS_181_PREFIX=$PWD/target-llvm/musl/target-final
-          export REVIVE_LLVM_TARGET_PREFIX=$PWD/target-llvm/emscripten/target-final
-          source emsdk/emsdk_env.sh
-          rustup target add wasm32-unknown-emscripten
-          make install-wasm
-
-      - name: check wasm
-        run: |
-          curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.28/soljson.js
-          node -e "
-          const soljson = require('solc/soljson');
-          const createRevive = require('./target/wasm32-unknown-emscripten/release/resolc.js');
-
-          const compiler = createRevive();
-          compiler.soljson = soljson;
-
-          const standardJsonInput =
-          {
-            language: 'Solidity',
-            sources: {
-              'MyContract.sol': {
-                content: 'pragma solidity ^0.8.0; contract MyContract { function greet() public pure returns (string memory) { return \'Hello\'; } }',
-              },
-            },
-            settings: { optimizer: { enabled: false } }
-          };
-
-          compiler.writeToStdin(JSON.stringify(standardJsonInput));
-          compiler.callMain(['--standard-json']);
-
-          // Collect output
-          const stdout = compiler.readFromStdout();
-          const stderr = compiler.readFromStderr();
-
-          if (stderr) { console.error(stderr); process.exit(1); }
-
-          let out = JSON.parse(stdout);
-          let bytecode = out.contracts['MyContract.sol']['MyContract'].evm.bytecode.object
-          console.log(bytecode);
-
-          if(!bytecode.startsWith('50564d')) { process.exit(1); }
-          "
-
-      - name: compress wasm artifact
-        run: |
-          tar --strip-components 4 -czf resolc-wasm.tar.gz \
-            ./target/wasm32-unknown-emscripten/release/resolc.js \
-            ./target/wasm32-unknown-emscripten/release/resolc.wasm \
-            ./target/wasm32-unknown-emscripten/release/resolc_web.js
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: revive-wasm
-          path: |
-            resolc-wasm.tar.gz
-          retention-days: 1
-
-  create-release:
-    if: github.event_name != 'pull_request'
-    needs: [tag, build-linux-all, macos-universal-binary]
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: write
-    steps:
-      - name: Download revive-wasm
-        uses: actions/download-artifact@v4
-        with:
-          name: revive-wasm
-          path: resolc-wasm/
-
-      - name: Download revive-linux
-        uses: actions/download-artifact@v4
-        with:
-          name: revive-linux
-          path: resolc-linux/
-
-      - name: Download revive-macos
-        uses: actions/download-artifact@v4
-        with:
-          name: revive-macos
-          path: resolc-macos/
-
-      - name: create-release
-        uses: softprops/action-gh-release@v2
-        with:
-          body: ${{ needs.tag.outputs.RELEASE_NOTES }}
-          tag_name: ${{ needs.tag.outputs.PKG_VER }}
-          name: ${{ needs.tag.outputs.PKG_VER }}
-          draft: true
-          target_commitish: ${{ github.sha }}
-          files: |
-            ./resolc-linux/resolc-static-linux.tar.gz
-            ./resolc-macos/resolc-macos.tar.gz
-            ./resolc-wasm/resolc-wasm.tar.gz
-

.github/workflows/revive-llvm-test.yml

@@ -1,43 +0,0 @@
-on:
-  pull_request:
-    types: [assigned, opened, synchronize, reopened]
-    paths:
-      - 'LLVM.lock'
-      - 'crates/llvm-builder/**'
-      - '.github/workflows/revive-llvm-test.yml'
-
-jobs:
-  test:
-    strategy:
-      matrix:
-        runner: [parity-large, macos-14, macos-13]
-    runs-on: ${{ matrix.runner }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install apt dependencies
-        if: matrix.runner == 'parity-large'
-        run: |
-          sudo apt update && sudo apt-get install -y cmake ninja-build curl git libssl-dev pkg-config clang lld musl
-
-      - name: Install macos dependencies
-        if: matrix.runner == 'macos-14' || matrix.runner == 'macos-13'
-        run: |
-          brew install ninja
-
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: stable
-          components: rust-src
-          rustflags: ""
-
-      - run: |
-          rustup show
-          cargo --version
-          cmake --version
-          bash --version
-
-      - name: Test llvm-builder
-        run: make test-llvm-builder
-        env:
-          RUST_LOG: trace

.github/workflows/rust.yml

@@ -6,10 +6,6 @@ on:
   pull_request:
     branches: ["main"]
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 env:
   CARGO_TERM_COLOR: always
 
@@ -36,14 +32,13 @@ jobs:
 
       - name: Install geth
         run: |
-          sudo add-apt-repository -y ppa:ethereum/ethereum
+          git clone https://github.com/xermicus/go-ethereum --branch=cl/fix-runner-state-dump --depth=1
-          sudo apt update
+          cd go-ethereum
-          sudo apt install -y ethereum
+          make all
+          echo "$(pwd)/build/bin/" >> $GITHUB_PATH
 
-      # Disabled for now (always install the latest version despite setting it):
+      - name: Machete
-      # https://github.com/bnjbvr/cargo-machete/issues/156
+        uses: bnjbvr/cargo-machete@main
-      #- name: Machete
-      #  uses: bnjbvr/cargo-machete@v0.7.0
 
       - name: Format
         run: make format

CHANGELOG.md

@@ -2,44 +2,12 @@
 
 ## Unreleased
 
-## v0.1.0-dev.12
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev: `21f6f0705e53c15aa2b8a5706b208200447774a9`
-
-### Added
-- Per file output selection for `--standard-json` mode.
-- The `ir` output selection option for `--standard-json` mode.
-
-### Changed
-- Improved code size: Large contracts compile to smaller code blobs when enabling aggressive size optimizations (`-Oz`).
-
-### Fixed
-
-## v0.1.0-dev.11
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
-
-### Added
-
-### Changed
-
-### Fixed
-- A bug causing incorrect loads from the emulated EVM linear memory.
-- A missing integer truncate after switching to 64bit.
-
-## v0.1.0-dev.10
-
 This is a development pre-release.
 
 Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
 
 ### Added
 - Support for the `coinbase` opcode.
-- The resolc web JS version.
 
 ### Changed 
 - Missing the `--overwrite` flag emits an error instead of a warning.

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.1.0-dev.12"
+version = "0.1.0-dev.9"
 authors = [
     "Cyrill Leutwiler <cyrill@parity.io>",
     "Parity Technologies <admin@parity.io>",
@@ -14,31 +14,31 @@ repository = "https://github.com/paritytech/revive"
 rust-version = "1.81.0"
 
 [workspace.dependencies]
-revive-benchmarks = { version = "0.1.0-dev.12", path = "crates/benchmarks" }
+revive-benchmarks = { version = "0.1.0-dev.9", path = "crates/benchmarks" }
-revive-builtins = { version = "0.1.0-dev.12", path = "crates/builtins" }
+revive-builtins = { version = "0.1.0-dev.9", path = "crates/builtins" }
-revive-common = { version = "0.1.0-dev.12", path = "crates/common" }
+revive-common = { version = "0.1.0-dev.9", path = "crates/common" }
-revive-differential = { version = "0.1.0-dev.12", path = "crates/differential" }
+revive-differential = { version = "0.1.0-dev.9", path = "crates/differential" }
-revive-integration = { version = "0.1.0-dev.12", path = "crates/integration" }
+revive-integration = { version = "0.1.0-dev.9", path = "crates/integration" }
-revive-linker = { version = "0.1.0-dev.12", path = "crates/linker" }
+revive-linker = { version = "0.1.0-dev.9", path = "crates/linker" }
-lld-sys = { version = "0.1.0-dev.12", path = "crates/lld-sys" }
+lld-sys = { version = "0.1.0-dev.9", path = "crates/lld-sys" }
-revive-llvm-context = { version = "0.1.0-dev.12", path = "crates/llvm-context" }
+revive-llvm-context = { version = "0.1.0-dev.9", path = "crates/llvm-context" }
-revive-runtime-api = { version = "0.1.0-dev.12", path = "crates/runtime-api" }
+revive-runtime-api = { version = "0.1.0-dev.9", path = "crates/runtime-api" }
-revive-runner = { version = "0.1.0-dev.12", path = "crates/runner" }
+revive-runner = { version = "0.1.0-dev.9", path = "crates/runner" }
-revive-solidity = { version = "0.1.0-dev.12", path = "crates/solidity" }
+revive-solidity = { version = "0.1.0-dev.9", path = "crates/solidity" }
-revive-stdlib = { version = "0.1.0-dev.12", path = "crates/stdlib" }
+revive-stdlib = { version = "0.1.0-dev.9", path = "crates/stdlib" }
-revive-build-utils = { version = "0.1.0-dev.12", path = "crates/build-utils" }
+revive-build-utils = { version = "0.1.0-dev.9", path = "crates/build-utils" }
 
 hex = "0.4.3"
-cc = "1.2"
+cc = "1.0"
 libc = "0.2.169"
-tempfile = "3.17"
+tempfile = "3.8"
 anyhow = "1.0"
 semver = { version = "1.0", features = ["serde"] }
 itertools = "0.14"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["arbitrary_precision"] }
 regex = "1.10"
-once_cell = "1.20"
+once_cell = "1.19"
 num = "0.4.3"
 sha1 = "0.10"
 sha3 = "0.10"
@@ -47,14 +47,14 @@ which = "7.0"
 path-slash = "0.2"
 rayon = "1.8"
 clap = { version = "4", default-features = false, features = ["derive"] }
-polkavm-common = "0.21.0"
+polkavm-common = "0.19.0"
-polkavm-linker = "0.21.0"
+polkavm-linker = "0.19.0"
-polkavm-disassembler = "0.21.0"
+polkavm-disassembler = "0.19.0"
-polkavm = "0.21.0"
+polkavm = "0.19.0"
-alloy-primitives = { version = "0.8.21", features = ["serde"] }
+alloy-primitives = { version = "0.8.19", features = ["serde"] }
-alloy-sol-types = "0.8.21"
+alloy-sol-types = "0.8.19"
-alloy-genesis = "0.11.1"
+alloy-genesis = "0.11.0"
-alloy-serde = "0.11.1"
+alloy-serde = "0.11.0"
 env_logger = { version = "0.11.6", default-features = false }
 serde_stacker = "0.1.11"
 criterion = { version = "0.5.1", features = ["html_reports"] }
@@ -64,15 +64,15 @@ downloader = "0.2.8"
 flate2 = "1.0.35"
 fs_extra = "1.3.0"
 num_cpus = "1"
-tar = "0.4"
+tar = "0.4.43"
-toml = "0.8"
+toml = "0.8.19"
-assert_cmd = "2.0"
+assert_cmd = "2.0.16"
-assert_fs = "1.1"
+assert_fs = "1.1.2"
 
 # polkadot-sdk and friends
 codec = { version = "3.6.12", default-features = false, package = "parity-scale-codec" }
 scale-info = { version = "2.11.6", default-features = false }
-polkadot-sdk = { git = "https://github.com/paritytech/polkadot-sdk", rev = "21f6f0705e53c15aa2b8a5706b208200447774a9" }
+polkadot-sdk = { git = "https://github.com/paritytech/polkadot-sdk", rev = "274a781e8ca1a9432c7ec87593bd93214abbff50" }
 
 # llvm
 [workspace.dependencies.inkwell]

README.md

@@ -1,5 +1,5 @@
 ![CI](https://github.com/paritytech/revive/actions/workflows/rust.yml/badge.svg)
-[![Docs](https://img.shields.io/badge/Docs-contracts.polkadot.io-brightgreen.svg)](https://contracts.polkadot.io/revive_compiler/)
+[![Docs](https://img.shields.io/badge/Docs-contracts.polkadot.io-brightgreen.svg)](https://contracts.polkadot.io)
 
 # revive
 
@@ -14,7 +14,10 @@ This is experimental software in active development and not ready just yet for p
 Discussion around the development is hosted on the [Polkadot Forum](https://forum.polkadot.network/t/contracts-update-solidity-on-polkavm/6949#a-new-solidity-compiler-1).
 
 ## Installation
-Please consult [the documentation](https://contracts.polkadot.io/revive_compiler/installation) for installation instructions.
+
+`resolc` depends on the [solc](https://github.com/ethereum/solidity) binary installed on your system.
+
+Download and install the `resolc` frontend executable for your platform from our [releases](https://github.com/paritytech/revive/releases).
 
 ## Building from source
 
@@ -22,46 +25,22 @@ Building revive requires a [stable Rust installation](https://rustup.rs/) and a
 
 ### LLVM
 
-`revive` depends on a custom build of LLVM `v18.1.8` with the RISC-V _embedded_ target, including the `compiler-rt` builtins. You can either download a build from our releases (recommended for older hardware) or build it from source.
+`revive` depends on a custom build of LLVM `v18.1.8` with the RISC-V _embedded_ target, including the `compiler-rt` builtins. Use the provided [revive-llvm](crates/llvm-builder/README.md) utility to compile a compatible LLVM build locally and point `$LLVM_SYS_181_PREFIX` to the installation afterwards.
-
-<details>
-  <summary>Download from our LLVM releases</summary>
-
-Download the [latest LLVM build](https://github.com/paritytech/revive/releases?q=LLVM+binaries+release&expanded=true) from our releases.
-
-> **MacOS** users need to clear the `downloaded` attribute from all binaries after extracting the archive:
-> ```sh
-> xattr -rc </path/to/the/extracted/archive>/target-llvm/gnu/target-final/bin/*
-> ```
-
-After extracting the archive, point `$LLVM_SYS_181_PREFIX` to it:
-```sh
-export LLVM_SYS_181_PREFIX=</path/to/the/extracted/archive>/target-llvm/gnu/target-final
-```
-
-</details>
-
-<details>
-  <summary>Building from source</summary>
-
- Use the provided [revive-llvm](crates/llvm-builder/README.md) utility to compile a compatible LLVM build locally and point `$LLVM_SYS_181_PREFIX` to the installation afterwards.
 
 The `Makefile` provides a shortcut target to obtain a compatible LLVM build:
 
-```sh
+```bash
 make install-llvm
 export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final
 ```
 
-</details>
-
 ### The `resolc` Solidity frontend
 
-To build the `resolc` Solidity frontend executable, make sure you have obtained a compatible LLVM build and did export the `LLVM_SYS_181_PREFIX` environment variable pointing to it (see [above](#LLVM)).
+To build the `resolc` Solidity frontend executable, make sure you have obtained a compatible LLVM build using [revive-llvm](crates/llvm-builder/README.md) and did export the `LLVM_SYS_181_PREFIX` environment variable pointing to it (see [above](#LLVM)).
 
 To install the `resolc` Solidity frontend executable:
 
-```sh
+```bash
 make install-bin
 resolc --version
 ```
@@ -70,10 +49,7 @@ resolc --version
 
 Cross-compile the `resolc.js` frontend executable to Wasm for running it in a Node.js or browser environment. The `REVIVE_LLVM_TARGET_PREFIX` environment variable is used to control the target environment LLVM dependency.
 
-<details>
+```bash
-  <summary>Instructions for cross-compilation to wasm32-unknown-emscripten</summary>
-
-```sh
 # Build the host LLVM dependency with PolkaVM target support
 make install-llvm
 export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final
@@ -89,23 +65,21 @@ make install-wasm
 make test-wasm
 ```
 
-</details>
+### Development
-
-## Development
 
 Please consult the [Makefile](Makefile) targets to learn how to run tests and benchmarks. 
 Ensure that your branch passes `make test` locally when submitting a pull request.
 
-### Design overview
+## Design overview
-See the [relevant section in our documentation](https://contracts.polkadot.io/revive_compiler/architecture) to learn more about how the compiler works. 
 
-[Frontend](https://github.com/matter-labs/era-compiler-solidity) and [code generator](https://github.com/matter-labs/era-compiler-llvm-context) are based of ZKSync `zksolc` (the project started as a fork of the era compiler).
+`revive` uses [solc](https://github.com/ethereum/solidity/), the Ethereum Solidity compiler, as the [Solidity frontend](crates/solidity/src/lib.rs) to process smart contracts written in Solidity. The YUL IR code (or legacy EVM assembly as a fallback for older `solc` versions) emitted by `solc` is then translated to LLVM IR, targetting [Polkadots `revive` pallet](https://docs.rs/pallet-revive/latest/pallet_revive/trait.SyscallDoc.html).
+[Frontend](https://github.com/matter-labs/era-compiler-solidity) and [code generator](https://github.com/matter-labs/era-compiler-llvm-context) are based of ZKSync `zksolc`.
 
-### Tests
+## Tests
 
 Before running the tests, ensure that Geth (Go Ethereum) is installed on your system. Follow the installation guide here: [Installing Geth](https://geth.ethereum.org/docs/getting-started/installing-geth).
 Once Geth is installed, you can run the tests using the following command:
 
-```sh
+```bash
 make test
 ```

RELEASE.md

@@ -4,15 +4,8 @@ Prior to the first stable release we neither have formal release processes nor d
 
 To create a new pre-release:
 
-1. Create a release PR which updates the `-dev.X` versions in the workspace `Cargo.toml` and updates the `CHANGELOG.md` accordingly. Add the `release-test` label to trigger the release workflows.
+1. Merge a release PR which updates the `-dev.X` versions in the workspace `Cargo.toml` and updates the `CHANGELOG.md` accordingly
-2. If the CI passes, merge the release PR. The release workflow will attempt to build and publish a new release whenever the latest git tag does not match the cargo package version.
+2. Push a release tag to `main`
-3. Wait for the `Release` workflow to finish. If the workflow fails after the `build-linux-all` step, check if a tag has been created and delete it before restarting or pushing updates. Note: It's more convenient to debug the release workflow in a fork (the fork has to be under the `paritytech` org to access `parity-large` runners).
+3. Create a __pre-release__ from the tag and manually upload the `resolc` binary from docker image
-4. Check draft release on [Releases page](https://github.com/paritytech/revive/releases) and publish (should contain `resolc.js`, `resolc.wasm`, `resolc-web.js`, and `resolc-static-linux` release assets)
+4. Manually upload `resolc.js` and `resolc.wasm` from the `build-revive-wasm` action artifacts.
 5. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly
-
-# LLVM release
-
-To create a new LLVM release, run "Release LLVM" workflow. Use current LLVM version as parameter, e.g. `18.1.8`.
-Version suffix will be resolved automatically.  
-The workflows will create new GitHub release, and upload LLVM binaries.
-Next release of resolc will use newly created binaries.  

crates/integration/Cargo.toml

@@ -15,7 +15,6 @@ serde_json = { workspace = true }
 
 revive-solidity = { workspace = true }
 revive-runner = { workspace = true }
-revive-llvm-context = { workspace = true }
 
 [dev-dependencies]
 sha1 = { workspace = true }

crates/integration/codesize.json

@@ -1,10 +1,10 @@
 {
-  "Baseline": 1443,
+  "Baseline": 1110,
-  "Computation": 2788,
+  "Computation": 2389,
-  "DivisionArithmetics": 9748,
+  "DivisionArithmetics": 14822,
-  "ERC20": 19203,
+  "ERC20": 23973,
-  "Events": 2201,
+  "Events": 1605,
-  "FibonacciIterative": 2041,
+  "FibonacciIterative": 2023,
-  "Flipper": 2632,
+  "Flipper": 1989,
-  "SHA1": 8958
+  "SHA1": 17026
 }

crates/integration/contracts/MLoad.sol

@@ -1,40 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.28;
-
-/* runner.json
-{
-    "differential": true,
-    "actions": [
-        {
-            "Instantiate": {
-                "code": {
-                    "Solidity": {
-                        "contract": "MLoad"
-                    }
-                }
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "e2179b8e"
-            }
-        }
-    ]
-}
-*/
-
-contract MLoad {
-    constructor() payable {
-        assert(g() == 0);
-    }
-
-    function g() public payable returns (uint m) {
-        assembly {
-            m := mload(0)
-        }
-    }
-}

crates/integration/src/cases.rs

@@ -1,7 +1,6 @@
 use alloy_primitives::{Address, Bytes, I256, U256};
 use alloy_sol_types::{sol, SolCall, SolConstructor};
 
-use revive_llvm_context::OptimizerSettings;
 use revive_solidity::test_utils::*;
 
 #[derive(Clone)]
@@ -251,7 +250,7 @@ sol!(
 case!("Storage.sol", Storage, transientCall, storage_transient, value: U256);
 
 impl Contract {
-    pub fn build(calldata: Vec<u8>, name: &'static str, code: &str) -> Self {
+    fn build(calldata: Vec<u8>, name: &'static str, code: &str) -> Self {
         Self {
             name,
             evm_runtime: compile_evm_bin_runtime(name, code),
@@ -259,19 +258,11 @@ impl Contract {
             calldata,
         }
     }
-
-    pub fn build_size_opt(calldata: Vec<u8>, name: &'static str, code: &str) -> Self {
-        Self {
-            name,
-            evm_runtime: compile_evm_bin_runtime(name, code),
-            pvm_runtime: compile_blob_with_options(name, code, true, OptimizerSettings::size()),
-            calldata,
-        }
-    }
 }
 
 #[cfg(test)]
 mod tests {
+    use alloy_primitives::{Bytes, U256};
     use rayon::iter::{IntoParallelIterator, ParallelIterator};
     use serde::{de::Deserialize, Serialize};
     use std::{collections::BTreeMap, fs::File};
@@ -311,47 +302,14 @@ mod tests {
         };
 
         [
-            (|| {
+            Contract::baseline as fn() -> Contract,
-                Contract::build_size_opt(
+            Contract::flipper as fn() -> Contract,
-                    vec![],
+            (|| Contract::odd_product(0)) as fn() -> Contract,
-                    "Baseline",
+            (|| Contract::fib_iterative(U256::ZERO)) as fn() -> Contract,
-                    include_str!("../contracts/Baseline.sol"),
+            Contract::erc20 as fn() -> Contract,
-                )
+            (|| Contract::sha1(Bytes::new())) as fn() -> Contract,
-            }) as _,
+            (|| Contract::division_arithmetics_div(U256::ZERO, U256::ZERO)) as fn() -> Contract,
-            (|| {
+            (|| Contract::event(U256::ZERO)) as fn() -> Contract,
-                Contract::build_size_opt(
-                    vec![],
-                    "Flipper",
-                    include_str!("../contracts/flipper.sol"),
-                )
-            }) as _,
-            (|| {
-                Contract::build_size_opt(
-                    vec![],
-                    "Computation",
-                    include_str!("../contracts/Computation.sol"),
-                )
-            }) as _,
-            (|| {
-                Contract::build_size_opt(
-                    vec![],
-                    "FibonacciIterative",
-                    include_str!("../contracts/Fibonacci.sol"),
-                )
-            }) as _,
-            (|| Contract::build_size_opt(vec![], "ERC20", include_str!("../contracts/ERC20.sol")))
-                as _,
-            (|| Contract::build_size_opt(vec![], "SHA1", include_str!("../contracts/SHA1.sol")))
-                as _,
-            (|| {
-                Contract::build_size_opt(
-                    vec![],
-                    "DivisionArithmetics",
-                    include_str!("../contracts/DivisionArithmetics.sol"),
-                )
-            }) as _,
-            (|| Contract::build_size_opt(vec![], "Events", include_str!("../contracts/Events.sol")))
-                as _,
         ]
         .into_par_iter()
         .map(extract_code_size)

crates/integration/src/tests.rs

@@ -55,7 +55,6 @@ test_spec!(create2, "CreateB", "Create2.sol");
 test_spec!(transfer, "Transfer", "Transfer.sol");
 test_spec!(send, "Send", "Send.sol");
 test_spec!(function_pointer, "FunctionPointer", "FunctionPointer.sol");
-test_spec!(mload, "MLoad", "MLoad.sol");
 
 fn instantiate(path: &str, contract: &str) -> Vec<SpecsAction> {
     vec![Instantiate {

crates/linker/src/lib.rs

@@ -52,6 +52,7 @@ pub fn link<T: AsRef<[u8]>>(input: T) -> anyhow::Result<Vec<u8>> {
 
     let ld_args = [
         "ld.lld",
+        "--lto=full",
         "--error-limit=0",
         "--relocatable",
         "--emit-relocs",

crates/llvm-builder/tests/build.rs

@@ -53,16 +53,6 @@ fn clone_build_and_clean_musl() -> anyhow::Result<()> {
         .assert()
         .success();
 
-    Command::cargo_bin(common::REVIVE_LLVM)?
-        .current_dir(test_dir.path())
-        .arg("build")
-        .arg("--llvm-projects")
-        .arg("clang")
-        .arg("--llvm-projects")
-        .arg("lld")
-        .assert()
-        .success();
-
     Command::cargo_bin(common::REVIVE_LLVM)?
         .arg("--target-env")
         .arg("musl")
@@ -75,6 +65,12 @@ fn clone_build_and_clean_musl() -> anyhow::Result<()> {
         .assert()
         .success();
 
+    Command::cargo_bin(common::REVIVE_LLVM)?
+        .current_dir(test_dir.path())
+        .arg("builtins")
+        .assert()
+        .success();
+
     Command::cargo_bin(common::REVIVE_LLVM)?
         .current_dir(test_dir.path())
         .arg("clean")
@@ -87,7 +83,6 @@ fn clone_build_and_clean_musl() -> anyhow::Result<()> {
 /// This test verifies that the LLVM repository can be successfully cloned and built in debug mode
 /// with tests and coverage enabled.
 #[test]
-#[cfg(target_os = "linux")]
 fn debug_build_with_tests_coverage() -> anyhow::Result<()> {
     let test_dir = common::TestDir::with_lockfile(None)?;
 
@@ -104,10 +99,6 @@ fn debug_build_with_tests_coverage() -> anyhow::Result<()> {
         .arg("--enable-tests")
         .arg("--build-type")
         .arg("Debug")
-        .arg("--llvm-projects")
-        .arg("clang")
-        .arg("--llvm-projects")
-        .arg("lld")
         .assert()
         .success();
 
@@ -116,7 +107,6 @@ fn debug_build_with_tests_coverage() -> anyhow::Result<()> {
 
 /// This test verifies that the LLVM repository can be successfully built with address sanitizer.
 #[test]
-#[cfg(target_os = "linux")]
 fn build_with_sanitizers() -> anyhow::Result<()> {
     let test_dir = common::TestDir::with_lockfile(None)?;
 
@@ -131,10 +121,6 @@ fn build_with_sanitizers() -> anyhow::Result<()> {
         .arg("build")
         .arg("--sanitizer")
         .arg("Address")
-        .arg("--llvm-projects")
-        .arg("lld")
-        .arg("--llvm-projects")
-        .arg("clang")
         .assert()
         .success();
 
@@ -143,36 +129,15 @@ fn build_with_sanitizers() -> anyhow::Result<()> {
 
 /// Tests the clone, build, and clean process of the LLVM repository for the emscripten target.
 #[test]
-#[cfg(target_os = "linux")]
+#[cfg(any(target_os = "linux", target_os = "macos"))]
 fn clone_build_and_clean_emscripten() -> anyhow::Result<()> {
     let test_dir = common::TestDir::with_lockfile(None)?;
     let command = Command::cargo_bin(common::REVIVE_LLVM)?;
     let program = command.get_program().to_string_lossy();
-
-    Command::cargo_bin(common::REVIVE_LLVM)?
-        .current_dir(test_dir.path())
-        .arg("clone")
-        .assert()
-        .success();
-
-    Command::cargo_bin(common::REVIVE_LLVM)?
-        .current_dir(test_dir.path())
-        .arg("build")
-        .arg("--llvm-projects")
-        .arg("lld")
-        .arg("--llvm-projects")
-        .arg("clang")
-        .assert()
-        .success();
-
-    // Two little shell-dependent things here:
-    // Doing `. ./emsdk_env.sh` instead of `source`, as `source` might be missing in some shells
-    // `cd {} && . ./emsdk_env.sh && cd ..` helps the script to locate `emsdk.py`
-    // @see https://github.com/emscripten-core/emsdk/blob/9dbdc4b3437750b85d16931c7c801bb71a782122/emsdk_env.sh#L61-L69
     let emsdk_wrapped_build_command = format!(
         "{program} --target-env emscripten clone && \
-        cd {} && . ./emsdk_env.sh && cd .. && \
+        source {}emsdk_env.sh && \
-        {program} --target-env emscripten build --llvm-projects lld",
+        {program} --target-env emscripten build --llvm-projects clang --llvm-projects lld",
         revive_llvm_builder::LLVMPath::DIRECTORY_EMSDK_SOURCE,
     );
 

crates/llvm-context/src/lib.rs

@@ -21,25 +21,17 @@ pub use self::polkavm::context::function::declaration::Declaration as PolkaVMFun
 pub use self::polkavm::context::function::intrinsics::Intrinsics as PolkaVMIntrinsicFunction;
 pub use self::polkavm::context::function::llvm_runtime::LLVMRuntime as PolkaVMLLVMRuntime;
 pub use self::polkavm::context::function::r#return::Return as PolkaVMFunctionReturn;
-pub use self::polkavm::context::function::runtime::arithmetics::Division as PolkaVMDivisionFunction;
-pub use self::polkavm::context::function::runtime::arithmetics::Remainder as PolkaVMRemainderFunction;
-pub use self::polkavm::context::function::runtime::arithmetics::SignedDivision as PolkaVMSignedDivisionFunction;
-pub use self::polkavm::context::function::runtime::arithmetics::SignedRemainder as PolkaVMSignedRemainderFunction;
 pub use self::polkavm::context::function::runtime::deploy_code::DeployCode as PolkaVMDeployCodeFunction;
 pub use self::polkavm::context::function::runtime::entry::Entry as PolkaVMEntryFunction;
-pub use self::polkavm::context::function::runtime::revive::Exit as PolkaVMExitFunction;
+pub use self::polkavm::context::function::runtime::immutable_data_load::ImmutableDataLoad as PolkaVMImmutableDataLoadFunction;
-pub use self::polkavm::context::function::runtime::revive::WordToPointer as PolkaVMWordToPointerFunction;
 pub use self::polkavm::context::function::runtime::runtime_code::RuntimeCode as PolkaVMRuntimeCodeFunction;
 pub use self::polkavm::context::function::runtime::FUNCTION_DEPLOY_CODE as PolkaVMFunctionDeployCode;
 pub use self::polkavm::context::function::runtime::FUNCTION_ENTRY as PolkaVMFunctionEntry;
+pub use self::polkavm::context::function::runtime::FUNCTION_LOAD_IMMUTABLE_DATA as PolkaVMFunctionImmutableDataLoad;
 pub use self::polkavm::context::function::runtime::FUNCTION_RUNTIME_CODE as PolkaVMFunctionRuntimeCode;
 pub use self::polkavm::context::function::yul_data::YulData as PolkaVMFunctionYulData;
 pub use self::polkavm::context::function::Function as PolkaVMFunction;
 pub use self::polkavm::context::global::Global as PolkaVMGlobal;
-pub use self::polkavm::context::pointer::heap::LoadWord as PolkaVMLoadHeapWordFunction;
-pub use self::polkavm::context::pointer::heap::StoreWord as PolkaVMStoreHeapWordFunction;
-pub use self::polkavm::context::pointer::storage::LoadWord as PolkaVMLoadStorageWordFunction;
-pub use self::polkavm::context::pointer::storage::StoreWord as PolkaVMStoreStorageWordFunction;
 pub use self::polkavm::context::pointer::Pointer as PolkaVMPointer;
 pub use self::polkavm::context::r#loop::Loop as PolkaVMLoop;
 pub use self::polkavm::context::solidity_data::SolidityData as PolkaVMContextSolidityData;
@@ -55,12 +47,8 @@ pub use self::polkavm::evm::create as polkavm_evm_create;
 pub use self::polkavm::evm::crypto as polkavm_evm_crypto;
 pub use self::polkavm::evm::ether_gas as polkavm_evm_ether_gas;
 pub use self::polkavm::evm::event as polkavm_evm_event;
-pub use self::polkavm::evm::event::EventLog as PolkaVMEventLogFunction;
 pub use self::polkavm::evm::ext_code as polkavm_evm_ext_code;
 pub use self::polkavm::evm::immutable as polkavm_evm_immutable;
-pub use self::polkavm::evm::immutable::Load as PolkaVMLoadImmutableDataFunction;
-pub use self::polkavm::evm::immutable::Store as PolkaVMStoreImmutableDataFunction;
-
 pub use self::polkavm::evm::math as polkavm_evm_math;
 pub use self::polkavm::evm::memory as polkavm_evm_memory;
 pub use self::polkavm::evm::r#return as polkavm_evm_return;

crates/llvm-context/src/polkavm/const/mod.rs

@@ -6,9 +6,15 @@ pub const LLVM_VERSION: semver::Version = semver::Version::new(18, 1, 4);
 /// The pointer width sized type.
 pub static XLEN: usize = revive_common::BIT_LENGTH_X32;
 
+/// The heap memory pointer pointer global variable name.
+pub static GLOBAL_HEAP_MEMORY_POINTER: &str = "memory_pointer";
+
 /// The calldata size global variable name.
 pub static GLOBAL_CALLDATA_SIZE: &str = "calldatasize";
 
+/// The call flags global variable name.
+pub static GLOBAL_CALL_FLAGS: &str = "call_flags";
+
 /// The deployer call header size that consists of:
 /// - bytecode hash (32 bytes)
 pub const DEPLOYER_CALL_HEADER_SIZE: usize = revive_common::BYTE_LENGTH_WORD;

crates/llvm-context/src/polkavm/context/function/llvm_runtime.rs

@@ -91,7 +91,7 @@ impl<'ctx> LLVMRuntime<'ctx> {
             llvm,
             sha3,
             //vec![Attribute::ArgMemOnly, Attribute::ReadOnly],
-            &[],
+            vec![],
             false,
         );
 

crates/llvm-context/src/polkavm/context/function/mod.rs

@@ -81,7 +81,8 @@ impl<'ctx> Function<'ctx> {
             || (name.starts_with("__")
                 && name != self::runtime::FUNCTION_ENTRY
                 && name != self::runtime::FUNCTION_DEPLOY_CODE
-                && name != self::runtime::FUNCTION_RUNTIME_CODE)
+                && name != self::runtime::FUNCTION_RUNTIME_CODE
+                && name != self::runtime::FUNCTION_LOAD_IMMUTABLE_DATA)
     }
 
     /// Returns the LLVM function declaration.
@@ -109,21 +110,30 @@ impl<'ctx> Function<'ctx> {
     pub fn set_attributes(
         llvm: &'ctx inkwell::context::Context,
         declaration: Declaration<'ctx>,
-        attributes: &[Attribute],
+        attributes: Vec<Attribute>,
         force: bool,
     ) {
-        for attribute_kind in attributes {
+        for attribute_kind in attributes.into_iter() {
             match attribute_kind {
                 Attribute::Memory => unimplemented!("`memory` attributes are not implemented"),
                 attribute_kind @ Attribute::AlwaysInline if force => {
-                    declaration.value.remove_enum_attribute(
+                    let is_optimize_none_set = declaration
-                        inkwell::attributes::AttributeLoc::Function,
+                        .value
-                        Attribute::NoInline as u32,
+                        .get_enum_attribute(
-                    );
+                            inkwell::attributes::AttributeLoc::Function,
-                    declaration.value.add_attribute(
+                            Attribute::OptimizeNone as u32,
-                        inkwell::attributes::AttributeLoc::Function,
+                        )
-                        llvm.create_enum_attribute(*attribute_kind as u32, 0),
+                        .is_some();
-                    );
+                    if !is_optimize_none_set {
+                        declaration.value.remove_enum_attribute(
+                            inkwell::attributes::AttributeLoc::Function,
+                            Attribute::NoInline as u32,
+                        );
+                        declaration.value.add_attribute(
+                            inkwell::attributes::AttributeLoc::Function,
+                            llvm.create_enum_attribute(attribute_kind as u32, 0),
+                        );
+                    }
                 }
                 attribute_kind @ Attribute::NoInline if force => {
                     declaration.value.remove_enum_attribute(
@@ -132,12 +142,12 @@ impl<'ctx> Function<'ctx> {
                     );
                     declaration.value.add_attribute(
                         inkwell::attributes::AttributeLoc::Function,
-                        llvm.create_enum_attribute(*attribute_kind as u32, 0),
+                        llvm.create_enum_attribute(attribute_kind as u32, 0),
                     );
                 }
                 attribute_kind => declaration.value.add_attribute(
                     inkwell::attributes::AttributeLoc::Function,
-                    llvm.create_enum_attribute(*attribute_kind as u32, 0),
+                    llvm.create_enum_attribute(attribute_kind as u32, 0),
                 ),
             }
         }
@@ -168,16 +178,27 @@ impl<'ctx> Function<'ctx> {
         declaration: Declaration<'ctx>,
         optimizer: &Optimizer,
     ) {
-        if optimizer.settings().level_middle_end_size == SizeLevel::Z {
+        if optimizer.settings().level_middle_end == inkwell::OptimizationLevel::None {
+            Self::remove_attributes(
+                declaration,
+                &[Attribute::OptimizeForSize, Attribute::AlwaysInline],
+            );
             Self::set_attributes(
                 llvm,
                 declaration,
-                &[Attribute::OptimizeForSize, Attribute::MinSize],
+                vec![Attribute::OptimizeNone, Attribute::NoInline],
+                false,
+            );
+        } else if optimizer.settings().level_middle_end_size == SizeLevel::Z {
+            Self::set_attributes(
+                llvm,
+                declaration,
+                vec![Attribute::OptimizeForSize, Attribute::MinSize],
                 false,
             );
         }
 
-        Self::set_attributes(llvm, declaration, &[Attribute::NoFree], false);
+        Self::set_attributes(llvm, declaration, vec![Attribute::NoFree], false);
     }
 
     /// Sets the front-end runtime attributes.
@@ -187,10 +208,26 @@ impl<'ctx> Function<'ctx> {
         optimizer: &Optimizer,
     ) {
         if optimizer.settings().level_middle_end_size == SizeLevel::Z {
-            Self::set_attributes(llvm, declaration, &[Attribute::NoInline], false);
+            Self::set_attributes(llvm, declaration, vec![Attribute::NoInline], false);
         }
     }
 
+    /// Sets the exception handler attributes.
+    pub fn set_exception_handler_attributes(
+        llvm: &'ctx inkwell::context::Context,
+        declaration: Declaration<'ctx>,
+    ) {
+        Self::set_attributes(llvm, declaration, vec![Attribute::NoInline], false);
+    }
+
+    /// Sets the CXA-throw attributes.
+    pub fn set_cxa_throw_attributes(
+        llvm: &'ctx inkwell::context::Context,
+        declaration: Declaration<'ctx>,
+    ) {
+        Self::set_attributes(llvm, declaration, vec![Attribute::NoProfile], false);
+    }
+
     /// Sets the pure function attributes.
     pub fn set_pure_function_attributes(
         llvm: &'ctx inkwell::context::Context,
@@ -199,7 +236,7 @@ impl<'ctx> Function<'ctx> {
         Self::set_attributes(
             llvm,
             declaration,
-            &[
+            vec![
                 Attribute::MustProgress,
                 Attribute::NoUnwind,
                 Attribute::WillReturn,

crates/llvm-context/src/polkavm/context/function/runtime/arithmetics.rs

@@ -1,269 +0,0 @@
-//! Translates the arithmetic operations.
-
-use inkwell::values::BasicValue;
-
-use crate::polkavm::context::runtime::RuntimeFunction;
-use crate::polkavm::context::Context;
-use crate::polkavm::Dependency;
-use crate::polkavm::WriteLLVM;
-
-/// Implements the division operator according to the EVM specification.
-pub struct Division;
-
-impl<D> RuntimeFunction<D> for Division
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_division";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.word_type().fn_type(
-            &[context.word_type().into(), context.word_type().into()],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
-        let operand_1 = Self::paramater(context, 0).into_int_value();
-        let operand_2 = Self::paramater(context, 1).into_int_value();
-
-        wrapped_division(context, operand_2, || {
-            Ok(context
-                .builder()
-                .build_int_unsigned_div(operand_1, operand_2, "DIV")?)
-        })
-        .map(Into::into)
-    }
-}
-
-impl<D> WriteLLVM<D> for Division
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-/// Implements the signed division operator according to the EVM specification.
-pub struct SignedDivision;
-
-impl<D> RuntimeFunction<D> for SignedDivision
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_signed_division";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.word_type().fn_type(
-            &[context.word_type().into(), context.word_type().into()],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
-        let operand_1 = Self::paramater(context, 0).into_int_value();
-        let operand_2 = Self::paramater(context, 1).into_int_value();
-
-        let block_calculate = context.append_basic_block("calculate");
-        let block_overflow = context.append_basic_block("overflow");
-        let block_select = context.append_basic_block("select_result");
-        let block_origin = context.basic_block();
-        context.builder().build_switch(
-            operand_2,
-            block_calculate,
-            &[
-                (context.word_type().const_zero(), block_select),
-                (context.word_type().const_all_ones(), block_overflow),
-            ],
-        )?;
-
-        context.set_basic_block(block_calculate);
-        let quotient = context
-            .builder()
-            .build_int_signed_div(operand_1, operand_2, "SDIV")?;
-        context.build_unconditional_branch(block_select);
-
-        context.set_basic_block(block_overflow);
-        let max_uint = context.builder().build_int_z_extend(
-            context
-                .integer_type(revive_common::BIT_LENGTH_WORD - 1)
-                .const_all_ones(),
-            context.word_type(),
-            "max_uint",
-        )?;
-        let is_operand_1_overflow = context.builder().build_int_compare(
-            inkwell::IntPredicate::EQ,
-            operand_1,
-            context.builder().build_int_neg(max_uint, "min_uint")?,
-            "is_operand_1_overflow",
-        )?;
-        context.build_conditional_branch(is_operand_1_overflow, block_select, block_calculate)?;
-
-        context.set_basic_block(block_select);
-        let result = context.builder().build_phi(context.word_type(), "result")?;
-        result.add_incoming(&[
-            (&operand_1, block_overflow),
-            (&context.word_const(0), block_origin),
-            (&quotient.as_basic_value_enum(), block_calculate),
-        ]);
-        Ok(Some(result.as_basic_value()))
-    }
-}
-
-impl<D> WriteLLVM<D> for SignedDivision
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-/// Implements the remainder operator according to the EVM specification.
-pub struct Remainder;
-
-impl<D> RuntimeFunction<D> for Remainder
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_remainder";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.word_type().fn_type(
-            &[context.word_type().into(), context.word_type().into()],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
-        let operand_1 = Self::paramater(context, 0).into_int_value();
-        let operand_2 = Self::paramater(context, 1).into_int_value();
-
-        wrapped_division(context, operand_2, || {
-            Ok(context
-                .builder()
-                .build_int_unsigned_rem(operand_1, operand_2, "MOD")?)
-        })
-        .map(Into::into)
-    }
-}
-
-impl<D> WriteLLVM<D> for Remainder
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-/// Implements the signed remainder operator according to the EVM specification.
-pub struct SignedRemainder;
-
-impl<D> RuntimeFunction<D> for SignedRemainder
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_signed_remainder";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.word_type().fn_type(
-            &[context.word_type().into(), context.word_type().into()],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
-        let operand_1 = Self::paramater(context, 0).into_int_value();
-        let operand_2 = Self::paramater(context, 1).into_int_value();
-
-        wrapped_division(context, operand_2, || {
-            Ok(context
-                .builder()
-                .build_int_signed_rem(operand_1, operand_2, "SMOD")?)
-        })
-        .map(Into::into)
-    }
-}
-
-impl<D> WriteLLVM<D> for SignedRemainder
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-/// Wrap division operations so that zero will be returned if the
-/// denominator is zero (see also Ethereum YP Appendix H.2).
-///
-/// The closure is expected to calculate and return the quotient.
-///
-/// The result is either the calculated quotient or zero,
-///  selected at runtime.
-fn wrapped_division<'ctx, D, F, T>(
-    context: &Context<'ctx, D>,
-    denominator: inkwell::values::IntValue<'ctx>,
-    f: F,
-) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>>
-where
-    D: Dependency + Clone,
-    F: FnOnce() -> anyhow::Result<T>,
-    T: inkwell::values::IntMathValue<'ctx>,
-{
-    assert_eq!(
-        denominator.get_type().get_bit_width(),
-        revive_common::BIT_LENGTH_WORD as u32
-    );
-
-    let block_calculate = context.append_basic_block("calculate");
-    let block_select = context.append_basic_block("select");
-    let block_origin = context.basic_block();
-    context.builder().build_switch(
-        denominator,
-        block_calculate,
-        &[(context.word_const(0), block_select)],
-    )?;
-
-    context.set_basic_block(block_calculate);
-    let calculated_value = f()?.as_basic_value_enum();
-    context.build_unconditional_branch(block_select);
-
-    context.set_basic_block(block_select);
-    let result = context.builder().build_phi(context.word_type(), "result")?;
-    result.add_incoming(&[
-        (&context.word_const(0), block_origin),
-        (&calculated_value, block_calculate),
-    ]);
-    Ok(result.as_basic_value())
-}

crates/llvm-context/src/polkavm/context/function/runtime/entry.rs

@@ -24,6 +24,22 @@ impl Entry {
     where
         D: Dependency + Clone,
     {
+        context.set_global(
+            crate::polkavm::GLOBAL_HEAP_MEMORY_POINTER,
+            context.llvm().ptr_type(AddressSpace::Heap.into()),
+            AddressSpace::Stack,
+            context.xlen_type().get_undef(),
+        );
+        context.build_store(
+            context
+                .get_global(crate::polkavm::GLOBAL_HEAP_MEMORY_POINTER)?
+                .into(),
+            context.build_sbrk(
+                context.xlen_type().const_zero(),
+                context.xlen_type().const_zero(),
+            )?,
+        )?;
+
         context.set_global(
             crate::polkavm::GLOBAL_CALLDATA_SIZE,
             context.xlen_type(),
@@ -31,6 +47,13 @@ impl Entry {
             context.xlen_type().get_undef(),
         );
 
+        context.set_global(
+            crate::polkavm::GLOBAL_CALL_FLAGS,
+            context.word_type(),
+            AddressSpace::Stack,
+            context.word_const(0),
+        );
+
         Ok(())
     }
 
@@ -47,11 +70,6 @@ impl Entry {
             .build_runtime_call(revive_runtime_api::polkavm_imports::CALL_DATA_SIZE, &[])
             .expect("the call_data_size syscall method should return a value")
             .into_int_value();
-        let call_data_size_value = context.builder().build_int_truncate(
-            call_data_size_value,
-            context.xlen_type(),
-            "call_data_size_truncated",
-        )?;
         context
             .builder()
             .build_store(call_data_size_pointer, call_data_size_value)?;
@@ -72,6 +90,13 @@ impl Entry {
             .borrow()
             .get_nth_param(Self::ARGUMENT_INDEX_CALL_FLAGS);
 
+        context.set_global(
+            crate::polkavm::GLOBAL_CALL_FLAGS,
+            is_deploy.get_type(),
+            AddressSpace::Stack,
+            is_deploy.into_int_value(),
+        );
+
         let deploy_code_call_block = context.append_basic_block("deploy_code_call_block");
         let runtime_code_call_block = context.append_basic_block("runtime_code_call_block");
 
@@ -145,7 +170,7 @@ where
         crate::PolkaVMFunction::set_attributes(
             context.llvm(),
             entry,
-            &[crate::PolkaVMAttribute::NoReturn],
+            vec![crate::PolkaVMAttribute::NoReturn],
             true,
         );
 

crates/llvm-context/src/polkavm/context/function/runtime/immutable_data_load.rs

@@ -0,0 +1,118 @@
+//! The immutable data runtime function.
+
+use crate::polkavm::context::address_space::AddressSpace;
+use crate::polkavm::context::function::runtime;
+use crate::polkavm::context::pointer::Pointer;
+use crate::polkavm::context::Context;
+use crate::polkavm::Dependency;
+use crate::polkavm::WriteLLVM;
+
+/// A function for requesting the immutable data from the runtime.
+/// This is a special function that is only used by the front-end generated code.
+///
+/// The runtime API is called lazily and subsequent calls are no-ops.
+///
+/// The bytes written is asserted to match the expected length.
+/// This should never fail; the length is known.
+/// However, this is a one time assertion, hence worth it.
+#[derive(Debug)]
+pub struct ImmutableDataLoad;
+
+impl<D> WriteLLVM<D> for ImmutableDataLoad
+where
+    D: Dependency + Clone,
+{
+    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
+        context.add_function(
+            runtime::FUNCTION_LOAD_IMMUTABLE_DATA,
+            context.void_type().fn_type(Default::default(), false),
+            0,
+            Some(inkwell::module::Linkage::External),
+        )?;
+
+        Ok(())
+    }
+
+    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
+        context.set_current_function(runtime::FUNCTION_LOAD_IMMUTABLE_DATA, None)?;
+        context.set_basic_block(context.current_function().borrow().entry_block());
+
+        let immutable_data_size_pointer = context
+            .get_global(revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_SIZE)?
+            .value
+            .as_pointer_value();
+        let immutable_data_size = context.build_load(
+            Pointer::new(
+                context.xlen_type(),
+                AddressSpace::Stack,
+                immutable_data_size_pointer,
+            ),
+            "immutable_data_size_load",
+        )?;
+
+        let load_immutable_data_block = context.append_basic_block("load_immutables_block");
+        let return_block = context.current_function().borrow().return_block();
+        let immutable_data_size_is_zero = context.builder().build_int_compare(
+            inkwell::IntPredicate::EQ,
+            context.xlen_type().const_zero(),
+            immutable_data_size.into_int_value(),
+            "immutable_data_size_is_zero",
+        )?;
+        context.build_conditional_branch(
+            immutable_data_size_is_zero,
+            return_block,
+            load_immutable_data_block,
+        )?;
+
+        context.set_basic_block(load_immutable_data_block);
+        let output_pointer = context
+            .get_global(revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_POINTER)?
+            .value
+            .as_pointer_value();
+        context.build_runtime_call(
+            revive_runtime_api::polkavm_imports::GET_IMMUTABLE_DATA,
+            &[
+                context
+                    .builder()
+                    .build_ptr_to_int(output_pointer, context.xlen_type(), "ptr_to_xlen")?
+                    .into(),
+                context
+                    .builder()
+                    .build_ptr_to_int(
+                        immutable_data_size_pointer,
+                        context.xlen_type(),
+                        "ptr_to_xlen",
+                    )?
+                    .into(),
+            ],
+        );
+        let bytes_written = context.builder().build_load(
+            context.xlen_type(),
+            immutable_data_size_pointer,
+            "bytes_written",
+        )?;
+        context.builder().build_store(
+            immutable_data_size_pointer,
+            context.xlen_type().const_zero(),
+        )?;
+        let overflow_block = context.append_basic_block("immutable_data_overflow");
+        let is_overflow = context.builder().build_int_compare(
+            inkwell::IntPredicate::UGT,
+            immutable_data_size.into_int_value(),
+            bytes_written.into_int_value(),
+            "is_overflow",
+        )?;
+        context.build_conditional_branch(is_overflow, overflow_block, return_block)?;
+
+        context.set_basic_block(overflow_block);
+        context.build_call(context.intrinsics().trap, &[], "invalid_trap");
+        context.build_unreachable();
+
+        context.set_basic_block(return_block);
+        context.build_return(None);
+
+        context.pop_debug_scope();
+
+        Ok(())
+    }
+}

crates/llvm-context/src/polkavm/context/function/runtime/mod.rs

@@ -1,9 +1,8 @@
 //! The front-end runtime functions.
 
-pub mod arithmetics;
 pub mod deploy_code;
 pub mod entry;
-pub mod revive;
+pub mod immutable_data_load;
 pub mod runtime_code;
 
 /// The main entry function name.
@@ -14,3 +13,6 @@ pub const FUNCTION_DEPLOY_CODE: &str = "__deploy";
 
 /// The runtime code function name.
 pub const FUNCTION_RUNTIME_CODE: &str = "__runtime";
+
+/// The immutable data load function name.
+pub const FUNCTION_LOAD_IMMUTABLE_DATA: &str = "__immutable_data_load";

crates/llvm-context/src/polkavm/context/function/runtime/revive.rs

@@ -1,147 +0,0 @@
-//! The revive compiler runtime functions.
-
-use inkwell::values::BasicValue;
-
-use crate::polkavm::context::function::Attribute;
-use crate::polkavm::context::runtime::RuntimeFunction;
-use crate::polkavm::context::Context;
-use crate::polkavm::Dependency;
-use crate::polkavm::WriteLLVM;
-
-/// Pointers are represented as opaque 256 bit integer values in EVM.
-/// In practice, they should never exceed a register sized bit value.
-/// However, we still protect against this possibility here: Heap index
-/// offsets are generally untrusted and potentially represent valid
-/// (but wrong) pointers when truncated.
-pub struct WordToPointer;
-
-impl<D> RuntimeFunction<D> for WordToPointer
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_int_truncate";
-
-    const ATTRIBUTES: &'static [Attribute] = &[
-        Attribute::WillReturn,
-        Attribute::NoFree,
-        Attribute::AlwaysInline,
-    ];
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context
-            .xlen_type()
-            .fn_type(&[context.word_type().into()], false)
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
-        let value = Self::paramater(context, 0).into_int_value();
-        let truncated =
-            context
-                .builder()
-                .build_int_truncate(value, context.xlen_type(), "offset_truncated")?;
-        let extended = context.builder().build_int_z_extend(
-            truncated,
-            context.word_type(),
-            "offset_extended",
-        )?;
-        let is_overflow = context.builder().build_int_compare(
-            inkwell::IntPredicate::NE,
-            value,
-            extended,
-            "compare_truncated_extended",
-        )?;
-
-        let block_continue = context.append_basic_block("offset_pointer_ok");
-        let block_trap = context.append_basic_block("offset_pointer_overflow");
-        context.build_conditional_branch(is_overflow, block_trap, block_continue)?;
-
-        context.set_basic_block(block_trap);
-        context.build_call(context.intrinsics().trap, &[], "invalid_trap");
-        context.build_unreachable();
-
-        context.set_basic_block(block_continue);
-        Ok(Some(truncated.as_basic_value_enum()))
-    }
-}
-
-impl<D> WriteLLVM<D> for WordToPointer
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-/// The revive runtime exit function.
-pub struct Exit;
-
-impl<D> RuntimeFunction<D> for Exit
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_exit";
-
-    const ATTRIBUTES: &'static [Attribute] = &[
-        Attribute::NoReturn,
-        Attribute::NoFree,
-        Attribute::AlwaysInline,
-    ];
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.void_type().fn_type(
-            &[
-                context.xlen_type().into(),
-                context.word_type().into(),
-                context.word_type().into(),
-            ],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
-        let flags = Self::paramater(context, 0).into_int_value();
-        let offset = Self::paramater(context, 1).into_int_value();
-        let length = Self::paramater(context, 2).into_int_value();
-
-        let offset_truncated = context.safe_truncate_int_to_xlen(offset)?;
-        let length_truncated = context.safe_truncate_int_to_xlen(length)?;
-        let heap_pointer = context.build_heap_gep(offset_truncated, length_truncated)?;
-        let offset_pointer = context.builder().build_ptr_to_int(
-            heap_pointer.value,
-            context.xlen_type(),
-            "return_data_ptr_to_int",
-        )?;
-
-        context.build_runtime_call(
-            revive_runtime_api::polkavm_imports::RETURN,
-            &[flags.into(), offset_pointer.into(), length_truncated.into()],
-        );
-        context.build_unreachable();
-
-        Ok(None)
-    }
-}
-
-impl<D> WriteLLVM<D> for Exit
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}

crates/llvm-context/src/polkavm/context/mod.rs

@@ -10,7 +10,6 @@ pub mod function;
 pub mod global;
 pub mod r#loop;
 pub mod pointer;
-pub mod runtime;
 pub mod solidity_data;
 pub mod yul_data;
 
@@ -32,8 +31,6 @@ use crate::polkavm::DebugConfig;
 use crate::polkavm::Dependency;
 use crate::target_machine::target::Target;
 use crate::target_machine::TargetMachine;
-use crate::PolkaVMLoadHeapWordFunction;
-use crate::PolkaVMStoreHeapWordFunction;
 
 use self::address_space::AddressSpace;
 use self::attribute::Attribute;
@@ -44,13 +41,10 @@ use self::function::declaration::Declaration as FunctionDeclaration;
 use self::function::intrinsics::Intrinsics;
 use self::function::llvm_runtime::LLVMRuntime;
 use self::function::r#return::Return as FunctionReturn;
-use self::function::runtime::revive::Exit;
-use self::function::runtime::revive::WordToPointer;
 use self::function::Function;
 use self::global::Global;
 use self::pointer::Pointer;
 use self::r#loop::Loop;
-use self::runtime::RuntimeFunction;
 use self::solidity_data::SolidityData;
 use self::yul_data::YulData;
 
@@ -727,7 +721,6 @@ where
         name: &str,
     ) -> Pointer<'ctx> {
         let pointer = self.builder.build_alloca(r#type, name).unwrap();
-
         pointer
             .as_instruction()
             .unwrap()
@@ -775,21 +768,60 @@ where
     ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>> {
         match pointer.address_space {
             AddressSpace::Heap => {
-                let name = <PolkaVMLoadHeapWordFunction as RuntimeFunction<D>>::NAME;
+                let heap_pointer = self.build_heap_gep(
-                let declaration =
+                    self.builder().build_ptr_to_int(
-                    <PolkaVMLoadHeapWordFunction as RuntimeFunction<D>>::declaration(self);
+                        pointer.value,
-                let arguments = [self
+                        self.xlen_type(),
+                        "offset_ptrtoint",
+                    )?,
+                    pointer
+                        .r#type
+                        .size_of()
+                        .expect("should be IntValue")
+                        .const_truncate(self.xlen_type()),
+                )?;
+
+                let value = self
                     .builder()
-                    .build_ptr_to_int(pointer.value, self.xlen_type(), "offset_ptrtoint")?
+                    .build_load(pointer.r#type, heap_pointer.value, name)?;
-                    .as_basic_value_enum()];
+                self.basic_block()
-                Ok(self
+                    .get_last_instruction()
-                    .build_call(declaration, &arguments, "heap_load")
+                    .expect("Always exists")
-                    .unwrap_or_else(|| {
+                    .set_alignment(revive_common::BYTE_LENGTH_BYTE as u32)
-                        panic!("revive runtime function {name} should return a value")
+                    .expect("Alignment is valid");
-                    }))
+
+                self.build_byte_swap(value)
             }
             AddressSpace::Storage | AddressSpace::TransientStorage => {
-                unreachable!("should use the runtime function")
+                let storage_value_pointer =
+                    self.build_alloca(self.word_type(), "storage_value_pointer");
+                self.build_store(storage_value_pointer, self.word_const(0))?;
+
+                let storage_value_length_pointer =
+                    self.build_alloca(self.xlen_type(), "storage_value_length_pointer");
+                self.build_store(
+                    storage_value_length_pointer,
+                    self.word_const(revive_common::BIT_LENGTH_WORD as u64),
+                )?;
+
+                let transient = pointer.address_space == AddressSpace::TransientStorage;
+
+                self.build_runtime_call(
+                    revive_runtime_api::polkavm_imports::GET_STORAGE,
+                    &[
+                        self.xlen_type().const_int(transient as u64, false).into(),
+                        pointer.to_int(self).into(),
+                        self.xlen_type().const_all_ones().into(),
+                        storage_value_pointer.to_int(self).into(),
+                        storage_value_length_pointer.to_int(self).into(),
+                    ],
+                );
+
+                // We do not to check the return value.
+                // Solidity assumes infallible SLOAD.
+                // If a key doesn't exist the "zero" value is returned.
+
+                self.build_load(storage_value_pointer, "storage_value_load")
             }
             AddressSpace::Stack => {
                 let value = self
@@ -815,16 +847,60 @@ where
     {
         match pointer.address_space {
             AddressSpace::Heap => {
-                let declaration =
+                let heap_pointer = self.build_heap_gep(
-                    <PolkaVMStoreHeapWordFunction as RuntimeFunction<D>>::declaration(self);
+                    self.builder().build_ptr_to_int(
-                let arguments = [
+                        pointer.value,
-                    pointer.to_int(self).as_basic_value_enum(),
+                        self.xlen_type(),
-                    value.as_basic_value_enum(),
+                        "offset_ptrtoint",
-                ];
+                    )?,
-                self.build_call(declaration, &arguments, "heap_store");
+                    value
+                        .as_basic_value_enum()
+                        .get_type()
+                        .size_of()
+                        .expect("should be IntValue")
+                        .const_truncate(self.xlen_type()),
+                )?;
+
+                let value = value.as_basic_value_enum();
+                let value = match value.get_type().into_int_type().get_bit_width() as usize {
+                    revive_common::BIT_LENGTH_WORD => self.build_byte_swap(value)?,
+                    revive_common::BIT_LENGTH_BYTE => value,
+                    _ => unreachable!("Only word and byte sized values can be stored on EVM heap"),
+                };
+
+                self.builder
+                    .build_store(heap_pointer.value, value)?
+                    .set_alignment(revive_common::BYTE_LENGTH_BYTE as u32)
+                    .expect("Alignment is valid");
             }
             AddressSpace::Storage | AddressSpace::TransientStorage => {
-                unreachable!("should use the runtime function")
+                assert_eq!(
+                    value.as_basic_value_enum().get_type(),
+                    self.word_type().as_basic_type_enum()
+                );
+
+                let storage_value_pointer = self.build_alloca(self.word_type(), "storage_value");
+                let storage_value_pointer_casted = self.builder().build_ptr_to_int(
+                    storage_value_pointer.value,
+                    self.xlen_type(),
+                    "storage_value_pointer_casted",
+                )?;
+
+                self.builder()
+                    .build_store(storage_value_pointer.value, value)?;
+
+                let transient = pointer.address_space == AddressSpace::TransientStorage;
+
+                self.build_runtime_call(
+                    revive_runtime_api::polkavm_imports::SET_STORAGE,
+                    &[
+                        self.xlen_type().const_int(transient as u64, false).into(),
+                        pointer.to_int(self).into(),
+                        self.xlen_type().const_all_ones().into(),
+                        storage_value_pointer_casted.into(),
+                        self.integer_const(crate::polkavm::XLEN, 32).into(),
+                    ],
+                );
             }
             AddressSpace::Stack => {
                 let instruction = self.builder.build_store(pointer.value, value).unwrap();
@@ -1039,16 +1115,38 @@ where
         offset: inkwell::values::IntValue<'ctx>,
         length: inkwell::values::IntValue<'ctx>,
     ) -> anyhow::Result<()> {
-        self.build_call(
+        let offset_truncated = self.safe_truncate_int_to_xlen(offset)?;
-            <Exit as RuntimeFunction<D>>::declaration(self),
+        let length_truncated = self.safe_truncate_int_to_xlen(length)?;
-            &[flags.into(), offset.into(), length.into()],
+        let offset_into_heap = self.build_heap_gep(offset_truncated, length_truncated)?;
-            "exit",
+
+        let length_pointer = self.safe_truncate_int_to_xlen(length)?;
+        let offset_pointer = self.builder().build_ptr_to_int(
+            offset_into_heap.value,
+            self.xlen_type(),
+            "return_data_ptr_to_int",
+        )?;
+
+        self.build_runtime_call(
+            revive_runtime_api::polkavm_imports::RETURN,
+            &[flags.into(), offset_pointer.into(), length_pointer.into()],
         );
+        self.build_unreachable();
 
         Ok(())
     }
 
     /// Truncate a memory offset to register size, trapping if it doesn't fit.
+    /// Pointers are represented as opaque 256 bit integer values in EVM.
+    /// In practice, they should never exceed a register sized bit value.
+    /// However, we still protect against this possibility here. Heap index
+    /// offsets are generally untrusted and potentially represent valid
+    /// (but wrong) pointers when truncated.
+    ///
+    /// TODO: Splitting up into a dedicated function
+    /// could potentially decrease code sizes (LLVM can still decide to inline).
+    /// However, passing i256 parameters is counter productive and
+    /// I've found that splitting it up actualy increases code size.
+    /// Should be reviewed after 64bit support.
     pub fn safe_truncate_int_to_xlen(
         &self,
         value: inkwell::values::IntValue<'ctx>,
@@ -1062,19 +1160,29 @@ where
             "expected XLEN or WORD sized int type for memory offset",
         );
 
-        Ok(self
+        let truncated =
-            .build_call(
+            self.builder()
-                <WordToPointer as RuntimeFunction<D>>::declaration(self),
+                .build_int_truncate(value, self.xlen_type(), "offset_truncated")?;
-                &[value.into()],
+        let extended =
-                "word_to_pointer",
+            self.builder()
-            )
+                .build_int_z_extend(truncated, self.word_type(), "offset_extended")?;
-            .unwrap_or_else(|| {
+        let is_overflow = self.builder().build_int_compare(
-                panic!(
+            inkwell::IntPredicate::NE,
-                    "revive runtime function {} should return a value",
+            value,
-                    <WordToPointer as RuntimeFunction<D>>::NAME,
+            extended,
-                )
+            "compare_truncated_extended",
-            })
+        )?;
-            .into_int_value())
+
+        let block_continue = self.append_basic_block("offset_pointer_ok");
+        let block_trap = self.append_basic_block("offset_pointer_overflow");
+        self.build_conditional_branch(is_overflow, block_trap, block_continue)?;
+
+        self.set_basic_block(block_trap);
+        self.build_call(self.intrinsics().trap, &[], "invalid_trap");
+        self.build_unreachable();
+
+        self.set_basic_block(block_continue);
+        Ok(truncated)
     }
 
     /// Build a call to PolkaVM `sbrk` for extending the heap from offset by `size`.
@@ -1101,17 +1209,45 @@ where
 
     /// Build a call to PolkaVM `msize` for querying the linear memory size.
     pub fn build_msize(&self) -> anyhow::Result<inkwell::values::IntValue<'ctx>> {
-        let memory_size_pointer = self
+        Ok(self
-            .module()
+            .builder()
-            .get_global(revive_runtime_api::polkavm_imports::MEMORY_SIZE)
+            .build_call(
-            .expect("the memory size symbol should have been declared")
+                self.runtime_api_method(revive_runtime_api::polkavm_imports::MEMORY_SIZE),
-            .as_pointer_value();
+                &[],
-        let memory_size_value = self.builder().build_load(
+                "call_msize",
-            self.xlen_type(),
+            )?
-            memory_size_pointer,
+            .try_as_basic_value()
-            "memory_size_value",
+            .left()
+            .expect("sbrk returns an int")
+            .into_int_value())
+    }
+
+    /// Call PolkaVM `sbrk` for extending the heap by `offset` + `size`,
+    /// trapping the contract if the call failed.
+    pub fn build_heap_alloc(
+        &self,
+        offset: inkwell::values::IntValue<'ctx>,
+        size: inkwell::values::IntValue<'ctx>,
+    ) -> anyhow::Result<()> {
+        let end_of_memory = self.build_sbrk(offset, size)?;
+        let return_is_nil = self.builder().build_int_compare(
+            inkwell::IntPredicate::EQ,
+            end_of_memory,
+            self.llvm().ptr_type(Default::default()).const_null(),
+            "compare_end_of_memory_nil",
         )?;
-        Ok(memory_size_value.into_int_value())
+
+        let continue_block = self.append_basic_block("sbrk_not_nil");
+        let trap_block = self.append_basic_block("sbrk_nil");
+        self.build_conditional_branch(return_is_nil, trap_block, continue_block)?;
+
+        self.set_basic_block(trap_block);
+        self.build_call(self.intrinsics().trap, &[], "invalid_trap");
+        self.build_unreachable();
+
+        self.set_basic_block(continue_block);
+
+        Ok(())
     }
 
     /// Returns a pointer to `offset` into the heap, allocating
@@ -1126,8 +1262,18 @@ where
         assert_eq!(offset.get_type(), self.xlen_type());
         assert_eq!(length.get_type(), self.xlen_type());
 
-        let pointer = self.build_sbrk(offset, length)?;
+        self.build_heap_alloc(offset, length)?;
-        Ok(Pointer::new(self.byte_type(), AddressSpace::Stack, pointer))
+
+        let heap_start = self
+            .get_global(crate::polkavm::GLOBAL_HEAP_MEMORY_POINTER)?
+            .value
+            .as_pointer_value();
+        Ok(self.build_gep(
+            Pointer::new(self.byte_type(), AddressSpace::Stack, heap_start),
+            &[offset],
+            self.byte_type(),
+            "heap_offset_via_gep",
+        ))
     }
 
     /// Returns a boolean type constant.
@@ -1433,8 +1579,4 @@ where
             anyhow::bail!("The immutable size data is not available");
         }
     }
-
-    pub fn optimizer_settings(&self) -> &OptimizerSettings {
-        self.optimizer.settings()
-    }
 }

crates/llvm-context/src/polkavm/context/pointer.rs

@@ -7,9 +7,6 @@ use crate::polkavm::context::global::Global;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
 
-pub mod heap;
-pub mod storage;
-
 /// The LLVM pointer.
 #[derive(Debug, Clone, Copy)]
 pub struct Pointer<'ctx> {

crates/llvm-context/src/polkavm/context/pointer/heap.rs

@@ -1,110 +0,0 @@
-//! The revive simulated EVM linear memory pointer functions.
-
-use inkwell::values::BasicValueEnum;
-
-use crate::polkavm::context::runtime::RuntimeFunction;
-use crate::polkavm::context::Context;
-use crate::polkavm::Dependency;
-use crate::polkavm::WriteLLVM;
-
-/// Load a word size value from a heap pointer.
-pub struct LoadWord;
-
-impl<D> RuntimeFunction<D> for LoadWord
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_load_heap_word";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context
-            .word_type()
-            .fn_type(&[context.xlen_type().into()], false)
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        let offset = Self::paramater(context, 0).into_int_value();
-        let length = context
-            .xlen_type()
-            .const_int(revive_common::BYTE_LENGTH_WORD as u64, false);
-        let pointer = context.build_heap_gep(offset, length)?;
-        let value = context
-            .builder()
-            .build_load(context.word_type(), pointer.value, "value")?;
-        context
-            .basic_block()
-            .get_last_instruction()
-            .expect("Always exists")
-            .set_alignment(revive_common::BYTE_LENGTH_BYTE as u32)
-            .expect("Alignment is valid");
-
-        let swapped_value = context.build_byte_swap(value)?;
-        Ok(Some(swapped_value))
-    }
-}
-
-impl<D> WriteLLVM<D> for LoadWord
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-/// Store a word size value through a heap pointer.
-pub struct StoreWord;
-
-impl<D> RuntimeFunction<D> for StoreWord
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_store_heap_word";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.void_type().fn_type(
-            &[context.xlen_type().into(), context.word_type().into()],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        let offset = Self::paramater(context, 0).into_int_value();
-        let length = context
-            .xlen_type()
-            .const_int(revive_common::BYTE_LENGTH_WORD as u64, false);
-        let pointer = context.build_heap_gep(offset, length)?;
-
-        let value = context.build_byte_swap(Self::paramater(context, 1))?;
-
-        context
-            .builder()
-            .build_store(pointer.value, value)?
-            .set_alignment(revive_common::BYTE_LENGTH_BYTE as u32)
-            .expect("Alignment is valid");
-        Ok(None)
-    }
-}
-
-impl<D> WriteLLVM<D> for StoreWord
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}

crates/llvm-context/src/polkavm/context/pointer/storage.rs

@@ -1,135 +0,0 @@
-//! The revive storage pointer functions.
-
-use inkwell::values::BasicValueEnum;
-
-use crate::polkavm::context::runtime::RuntimeFunction;
-use crate::polkavm::context::Context;
-use crate::polkavm::Dependency;
-use crate::polkavm::WriteLLVM;
-
-/// Load a word size value from a storage pointer.
-pub struct LoadWord;
-
-impl<D> RuntimeFunction<D> for LoadWord
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_load_storage_word";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.word_type().fn_type(
-            &[context.xlen_type().into(), context.word_type().into()],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        let is_transient = Self::paramater(context, 0);
-        let key_value = Self::paramater(context, 1);
-
-        let key_pointer = context.build_alloca_at_entry(context.word_type(), "key_pointer");
-        let value_pointer = context.build_alloca_at_entry(context.word_type(), "value_pointer");
-        let length_pointer = context.build_alloca_at_entry(context.xlen_type(), "length_pointer");
-
-        context
-            .builder()
-            .build_store(key_pointer.value, key_value)?;
-        context.build_store(value_pointer, context.word_const(0))?;
-        context.build_store(
-            length_pointer,
-            context
-                .xlen_type()
-                .const_int(revive_common::BYTE_LENGTH_WORD as u64, false),
-        )?;
-
-        let arguments = [
-            is_transient,
-            key_pointer.to_int(context).into(),
-            context.xlen_type().const_all_ones().into(),
-            value_pointer.to_int(context).into(),
-            length_pointer.to_int(context).into(),
-        ];
-        context.build_runtime_call(revive_runtime_api::polkavm_imports::GET_STORAGE, &arguments);
-
-        // We do not to check the return value: Solidity assumes infallible loads.
-        // If a key doesn't exist the "zero" value is returned (ensured by above write).
-
-        Ok(Some(context.build_load(value_pointer, "storage_value")?))
-    }
-}
-
-impl<D> WriteLLVM<D> for LoadWord
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-/// Store a word size value through a storage pointer.
-pub struct StoreWord;
-
-impl<D> RuntimeFunction<D> for StoreWord
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_store_storage_word";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.void_type().fn_type(
-            &[
-                context.xlen_type().into(),
-                context.word_type().into(),
-                context.word_type().into(),
-            ],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        let is_transient = Self::paramater(context, 0);
-        let key = Self::paramater(context, 1);
-        let value = Self::paramater(context, 2);
-
-        let key_pointer = context.build_alloca_at_entry(context.word_type(), "key_pointer");
-        let value_pointer = context.build_alloca_at_entry(context.word_type(), "value_pointer");
-
-        context.build_store(key_pointer, key)?;
-        context.build_store(value_pointer, value)?;
-
-        let arguments = [
-            is_transient,
-            key_pointer.to_int(context).into(),
-            context.xlen_type().const_all_ones().into(),
-            value_pointer.to_int(context).into(),
-            context.integer_const(crate::polkavm::XLEN, 32).into(),
-        ];
-        context.build_runtime_call(revive_runtime_api::polkavm_imports::SET_STORAGE, &arguments);
-
-        Ok(None)
-    }
-}
-
-impl<D> WriteLLVM<D> for StoreWord
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}

crates/llvm-context/src/polkavm/context/runtime.rs

@@ -1,113 +0,0 @@
-//! The revive compiler runtime function interface definition.
-//!
-//! Common routines should not be inlined but extracted into smaller functions.
-//! This benefits contract code size.
-
-use crate::optimizer::settings::size_level::SizeLevel;
-use crate::polkavm::context::function::declaration::Declaration;
-use crate::polkavm::context::function::Function;
-use crate::polkavm::context::Attribute;
-use crate::polkavm::context::Context;
-use crate::polkavm::Dependency;
-
-/// The revive runtime function interface simplifies declaring runtime functions
-/// and code emitting by providing helpful default implementations.
-pub trait RuntimeFunction<D>
-where
-    D: Dependency + Clone,
-{
-    /// The function name.
-    const NAME: &'static str;
-
-    const ATTRIBUTES: &'static [Attribute] = &[
-        Attribute::NoFree,
-        Attribute::NoRecurse,
-        Attribute::WillReturn,
-    ];
-
-    /// The function type.
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx>;
-
-    /// Declare the function.
-    fn declare(&self, context: &mut Context<D>) -> anyhow::Result<()> {
-        let function = context.add_function(
-            Self::NAME,
-            Self::r#type(context),
-            0,
-            Some(inkwell::module::Linkage::External),
-        )?;
-
-        let mut attributes = Self::ATTRIBUTES.to_vec();
-        attributes.extend_from_slice(match context.optimizer_settings().level_middle_end_size {
-            SizeLevel::Zero => &[],
-            _ => &[Attribute::OptimizeForSize, Attribute::MinSize],
-        });
-        Function::set_attributes(
-            context.llvm(),
-            function.borrow().declaration(),
-            &attributes,
-            true,
-        );
-
-        Ok(())
-    }
-
-    /// Get the function declaration.
-    fn declaration<'ctx>(context: &Context<'ctx, D>) -> Declaration<'ctx> {
-        context
-            .get_function(Self::NAME)
-            .unwrap_or_else(|| panic!("runtime function {} should be declared", Self::NAME))
-            .borrow()
-            .declaration()
-    }
-
-    /// Emit the function.
-    fn emit(&self, context: &mut Context<D>) -> anyhow::Result<()> {
-        context.set_current_function(Self::NAME, None)?;
-        context.set_basic_block(context.current_function().borrow().entry_block());
-
-        let return_value = self.emit_body(context)?;
-        self.emit_epilogue(context, return_value);
-
-        context.pop_debug_scope();
-
-        Ok(())
-    }
-
-    /// Emit the function body.
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>>;
-
-    /// Emit the function return instructions.
-    fn emit_epilogue<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-        return_value: Option<inkwell::values::BasicValueEnum<'ctx>>,
-    ) {
-        let return_block = context.current_function().borrow().return_block();
-        context.build_unconditional_branch(return_block);
-        context.set_basic_block(return_block);
-        match return_value {
-            Some(value) => context.build_return(Some(&value)),
-            None => context.build_return(None),
-        }
-    }
-
-    /// Get the nth function paramater.
-    fn paramater<'ctx>(
-        context: &Context<'ctx, D>,
-        index: usize,
-    ) -> inkwell::values::BasicValueEnum<'ctx> {
-        let name = Self::NAME;
-        context
-            .get_function(name)
-            .unwrap_or_else(|| panic!("runtime function {name} should be declared"))
-            .borrow()
-            .declaration()
-            .function_value()
-            .get_nth_param(index as u32)
-            .unwrap_or_else(|| panic!("runtime function {name} should have parameter #{index}"))
-    }
-}

crates/llvm-context/src/polkavm/evm/arithmetic.rs

@@ -2,13 +2,8 @@
 
 use inkwell::values::BasicValue;
 
-use crate::polkavm::context::runtime::RuntimeFunction;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
-use crate::PolkaVMDivisionFunction;
-use crate::PolkaVMRemainderFunction;
-use crate::PolkaVMSignedDivisionFunction;
-use crate::PolkaVMSignedRemainderFunction;
 
 /// Translates the arithmetic addition.
 pub fn addition<'ctx, D>(
@@ -64,11 +59,11 @@ pub fn division<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMDivisionFunction as RuntimeFunction<D>>::NAME;
+    wrapped_division(context, operand_2, || {
-    let declaration = <PolkaVMDivisionFunction as RuntimeFunction<D>>::declaration(context);
+        Ok(context
-    Ok(context
+            .builder()
-        .build_call(declaration, &[operand_1.into(), operand_2.into()], "div")
+            .build_int_unsigned_div(operand_1, operand_2, "DIV")?)
-        .unwrap_or_else(|| panic!("revive runtime function {name} should return a value",)))
+    })
 }
 
 /// Translates the arithmetic remainder.
@@ -80,11 +75,11 @@ pub fn remainder<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMRemainderFunction as RuntimeFunction<D>>::NAME;
+    wrapped_division(context, operand_2, || {
-    let declaration = <PolkaVMRemainderFunction as RuntimeFunction<D>>::declaration(context);
+        Ok(context
-    Ok(context
+            .builder()
-        .build_call(declaration, &[operand_1.into(), operand_2.into()], "rem")
+            .build_int_unsigned_rem(operand_1, operand_2, "MOD")?)
-        .unwrap_or_else(|| panic!("revive runtime function {name} should return a value",)))
+    })
 }
 
 /// Translates the signed arithmetic division.
@@ -99,11 +94,54 @@ pub fn division_signed<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMSignedDivisionFunction as RuntimeFunction<D>>::NAME;
+    assert_eq!(
-    let declaration = <PolkaVMSignedDivisionFunction as RuntimeFunction<D>>::declaration(context);
+        operand_2.get_type().get_bit_width(),
-    Ok(context
+        revive_common::BIT_LENGTH_WORD as u32
-        .build_call(declaration, &[operand_1.into(), operand_2.into()], "sdiv")
+    );
-        .unwrap_or_else(|| panic!("revive runtime function {name} should return a value",)))
+
+    let block_calculate = context.append_basic_block("calculate");
+    let block_overflow = context.append_basic_block("overflow");
+    let block_select = context.append_basic_block("select_result");
+    let block_origin = context.basic_block();
+    context.builder().build_switch(
+        operand_2,
+        block_calculate,
+        &[
+            (context.word_type().const_zero(), block_select),
+            (context.word_type().const_all_ones(), block_overflow),
+        ],
+    )?;
+
+    context.set_basic_block(block_calculate);
+    let quotient = context
+        .builder()
+        .build_int_signed_div(operand_1, operand_2, "SDIV")?;
+    context.build_unconditional_branch(block_select);
+
+    context.set_basic_block(block_overflow);
+    let max_uint = context.builder().build_int_z_extend(
+        context
+            .integer_type(revive_common::BIT_LENGTH_WORD - 1)
+            .const_all_ones(),
+        context.word_type(),
+        "max_uint",
+    )?;
+    let is_operand_1_overflow = context.builder().build_int_compare(
+        inkwell::IntPredicate::EQ,
+        operand_1,
+        context.builder().build_int_neg(max_uint, "min_uint")?,
+        "is_operand_1_overflow",
+    )?;
+    context.build_conditional_branch(is_operand_1_overflow, block_select, block_calculate)?;
+
+    context.set_basic_block(block_select);
+    let result = context.builder().build_phi(context.word_type(), "result")?;
+    result.add_incoming(&[
+        (&operand_1, block_overflow),
+        (&context.word_const(0), block_origin),
+        (&quotient.as_basic_value_enum(), block_calculate),
+    ]);
+    Ok(result.as_basic_value())
 }
 
 /// Translates the signed arithmetic remainder.
@@ -115,9 +153,53 @@ pub fn remainder_signed<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMSignedRemainderFunction as RuntimeFunction<D>>::NAME;
+    wrapped_division(context, operand_2, || {
-    let declaration = <PolkaVMSignedRemainderFunction as RuntimeFunction<D>>::declaration(context);
+        Ok(context
-    Ok(context
+            .builder()
-        .build_call(declaration, &[operand_1.into(), operand_2.into()], "srem")
+            .build_int_signed_rem(operand_1, operand_2, "SMOD")?)
-        .unwrap_or_else(|| panic!("revive runtime function {name} should return a value",)))
+    })
+}
+
+/// Wrap division operations so that zero will be returned if the
+/// denominator is zero (see also Ethereum YP Appendix H.2).
+///
+/// The closure is expected to calculate and return the quotient.
+///
+/// The result is either the calculated quotient or zero,
+///  selected at runtime.
+fn wrapped_division<'ctx, D, F, T>(
+    context: &Context<'ctx, D>,
+    denominator: inkwell::values::IntValue<'ctx>,
+    f: F,
+) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>>
+where
+    D: Dependency + Clone,
+    F: FnOnce() -> anyhow::Result<T>,
+    T: inkwell::values::IntMathValue<'ctx>,
+{
+    assert_eq!(
+        denominator.get_type().get_bit_width(),
+        revive_common::BIT_LENGTH_WORD as u32
+    );
+
+    let block_calculate = context.append_basic_block("calculate");
+    let block_select = context.append_basic_block("select");
+    let block_origin = context.basic_block();
+    context.builder().build_switch(
+        denominator,
+        block_calculate,
+        &[(context.word_const(0), block_select)],
+    )?;
+
+    context.set_basic_block(block_calculate);
+    let calculated_value = f()?.as_basic_value_enum();
+    context.build_unconditional_branch(block_select);
+
+    context.set_basic_block(block_select);
+    let result = context.builder().build_phi(context.word_type(), "result")?;
+    result.add_incoming(&[
+        (&context.word_const(0), block_origin),
+        (&calculated_value, block_calculate),
+    ]);
+    Ok(result.as_basic_value())
 }

crates/llvm-context/src/polkavm/evm/event.rs

@@ -2,183 +2,84 @@
 
 use inkwell::values::BasicValue;
 
-use crate::polkavm::context::runtime::RuntimeFunction;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
-use crate::polkavm::WriteLLVM;
-
-/// A function for emitting EVM event logs from contract code.
-pub struct EventLog<const N: usize>;
-
-impl<D, const N: usize> RuntimeFunction<D> for EventLog<N>
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = match N {
-        0 => "__revive_log_0",
-        1 => "__revive_log_1",
-        2 => "__revive_log_2",
-        3 => "__revive_log_3",
-        4 => "__revive_log_4",
-        _ => unreachable!(),
-    };
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        let mut parameter_types = vec![context.xlen_type().into(), context.xlen_type().into()];
-        parameter_types.extend_from_slice(&[context.word_type().into(); N]);
-        context.void_type().fn_type(&parameter_types, false)
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
-        let input_offset = Self::paramater(context, 0).into_int_value();
-        let input_length = Self::paramater(context, 1).into_int_value();
-        let input_pointer = context.builder().build_ptr_to_int(
-            context.build_heap_gep(input_offset, input_length)?.value,
-            context.xlen_type(),
-            "event_input_offset",
-        )?;
-
-        let arguments = if N == 0 {
-            [
-                context.xlen_type().const_zero().as_basic_value_enum(),
-                context.xlen_type().const_zero().as_basic_value_enum(),
-                input_pointer.as_basic_value_enum(),
-                input_length.as_basic_value_enum(),
-            ]
-        } else {
-            let topics_buffer_size = N * revive_common::BYTE_LENGTH_WORD;
-            let topics_buffer_pointer = context.build_alloca_at_entry(
-                context.byte_type().array_type(topics_buffer_size as u32),
-                "topics_buffer",
-            );
-
-            for n in 0..N {
-                let topic = Self::paramater(context, n + 2);
-                let topic_buffer_offset = context
-                    .xlen_type()
-                    .const_int((n * revive_common::BYTE_LENGTH_WORD) as u64, false);
-                context.build_store(
-                    context.build_gep(
-                        topics_buffer_pointer,
-                        &[context.xlen_type().const_zero(), topic_buffer_offset],
-                        context.byte_type(),
-                        &format!("topic_buffer_{N}_gep"),
-                    ),
-                    context.build_byte_swap(topic.as_basic_value_enum())?,
-                )?;
-            }
-
-            [
-                context
-                    .builder()
-                    .build_ptr_to_int(
-                        topics_buffer_pointer.value,
-                        context.xlen_type(),
-                        "event_topics_offset",
-                    )?
-                    .as_basic_value_enum(),
-                context
-                    .xlen_type()
-                    .const_int(N as u64, false)
-                    .as_basic_value_enum(),
-                input_pointer.as_basic_value_enum(),
-                input_length.as_basic_value_enum(),
-            ]
-        };
-
-        context.build_runtime_call(
-            revive_runtime_api::polkavm_imports::DEPOSIT_EVENT,
-            &arguments,
-        );
-
-        Ok(None)
-    }
-}
-
-impl<D> WriteLLVM<D> for EventLog<0>
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-impl<D> WriteLLVM<D> for EventLog<1>
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-impl<D> WriteLLVM<D> for EventLog<2>
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-impl<D> WriteLLVM<D> for EventLog<3>
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-impl<D> WriteLLVM<D> for EventLog<4>
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
 
 /// Translates a log or event call.
-pub fn log<'ctx, D, const N: usize>(
+///
+/// TODO: Splitting up into dedicated functions (log0..log4)
+/// could potentially decrease code sizes (LLVM can still decide to inline).
+/// However, passing i256 parameters is counter productive and
+/// I've found that splitting it up actualy increases code size.
+/// Should be reviewed after 64bit support.
+pub fn log<'ctx, D>(
     context: &mut Context<'ctx, D>,
     input_offset: inkwell::values::IntValue<'ctx>,
     input_length: inkwell::values::IntValue<'ctx>,
-    topics: [inkwell::values::BasicValueEnum<'ctx>; N],
+    topics: Vec<inkwell::values::IntValue<'ctx>>,
 ) -> anyhow::Result<()>
 where
     D: Dependency + Clone,
 {
-    let declaration = <EventLog<N> as RuntimeFunction<D>>::declaration(context);
+    let input_offset = context.safe_truncate_int_to_xlen(input_offset)?;
-    let mut arguments = vec![
+    let input_length = context.safe_truncate_int_to_xlen(input_length)?;
-        context.safe_truncate_int_to_xlen(input_offset)?.into(),
+    let input_pointer = context.builder().build_ptr_to_int(
-        context.safe_truncate_int_to_xlen(input_length)?.into(),
+        context.build_heap_gep(input_offset, input_length)?.value,
-    ];
+        context.xlen_type(),
-    arguments.extend_from_slice(&topics);
+        "event_input_offset",
-    context.build_call(declaration, &arguments, "log");
+    )?;
+
+    let arguments = if topics.is_empty() {
+        [
+            context.xlen_type().const_zero().as_basic_value_enum(),
+            context.xlen_type().const_zero().as_basic_value_enum(),
+            input_pointer.as_basic_value_enum(),
+            input_length.as_basic_value_enum(),
+        ]
+    } else {
+        let topics_buffer_size = topics.len() * revive_common::BYTE_LENGTH_WORD;
+        let topics_buffer_pointer = context.build_alloca(
+            context.byte_type().array_type(topics_buffer_size as u32),
+            "topics_buffer",
+        );
+
+        for (n, topic) in topics.iter().enumerate() {
+            let topic_buffer_offset = context
+                .xlen_type()
+                .const_int((n * revive_common::BYTE_LENGTH_WORD) as u64, false);
+            context.build_store(
+                context.build_gep(
+                    topics_buffer_pointer,
+                    &[context.xlen_type().const_zero(), topic_buffer_offset],
+                    context.byte_type(),
+                    "topic_buffer_gep",
+                ),
+                context.build_byte_swap(topic.as_basic_value_enum())?,
+            )?;
+        }
+
+        [
+            context
+                .builder()
+                .build_ptr_to_int(
+                    topics_buffer_pointer.value,
+                    context.xlen_type(),
+                    "event_topics_offset",
+                )?
+                .as_basic_value_enum(),
+            context
+                .xlen_type()
+                .const_int(topics.len() as u64, false)
+                .as_basic_value_enum(),
+            input_pointer.as_basic_value_enum(),
+            input_length.as_basic_value_enum(),
+        ]
+    };
+
+    let _ = context.build_runtime_call(
+        revive_runtime_api::polkavm_imports::DEPOSIT_EVENT,
+        &arguments,
+    );
+
     Ok(())
 }

crates/llvm-context/src/polkavm/evm/immutable.rs

@@ -4,206 +4,10 @@ use inkwell::types::BasicType;
 
 use crate::polkavm::context::address_space::AddressSpace;
 use crate::polkavm::context::code_type::CodeType;
+use crate::polkavm::context::function::runtime;
 use crate::polkavm::context::pointer::Pointer;
-use crate::polkavm::context::runtime::RuntimeFunction;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
-use crate::polkavm::WriteLLVM;
-
-/// A function for requesting the immutable data from the runtime.
-/// This is a special function that is only used by the front-end generated code.
-///
-/// The runtime API is called lazily and subsequent calls are no-ops.
-///
-/// The bytes written is asserted to match the expected length.
-/// This should never fail; the length is known.
-/// However, this is a one time assertion, hence worth it.
-pub struct Load;
-
-impl<D> RuntimeFunction<D> for Load
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_load_immutable_data";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.void_type().fn_type(Default::default(), false)
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
-        let immutable_data_size_pointer = context
-            .get_global(revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_SIZE)?
-            .value
-            .as_pointer_value();
-        let immutable_data_size = context.build_load(
-            Pointer::new(
-                context.xlen_type(),
-                AddressSpace::Stack,
-                immutable_data_size_pointer,
-            ),
-            "immutable_data_size_load",
-        )?;
-
-        let load_immutable_data_block = context.append_basic_block("load_immutables_block");
-        let return_block = context.current_function().borrow().return_block();
-        let immutable_data_size_is_zero = context.builder().build_int_compare(
-            inkwell::IntPredicate::EQ,
-            context.xlen_type().const_zero(),
-            immutable_data_size.into_int_value(),
-            "immutable_data_size_is_zero",
-        )?;
-        context.build_conditional_branch(
-            immutable_data_size_is_zero,
-            return_block,
-            load_immutable_data_block,
-        )?;
-
-        context.set_basic_block(load_immutable_data_block);
-        let output_pointer = context
-            .get_global(revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_POINTER)?
-            .value
-            .as_pointer_value();
-        context.build_runtime_call(
-            revive_runtime_api::polkavm_imports::GET_IMMUTABLE_DATA,
-            &[
-                context
-                    .builder()
-                    .build_ptr_to_int(output_pointer, context.xlen_type(), "ptr_to_xlen")?
-                    .into(),
-                context
-                    .builder()
-                    .build_ptr_to_int(
-                        immutable_data_size_pointer,
-                        context.xlen_type(),
-                        "ptr_to_xlen",
-                    )?
-                    .into(),
-            ],
-        );
-        let bytes_written = context.builder().build_load(
-            context.xlen_type(),
-            immutable_data_size_pointer,
-            "bytes_written",
-        )?;
-        context.builder().build_store(
-            immutable_data_size_pointer,
-            context.xlen_type().const_zero(),
-        )?;
-        let overflow_block = context.append_basic_block("immutable_data_overflow");
-        let is_overflow = context.builder().build_int_compare(
-            inkwell::IntPredicate::UGT,
-            immutable_data_size.into_int_value(),
-            bytes_written.into_int_value(),
-            "is_overflow",
-        )?;
-        context.build_conditional_branch(is_overflow, overflow_block, return_block)?;
-
-        context.set_basic_block(overflow_block);
-        context.build_call(context.intrinsics().trap, &[], "invalid_trap");
-        context.build_unreachable();
-
-        Ok(None)
-    }
-}
-
-impl<D> WriteLLVM<D> for Load
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-/// Store the immutable data from the constructor code.
-pub struct Store;
-
-impl<D> RuntimeFunction<D> for Store
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_store_immutable_data";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.void_type().fn_type(Default::default(), false)
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
-        let immutable_data_size_pointer = context
-            .get_global(revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_SIZE)?
-            .value
-            .as_pointer_value();
-        let immutable_data_size = context.build_load(
-            Pointer::new(
-                context.xlen_type(),
-                AddressSpace::Stack,
-                immutable_data_size_pointer,
-            ),
-            "immutable_data_size_load",
-        )?;
-
-        let write_immutable_data_block = context.append_basic_block("write_immutables_block");
-        let join_return_block = context.append_basic_block("join_return_block");
-        let immutable_data_size_is_zero = context.builder().build_int_compare(
-            inkwell::IntPredicate::EQ,
-            context.xlen_type().const_zero(),
-            immutable_data_size.into_int_value(),
-            "immutable_data_size_is_zero",
-        )?;
-        context.build_conditional_branch(
-            immutable_data_size_is_zero,
-            join_return_block,
-            write_immutable_data_block,
-        )?;
-
-        context.set_basic_block(write_immutable_data_block);
-        let immutable_data_pointer = context
-            .get_global(revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_POINTER)?
-            .value
-            .as_pointer_value();
-        context.build_runtime_call(
-            revive_runtime_api::polkavm_imports::SET_IMMUTABLE_DATA,
-            &[
-                context
-                    .builder()
-                    .build_ptr_to_int(
-                        immutable_data_pointer,
-                        context.xlen_type(),
-                        "immutable_data_pointer_to_xlen",
-                    )?
-                    .into(),
-                immutable_data_size,
-            ],
-        );
-        context.build_unconditional_branch(join_return_block);
-
-        context.set_basic_block(join_return_block);
-        Ok(None)
-    }
-}
-
-impl<D> WriteLLVM<D> for Store
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
 
 /// Translates the contract immutable load.
 ///
@@ -223,15 +27,14 @@ where
         }
         Some(CodeType::Deploy) => load_from_memory(context, index),
         Some(CodeType::Runtime) => {
-            let name = <Load as RuntimeFunction<D>>::NAME;
             context.build_call(
                 context
-                    .get_function(name)
+                    .get_function(runtime::FUNCTION_LOAD_IMMUTABLE_DATA)
                     .expect("is always declared for runtime code")
                     .borrow()
                     .declaration(),
                 &[],
-                name,
+                runtime::FUNCTION_LOAD_IMMUTABLE_DATA,
             );
             load_from_memory(context, index)
         }

crates/llvm-context/src/polkavm/evm/memory.rs

@@ -85,14 +85,5 @@ where
         offset,
         "mstore8_destination",
     );
-    let pointer = context.build_sbrk(
+    context.build_store(pointer, value)
-        pointer.to_int(context),
-        context.xlen_type().const_int(1, false),
-    )?;
-    context
-        .builder()
-        .build_store(pointer, value)?
-        .set_alignment(revive_common::BYTE_LENGTH_BYTE as u32)
-        .expect("Alignment is valid");
-    Ok(())
 }

crates/llvm-context/src/polkavm/evm/return.rs

@@ -1,9 +1,9 @@
 //! Translates the transaction return operations.
 
+use crate::polkavm::context::address_space::AddressSpace;
 use crate::polkavm::context::code_type::CodeType;
-use crate::polkavm::context::runtime::RuntimeFunction;
+use crate::polkavm::context::pointer::Pointer;
 use crate::polkavm::context::Context;
-use crate::polkavm::evm::immutable::Store;
 use crate::polkavm::Dependency;
 
 /// Translates the `return` instruction.
@@ -18,11 +18,55 @@ where
     match context.code_type() {
         None => anyhow::bail!("Return is not available if the contract part is undefined"),
         Some(CodeType::Deploy) => {
-            context.build_call(
+            let immutable_data_size_pointer = context
-                <Store as RuntimeFunction<D>>::declaration(context),
+                .get_global(revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_SIZE)?
-                Default::default(),
+                .value
-                "store_immutable_data",
+                .as_pointer_value();
+            let immutable_data_size = context.build_load(
+                Pointer::new(
+                    context.xlen_type(),
+                    AddressSpace::Stack,
+                    immutable_data_size_pointer,
+                ),
+                "immutable_data_size_load",
+            )?;
+
+            let write_immutable_data_block = context.append_basic_block("write_immutables_block");
+            let join_return_block = context.append_basic_block("join_return_block");
+            let immutable_data_size_is_zero = context.builder().build_int_compare(
+                inkwell::IntPredicate::EQ,
+                context.xlen_type().const_zero(),
+                immutable_data_size.into_int_value(),
+                "immutable_data_size_is_zero",
+            )?;
+            context.build_conditional_branch(
+                immutable_data_size_is_zero,
+                join_return_block,
+                write_immutable_data_block,
+            )?;
+
+            context.set_basic_block(write_immutable_data_block);
+            let immutable_data_pointer = context
+                .get_global(revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_POINTER)?
+                .value
+                .as_pointer_value();
+            context.build_runtime_call(
+                revive_runtime_api::polkavm_imports::SET_IMMUTABLE_DATA,
+                &[
+                    context
+                        .builder()
+                        .build_ptr_to_int(
+                            immutable_data_pointer,
+                            context.xlen_type(),
+                            "immutable_data_pointer_to_xlen",
+                        )?
+                        .into(),
+                    immutable_data_size,
+                ],
             );
+            context.build_unconditional_branch(join_return_block);
+
+            context.set_basic_block(join_return_block);
         }
         Some(CodeType::Runtime) => {}
     }
@@ -56,7 +100,11 @@ pub fn stop<D>(context: &mut Context<D>) -> anyhow::Result<()>
 where
     D: Dependency + Clone,
 {
-    r#return(context, context.word_const(0), context.word_const(0))
+    r#return(
+        context,
+        context.integer_const(crate::polkavm::XLEN, 0),
+        context.integer_const(crate::polkavm::XLEN, 0),
+    )
 }
 
 /// Translates the `invalid` instruction.

crates/llvm-context/src/polkavm/evm/storage.rs

@@ -1,10 +1,8 @@
 //! Translates the storage operations.
 
-use crate::polkavm::context::runtime::RuntimeFunction;
+use crate::polkavm::context::address_space::AddressSpace;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
-use crate::PolkaVMLoadStorageWordFunction;
-use crate::PolkaVMStoreStorageWordFunction;
 
 /// Translates the storage load.
 pub fn load<'ctx, D>(
@@ -14,12 +12,10 @@ pub fn load<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::NAME;
+    let mut slot_ptr = context.build_alloca_at_entry(context.word_type(), "slot_pointer");
-    let declaration = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::declaration(context);
+    slot_ptr.address_space = AddressSpace::Storage;
-    let arguments = [context.xlen_type().const_zero().into(), position.into()];
+    context.builder().build_store(slot_ptr.value, position)?;
-    Ok(context
+    context.build_load(slot_ptr, "storage_load_value")
-        .build_call(declaration, &arguments, "storage_load")
-        .unwrap_or_else(|| panic!("runtime function {name} should return a value")))
 }
 
 /// Translates the storage store.
@@ -31,13 +27,10 @@ pub fn store<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let declaration = <PolkaVMStoreStorageWordFunction as RuntimeFunction<D>>::declaration(context);
+    let mut slot_ptr = context.build_alloca_at_entry(context.word_type(), "slot_pointer");
-    let arguments = [
+    slot_ptr.address_space = AddressSpace::Storage;
-        context.xlen_type().const_zero().into(),
+    context.builder().build_store(slot_ptr.value, position)?;
-        position.into(),
+    context.build_store(slot_ptr, value)?;
-        value.into(),
-    ];
-    context.build_call(declaration, &arguments, "storage_store");
     Ok(())
 }
 
@@ -49,15 +42,10 @@ pub fn transient_load<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::NAME;
+    let mut slot_ptr = context.build_alloca_at_entry(context.word_type(), "slot_pointer");
-    let declaration = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::declaration(context);
+    slot_ptr.address_space = AddressSpace::TransientStorage;
-    let arguments = [
+    context.builder().build_store(slot_ptr.value, position)?;
-        context.xlen_type().const_int(1, false).into(),
+    context.build_load(slot_ptr, "transient_storage_load_value")
-        position.into(),
-    ];
-    Ok(context
-        .build_call(declaration, &arguments, "storage_load")
-        .unwrap_or_else(|| panic!("runtime function {name} should return a value")))
 }
 
 /// Translates the transient storage store.
@@ -69,12 +57,9 @@ pub fn transient_store<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let declaration = <PolkaVMStoreStorageWordFunction as RuntimeFunction<D>>::declaration(context);
+    let mut slot_ptr = context.build_alloca_at_entry(context.word_type(), "slot_pointer");
-    let arguments = [
+    slot_ptr.address_space = AddressSpace::TransientStorage;
-        context.xlen_type().const_int(1, false).into(),
+    context.builder().build_store(slot_ptr.value, position)?;
-        position.into(),
+    context.build_store(slot_ptr, value)?;
-        value.into(),
-    ];
-    context.build_call(declaration, &arguments, "storage_store");
     Ok(())
 }

crates/runner/Cargo.toml

@@ -34,4 +34,3 @@ polkadot-sdk.features = [
 
 revive-solidity = { workspace = true, optional = true }
 revive-differential = { workspace = true, optional = true }
-revive-llvm-context = { workspace = true }

crates/runner/src/lib.rs

@@ -274,7 +274,6 @@ impl From<Code> for pallet_revive::Code {
                     &contract,
                     &source_code,
                     solc_optimizer.unwrap_or(true),
-                    revive_llvm_context::OptimizerSettings::cycles(),
                 ))
             }
             Code::Path(path) => pallet_revive::Code::Upload(std::fs::read(path).unwrap()),

crates/runtime-api/src/polkavm_imports.c

@@ -8,23 +8,27 @@
 #define EVM_WORD_SIZE 32
 #define ALIGN(size) ((size + EVM_WORD_SIZE - 1) & ~(EVM_WORD_SIZE - 1))
 #define MAX_MEMORY_SIZE (64 * 1024)
-char __memory[MAX_MEMORY_SIZE];
+static char __memory[MAX_MEMORY_SIZE];
-uint32_t __memory_size = 0;
+static uint32_t __memory_size = 0;
 
-void * __sbrk_internal(uint32_t offset, uint32_t size) {
+void *  __sbrk_internal(uint32_t offset, uint32_t size) {
     if (offset >= MAX_MEMORY_SIZE || size > MAX_MEMORY_SIZE) {
-        POLKAVM_TRAP();
+        return NULL;
     }
 
     uint32_t new_size = ALIGN(offset + size);
     if (new_size > MAX_MEMORY_SIZE) {
-        POLKAVM_TRAP();
+        return NULL;
     }
     if (new_size > __memory_size) {
         __memory_size = new_size;
     }
 
-    return (void *)&__memory[offset];
+    return (void *)&__memory[__memory_size];
+}
+
+uint32_t __msize() {
+    return __memory_size;
 }
 
 void * memset(void *b, int c, size_t len) {

crates/runtime-api/src/polkavm_imports.rs

@@ -1,15 +1,19 @@
+//! This crate vendors the [PolkaVM][0] C API and provides a LLVM module for interacting
+//! with the `pallet-revive` runtime API.
+//! At present, the revive pallet requires blobs to export `call` and `deploy`,
+//! and offers a bunch of [runtime API methods][1]. The provided [module] implements
+//! those exports and imports.
+//! [0]: [https://crates.io/crates/polkavm]
+//! [1]: [https://docs.rs/pallet-contracts/26.0.0/pallet_contracts/api_doc/index.html]
+
 use inkwell::{context::Context, memory_buffer::MemoryBuffer, module::Module, support::LLVMString};
 
 include!(concat!(env!("OUT_DIR"), "/polkavm_imports.rs"));
 
-/// The emulated EVM heap memory global symbol.
-pub static MEMORY: &str = "__memory";
-
-/// The emulated EVM heap memory size global symbol.
-pub static MEMORY_SIZE: &str = "__memory_size";
-
 pub static SBRK: &str = "__sbrk_internal";
 
+pub static MEMORY_SIZE: &str = "__msize";
+
 pub static ADDRESS: &str = "address";
 
 pub static BALANCE: &str = "balance";
@@ -78,8 +82,9 @@ pub static WEIGHT_TO_FEE: &str = "weight_to_fee";
 
 /// All imported runtime API symbols.
 /// Useful for configuring common attributes and linkage.
-pub static IMPORTS: [&str; 34] = [
+pub static IMPORTS: [&str; 35] = [
     SBRK,
+    MEMORY_SIZE,
     ADDRESS,
     BALANCE,
     BALANCE_OF,

crates/solidity/src/solc/standard_json/input/settings/selection/file/flag.rs

@@ -40,9 +40,6 @@ pub enum Flag {
     /// The assembly code
     #[serde(rename = "evm.assembly")]
     Assembly,
-    /// The Ir
-    #[serde(rename = "ir")]
-    Ir,
 }
 
 impl std::fmt::Display for Flag {
@@ -60,7 +57,6 @@ impl std::fmt::Display for Flag {
             Self::EVMBC => write!(f, "evm.bytecode"),
             Self::EVMDBC => write!(f, "evm.deployedBytecode"),
             Self::Assembly => write!(f, "evm.assembly"),
-            Self::Ir => write!(f, "ir"),
         }
     }
 }

crates/solidity/src/solc/standard_json/input/settings/selection/file/mod.rs

@@ -10,7 +10,7 @@ use serde::Serialize;
 use self::flag::Flag as SelectionFlag;
 
 /// The `solc --standard-json` output file selection.
-#[derive(Debug, Default, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Default, Serialize, Deserialize)]
 pub struct File {
     /// The per-file output selections.
     #[serde(rename = "", skip_serializing_if = "Option::is_none")]
@@ -45,7 +45,6 @@ impl File {
         self.per_contract
             .get_or_insert_with(HashSet::default)
             .extend(required.per_contract.unwrap_or_default());
-
         self
     }
 }

crates/solidity/src/solc/standard_json/input/settings/selection/mod.rs

@@ -2,22 +2,17 @@
 
 pub mod file;
 
-use std::collections::BTreeMap;
-
 use serde::Deserialize;
 use serde::Serialize;
 
 use self::file::File as FileSelection;
 
 /// The `solc --standard-json` output selection.
-#[derive(Debug, Serialize, Deserialize, Default, PartialEq)]
+#[derive(Debug, Default, Serialize, Deserialize)]
 pub struct Selection {
     /// Only the 'all' wildcard is available for robustness reasons.
     #[serde(rename = "*", skip_serializing_if = "Option::is_none")]
-    all: Option<FileSelection>,
+    pub all: Option<FileSelection>,
-
-    #[serde(skip_serializing_if = "BTreeMap::is_empty", flatten)]
-    pub files: BTreeMap<String, FileSelection>,
 }
 
 impl Selection {
@@ -25,7 +20,6 @@ impl Selection {
     pub fn new_required() -> Self {
         Self {
             all: Some(FileSelection::new_required()),
-            files: BTreeMap::new(),
         }
     }
 
@@ -34,66 +28,6 @@ impl Selection {
         self.all
             .get_or_insert_with(FileSelection::new_required)
             .extend_with_required();
-        for (_, v) in self.files.iter_mut() {
-            v.extend_with_required();
-        }
         self
     }
 }
-
-#[cfg(test)]
-mod test {
-    use std::collections::BTreeMap;
-
-    use crate::SolcStandardJsonInputSettingsSelectionFile;
-
-    use super::Selection;
-
-    #[test]
-    fn per_file() {
-        let init = Selection {
-            all: None,
-            files: BTreeMap::from([(
-                "Test".to_owned(),
-                SolcStandardJsonInputSettingsSelectionFile::new_required(),
-            )]),
-        };
-
-        let deser = serde_json::to_string(&init)
-            .and_then(|string| serde_json::from_str(&string))
-            .unwrap();
-
-        assert_eq!(init, deser)
-    }
-
-    #[test]
-    fn all() {
-        let init = Selection {
-            all: Some(SolcStandardJsonInputSettingsSelectionFile::new_required()),
-            files: BTreeMap::new(),
-        };
-
-        let deser = serde_json::to_string(&init)
-            .and_then(|string| serde_json::from_str(&string))
-            .unwrap();
-
-        assert_eq!(init, deser)
-    }
-
-    #[test]
-    fn all_and_override() {
-        let init = Selection {
-            all: Some(SolcStandardJsonInputSettingsSelectionFile::new_required()),
-            files: BTreeMap::from([(
-                "Test".to_owned(),
-                SolcStandardJsonInputSettingsSelectionFile::new_required(),
-            )]),
-        };
-
-        let deser = serde_json::to_string(&init)
-            .and_then(|string| serde_json::from_str(&string))
-            .unwrap();
-
-        assert_eq!(init, deser)
-    }
-}

crates/solidity/src/solc/standard_json/output/contract/mod.rs

@@ -32,9 +32,6 @@ pub struct Contract {
     /// Contract's bytecode and related objects
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub evm: Option<EVM>,
-    /// The contract IR code.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub ir: Option<String>,
     /// The contract optimized IR code.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub ir_optimized: Option<String>,

crates/solidity/src/test_utils.rs

@@ -6,7 +6,6 @@ use std::path::PathBuf;
 use std::sync::Mutex;
 
 use once_cell::sync::Lazy;
-use revive_llvm_context::OptimizerSettings;
 
 use crate::project::Project;
 use crate::solc::solc_compiler::SolcCompiler;
@@ -32,7 +31,6 @@ struct CachedBlob {
     contract_name: String,
     solidity: String,
     solc_optimizer_enabled: bool,
-    opt: String,
 }
 
 /// Checks if the required executables are present in `${PATH}`.
@@ -256,12 +254,7 @@ pub fn check_solidity_warning(
 /// Compile the blob of `contract_name` found in given `source_code`.
 /// The `solc` optimizer will be enabled
 pub fn compile_blob(contract_name: &str, source_code: &str) -> Vec<u8> {
-    compile_blob_with_options(
+    compile_blob_with_options(contract_name, source_code, true)
-        contract_name,
-        source_code,
-        true,
-        OptimizerSettings::cycles(),
-    )
 }
 
 /// Compile the EVM bin-runtime of `contract_name` found in given `source_code`.
@@ -290,7 +283,6 @@ fn compile_evm(
         contract_name: contract_name.to_owned(),
         solidity: source_code.to_owned(),
         solc_optimizer_enabled,
-        opt: String::new(),
     };
 
     let cache = if runtime {
@@ -330,13 +322,11 @@ pub fn compile_blob_with_options(
     contract_name: &str,
     source_code: &str,
     solc_optimizer_enabled: bool,
-    optimizer_settings: revive_llvm_context::OptimizerSettings,
 ) -> Vec<u8> {
     let id = CachedBlob {
         contract_name: contract_name.to_owned(),
         solidity: source_code.to_owned(),
         solc_optimizer_enabled,
-        opt: optimizer_settings.middle_end_as_string(),
     };
 
     if let Some(blob) = PVM_BLOB_CACHE.lock().unwrap().get(&id) {
@@ -348,7 +338,7 @@ pub fn compile_blob_with_options(
         [(file_name.into(), source_code.into())].into(),
         Default::default(),
         None,
-        optimizer_settings,
+        revive_llvm_context::OptimizerSettings::cycles(),
         solc_optimizer_enabled,
     )
     .expect("source should compile")

crates/solidity/src/tests/cli-tests/package.json

@@ -16,11 +16,11 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@types/jest": "^29.5.14",
+    "@types/jest": "^29.5.11",
     "@types/shelljs": "^0.8.15",
     "jest": "^29.7.0",
     "shelljs": "^0.8.5",
-    "ts-jest": "^29.2.5",
+    "ts-jest": "^29.1.1",
-    "typescript": "^5.7.3"
+    "typescript": "^5.3.3"
   }
 }

crates/solidity/src/yul/parser/statement/expression/function_call/mod.rs

@@ -672,7 +672,7 @@ impl FunctionCall {
                     context,
                     arguments[0].into_int_value(),
                     arguments[1].into_int_value(),
-                    [],
+                    vec![],
                 )
                 .map(|_| None)
             }
@@ -682,7 +682,10 @@ impl FunctionCall {
                     context,
                     arguments[0].into_int_value(),
                     arguments[1].into_int_value(),
-                    [arguments[2]],
+                    arguments[2..]
+                        .iter()
+                        .map(|argument| argument.into_int_value())
+                        .collect(),
                 )
                 .map(|_| None)
             }
@@ -692,7 +695,10 @@ impl FunctionCall {
                     context,
                     arguments[0].into_int_value(),
                     arguments[1].into_int_value(),
-                    [arguments[2], arguments[3]],
+                    arguments[2..]
+                        .iter()
+                        .map(|argument| argument.into_int_value())
+                        .collect(),
                 )
                 .map(|_| None)
             }
@@ -702,7 +708,10 @@ impl FunctionCall {
                     context,
                     arguments[0].into_int_value(),
                     arguments[1].into_int_value(),
-                    [arguments[2], arguments[3], arguments[4]],
+                    arguments[2..]
+                        .iter()
+                        .map(|argument| argument.into_int_value())
+                        .collect(),
                 )
                 .map(|_| None)
             }
@@ -712,7 +721,10 @@ impl FunctionCall {
                     context,
                     arguments[0].into_int_value(),
                     arguments[1].into_int_value(),
-                    [arguments[2], arguments[3], arguments[4], arguments[5]],
+                    arguments[2..]
+                        .iter()
+                        .map(|argument| argument.into_int_value())
+                        .collect(),
                 )
                 .map(|_| None)
             }
@@ -931,7 +943,7 @@ impl FunctionCall {
             Name::BlobHash => {
                 let _arguments = self.pop_arguments_llvm::<D, 1>(context)?;
                 anyhow::bail!(
-                    "{} The `BLOBHASH` instruction is not supported in revive",
+                    "{} The `BLOBHASH` instruction is not supported until zkVM v1.5.0",
                     location
                 );
             }
@@ -946,7 +958,7 @@ impl FunctionCall {
             }
             Name::BlobBaseFee => {
                 anyhow::bail!(
-                    "{} The `BLOBBASEFEE` instruction is not supported in revive",
+                    "{} The `BLOBBASEFEE` instruction is not supported until zkVM v1.5.0",
                     location
                 );
             }

crates/solidity/src/yul/parser/statement/function_definition.rs

@@ -216,7 +216,7 @@ where
         revive_llvm_context::PolkaVMFunction::set_attributes(
             context.llvm(),
             function.borrow().declaration(),
-            &self.attributes.clone().into_iter().collect::<Vec<_>>(),
+            self.attributes.clone().into_iter().collect(),
             true,
         );
         function

crates/solidity/src/yul/parser/statement/object.rs

@@ -185,28 +185,7 @@ where
         &mut self,
         context: &mut revive_llvm_context::PolkaVMContext<D>,
     ) -> anyhow::Result<()> {
-        revive_llvm_context::PolkaVMLoadImmutableDataFunction.declare(context)?;
+        revive_llvm_context::PolkaVMImmutableDataLoadFunction.declare(context)?;
-        revive_llvm_context::PolkaVMStoreImmutableDataFunction.declare(context)?;
-
-        revive_llvm_context::PolkaVMLoadHeapWordFunction.declare(context)?;
-        revive_llvm_context::PolkaVMStoreHeapWordFunction.declare(context)?;
-        revive_llvm_context::PolkaVMLoadStorageWordFunction.declare(context)?;
-        revive_llvm_context::PolkaVMStoreStorageWordFunction.declare(context)?;
-
-        revive_llvm_context::PolkaVMWordToPointerFunction.declare(context)?;
-        revive_llvm_context::PolkaVMExitFunction.declare(context)?;
-
-        revive_llvm_context::PolkaVMEventLogFunction::<0>.declare(context)?;
-        revive_llvm_context::PolkaVMEventLogFunction::<1>.declare(context)?;
-        revive_llvm_context::PolkaVMEventLogFunction::<2>.declare(context)?;
-        revive_llvm_context::PolkaVMEventLogFunction::<3>.declare(context)?;
-        revive_llvm_context::PolkaVMEventLogFunction::<4>.declare(context)?;
-
-        revive_llvm_context::PolkaVMDivisionFunction.declare(context)?;
-        revive_llvm_context::PolkaVMSignedDivisionFunction.declare(context)?;
-        revive_llvm_context::PolkaVMRemainderFunction.declare(context)?;
-        revive_llvm_context::PolkaVMSignedRemainderFunction.declare(context)?;
-
         let mut entry = revive_llvm_context::PolkaVMEntryFunction::default();
         entry.declare(context)?;
 
@@ -223,6 +202,7 @@ where
             revive_llvm_context::PolkaVMFunctionDeployCode,
             revive_llvm_context::PolkaVMFunctionRuntimeCode,
             revive_llvm_context::PolkaVMFunctionEntry,
+            revive_llvm_context::PolkaVMFunctionImmutableDataLoad,
         ]
         .into_iter()
         {
@@ -235,28 +215,6 @@ where
 
         entry.into_llvm(context)?;
 
-        revive_llvm_context::PolkaVMLoadImmutableDataFunction.into_llvm(context)?;
-        revive_llvm_context::PolkaVMStoreImmutableDataFunction.into_llvm(context)?;
-
-        revive_llvm_context::PolkaVMLoadHeapWordFunction.into_llvm(context)?;
-        revive_llvm_context::PolkaVMStoreHeapWordFunction.into_llvm(context)?;
-        revive_llvm_context::PolkaVMLoadStorageWordFunction.into_llvm(context)?;
-        revive_llvm_context::PolkaVMStoreStorageWordFunction.into_llvm(context)?;
-
-        revive_llvm_context::PolkaVMWordToPointerFunction.into_llvm(context)?;
-        revive_llvm_context::PolkaVMExitFunction.into_llvm(context)?;
-
-        revive_llvm_context::PolkaVMEventLogFunction::<0>.into_llvm(context)?;
-        revive_llvm_context::PolkaVMEventLogFunction::<1>.into_llvm(context)?;
-        revive_llvm_context::PolkaVMEventLogFunction::<2>.into_llvm(context)?;
-        revive_llvm_context::PolkaVMEventLogFunction::<3>.into_llvm(context)?;
-        revive_llvm_context::PolkaVMEventLogFunction::<4>.into_llvm(context)?;
-
-        revive_llvm_context::PolkaVMDivisionFunction.into_llvm(context)?;
-        revive_llvm_context::PolkaVMSignedDivisionFunction.into_llvm(context)?;
-        revive_llvm_context::PolkaVMRemainderFunction.into_llvm(context)?;
-        revive_llvm_context::PolkaVMSignedRemainderFunction.into_llvm(context)?;
-
         Ok(())
     }
 
@@ -272,6 +230,7 @@ where
         }
 
         if self.identifier.ends_with("_deployed") {
+            revive_llvm_context::PolkaVMImmutableDataLoadFunction.into_llvm(context)?;
             revive_llvm_context::PolkaVMRuntimeCodeFunction::new(self.code).into_llvm(context)?;
         } else {
             revive_llvm_context::PolkaVMDeployCodeFunction::new(self.code).into_llvm(context)?;

package.json

@@ -3,7 +3,7 @@
     "private": true,
     "scripts": {
         "test:cli": "npm run test -w crates/solidity/src/tests/cli-tests",
-        "test:wasm": "npm run test:node -w js",
+        "test:wasm": "npm run test:all -w js",
         "build:package": "npm run build:package -w js"
     },
     "workspaces": [