Release Windows Version (#251)

With LLVM working only minor changes were necessary to get resolc
running on Windows.

Release in my branch here:
https://github.com/paritytech/revive-alex-workflowtest/releases/tag/v0.1.0-dev.12

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

@@ -0,0 +1,19 @@
+name: "Get Emscripten SDK"
+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

@@ -0,0 +1,70 @@
+# example:
+#       - uses: ./.github/actions/get-llvm
+#         with:
+#           target: x86_64-unknown-linux-gnu
+
+name: "Download LLVM"
+inputs:
+  target:
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: find asset
+      id: find
+      uses: actions/github-script@v7
+      env:
+        target: ${{ inputs.target }}
+      with:
+        result-encoding: string
+        script: |
+          let page = 1;
+          let releases = [];
+
+          let releasePrefix = "llvm-"
+          let target = process.env.target
+
+          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(target);
+                });
+                if (!asset){
+                  core.setFailed(`Artifact for '${target}' 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: |
+        curl -sSLo llvm.tar.gz ${{ steps.find.outputs.result }}
+
+    - name: unpack
+      shell: bash
+      run: |
+        tar -xf llvm.tar.gz
+        rm llvm.tar.gz

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

@@ -0,0 +1,35 @@
+name: "Install Solidity Compiler"
+
+runs:
+  using: "composite"
+  steps:
+    - name: Figure out Solc Download URL
+      shell: bash
+      run: |
+        if [[ "${{ runner.os }}" == "Linux" ]]; then
+          echo "SOLC_NAME=solc-static-linux" >> $GITHUB_ENV
+        elif [[ "${{ runner.os }}" == "Windows" ]]; then
+          echo "SOLC_NAME=solc-windows.exe" >> $GITHUB_ENV
+        else
+          echo "SOLC_NAME=solc-macos" >> $GITHUB_ENV
+        fi
+
+    - name: Download Solc
+      shell: bash
+      run: |
+        mkdir -p solc
+        curl -sSL --output solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.28/${SOLC_NAME}
+
+    - name: Make Solc Executable
+      if: ${{ runner.os == 'Windows' }}
+      shell: bash
+      run: |
+        echo "$(pwd -W)\\solc" >> $GITHUB_PATH
+        mv solc/solc solc/solc.exe
+
+    - name: Make Solc Executable
+      if: ${{ runner.os != 'Windows' }}
+      shell: bash
+      run: |
+        echo "$(pwd)/solc" >> $GITHUB_PATH
+        chmod +x solc/solc

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

@@ -1,127 +0,0 @@
-name: Build revive-wasm
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["main"]
-  workflow_dispatch:
-
-env:
-  CARGO_TERM_COLOR: always
-  REVIVE_WASM_INSTALL_DIR: ${{ github.workspace }}/target/wasm32-unknown-emscripten/release
-
-jobs:
-  build-revive-wasm:
-    runs-on: parity-large
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Cache LLVM build
-        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
-
-      - name: Install LLVM build dependencies
-        run: |
-          make install-llvm-builder
-          revive-llvm --target-env emscripten clone
-
-      - 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
-          rustup +nightly show
-          cargo +nightly --version
-          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
-          make install-wasm
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: revive-wasm
-          path: |
-            ${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc.js
-            ${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc.wasm
-            ${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc_web.js
-          retention-days: 1
-
-  test-revive-wasm:
-    needs: build-revive-wasm
-    strategy:
-      matrix:
-        os: ["ubuntu-24.04", "macos-14", "windows-2022"]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Create Target Directory
-        run: mkdir -p ${{ env.REVIVE_WASM_INSTALL_DIR }}
-
-      - name: Download Artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: revive-wasm
-          path: ${{ env.REVIVE_WASM_INSTALL_DIR }}
-
-      - name: Set Up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: "20"
-
-      - name: Install packages
-        run: npm install
-
-      - name: Run Playwright tests
-        run: |
-          cd js
-          npx playwright install --with-deps
-          npx playwright test
-
-      - name: Test revive
-        run: |
-          echo "Running tests for ${{ matrix.os }}"
-          npm run test:wasm

.github/workflows/get-release-artifact.js

@@ -1,36 +0,0 @@
-module.exports = async ({
-  octokit,
-  context,
-  releasePrefix,
-  artifactSuffix,
-}) => {
-  let page = 1;
-
-  while (true) {
-    const res = await octokit.rest.repos.listReleases({
-      owner: context.repo.owner,
-      repo: context.repo.repo,
-      per_page: 100,
-      page,
-    });
-    if (res.data.length === 0) {
-      throw new Error(
-        `No LLVM releases with '${artifactSuffix}' atifacts found! Please release LLVM before running this workflow.`,
-      );
-    }
-
-    for (let release of res.data) {
-      if (release.tag_name.startsWith(releasePrefix)) {
-        for (let asset of release.assets) {
-          if (asset.name.includes(artifactSuffix)) {
-            return asset.browser_download_url;
-          }
-        }
-        console.warn(
-          `LLVM release ${release.tag_name} doesn't have a '${artifactSuffix}' artifact; searching for older releases...`,
-        );
-      }
-    }
-    page++;
-  }
-};

.github/workflows/release-llvm.yml

@@ -1,5 +1,4 @@
 name: Release LLVM
-
 on:
   workflow_dispatch:
     inputs:
@@ -8,12 +7,16 @@ on:
         required: true
         description: llvm version in "x.x.x" format, e.g. "18.1.8"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  create-release:
+  create-release-draft:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       contents: write
     outputs:
@@ -23,145 +26,107 @@ jobs:
         run: |
           echo "version=llvm-${{ inputs.llvm_version }}-revive.${GITHUB_SHA:0:7}" >> $GITHUB_OUTPUT
 
-      - name: create release
+      - name: Create Release
         uses: softprops/action-gh-release@v2
         with:
-          name: "LLVM binaries release: ${{ steps.resolve-version.outputs.version }}"
+          name: ${{ steps.resolve-version.outputs.version }}
-          body: "This release includes binaries of LLVM, used to compile revive itself"
+          body: "LLVM is a dependency of revive. The LLVM releases are used by our CI to build revive."
-          make_latest: "false"
+          draft: true
           tag_name: ${{ steps.resolve-version.outputs.version }}
 
-  build-macos:
+  build:
     strategy:
       matrix:
-        os: [macos-14, macos-13]
+        target: [x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl, wasm32-unknown-emscripten, aarch64-apple-darwin, x86_64-apple-darwin, x86_64-pc-windows-msvc]
         include:
-          - os: macos-13
+          - target: x86_64-unknown-linux-gnu
-            arch: x64
+            builder-arg: gnu
-          - os: macos-14
+            host: linux
-            arch: arm64
+            runner: parity-large
-    needs: create-release
+          - target: x86_64-unknown-linux-musl
-    runs-on: ${{ matrix.os }}
+            builder-arg: musl
-    name: "build-macos-${{ matrix.arch }}"
+            host: linux
+            runner: parity-large
+          - target: wasm32-unknown-emscripten
+            builder-arg: emscripten
+            host: linux
+            runner: parity-large
+          - target: aarch64-apple-darwin
+            builder-arg: gnu
+            host: macos
+            runner: macos-14
+          - target: x86_64-apple-darwin
+            builder-arg: gnu
+            host: macos
+            runner: macos-13
+          - target: x86_64-pc-windows-msvc
+            builder-arg: gnu
+            host: windows
+            runner: windows-2022
+    needs: create-release-draft
+    runs-on: ${{ matrix.runner }}
     env:
       RUST_LOG: trace
     permissions:
       contents: write # for uploading assets to release
     steps:
       - uses: actions/checkout@v4
-
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
-      - 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"
+          # without this it will override our rust flags
-          tag_name: ${{ needs.create-release.outputs.version }}
+          rustflags: ""
-          files: |
+          cache-key: ${{ matrix.target }}
-            ${{ needs.create-release.outputs.version }}-macos-${{ matrix.arch }}.tar.gz
 
-
+      - name: Install Dependencies
-  build-linux-all:
+        if: ${{ matrix.host == 'linux' }}
-    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
+      - name: Install Dependencies
-        with:
+        if: ${{ matrix.host == 'macos' }}
-          toolchain: stable
-          components: rust-src
-          target: wasm32-unknown-emscripten
-          rustflags: ""
-
-      - name: versions
         run: |
-          rustup show
+          brew install ninja
-          cargo --version
-          cmake --version
-          echo "bash:" && bash --version
-          echo "ninja:" && ninja --version
-          echo "clang:" && clang --version
 
-      - name: Build host LLVM
+      - name: Install LLVM Builder
         run: |
-          make install-llvm
+          cargo install --path crates/llvm-builder
 
-      - name: Build gnu LLVM
+      - name: Clone LLVM
         run: |
-          revive-llvm clone
+          revive-llvm --target-env ${{ matrix.builder-arg }} clone
-          revive-llvm build --llvm-projects lld --llvm-projects clang
 
-      - name: Build musl LLVM
+      - name: Build LLVM
+        if: ${{ matrix.target != 'wasm32-unknown-emscripten' }}
         run: |
-          revive-llvm --target-env musl build --llvm-projects lld --llvm-projects clang
+          revive-llvm --target-env ${{ matrix.builder-arg }} build --llvm-projects lld --llvm-projects clang
 
-      - name: Build emscripten LLVM
+      - name: Build LLVM
+        if: ${{ matrix.target == 'wasm32-unknown-emscripten' }}
         run: |
-          revive-llvm --target-env emscripten clone
           source emsdk/emsdk_env.sh
-          revive-llvm --target-env emscripten build --llvm-projects lld
+          revive-llvm --target-env ${{ matrix.builder-arg }} build --llvm-projects lld
 
-      - name: clean
+      - name: Remove Unnecessary Binaries
-        # check removed files
+        shell: bash
         run: |
-          for target in gnu emscripten musl; do
+          cd target-llvm/${{ matrix.builder-arg }}/target-final/bin/
-            cd target-llvm/${target}/target-final/bin/
+          rm -f diagtool* llvm-libtool-darwin* llvm-lipo* llvm-pdbutil* llvm-dwarfdump* llvm-nm* llvm-readobj* llvm-cfi-verify* \
-            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* \
-               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* \
-               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* \
-               llvm-reduce llvm-lto clang-linker-wrapper llc llvm-lto2 llvm-otool llvm-readelf
+              clang-repl* clang-check* clang-scan-deps*
-            cd -
+          cd -
-          done
 
-      - name: package artifacts
+      - name: Package Artifact
+        shell: bash
         run: |
-          tar -czf "${{ needs.create-release.outputs.version }}-x86_64-linux-gnu-linux.tar.gz" target-llvm/gnu/target-final
+          mv target-llvm/${{ matrix.builder-arg }}/target-final/ llvm-${{ matrix.target }}
-          tar -czf "${{ needs.create-release.outputs.version }}-x86_64-linux-musl.tar.gz" target-llvm/musl/target-final
+          tar -czf "${{ needs.create-release-draft.outputs.version }}-${{ matrix.target }}.tar.gz" llvm-${{ matrix.target }}
-          tar -czf "${{ needs.create-release.outputs.version }}-wasm32-unknown-emscripten.tar.gz" target-llvm/emscripten/target-final
 
-      - name: upload archive to release
+      - name: Add Artifact to Release
         uses: softprops/action-gh-release@v2
         with:
-          make_latest: "false"
+          tag_name: ${{ needs.create-release-draft.outputs.version }}
-          tag_name: ${{ needs.create-release.outputs.version }}
+          draft: true
           files: |
-            ${{ needs.create-release.outputs.version }}-x86_64-linux-gnu-linux.tar.gz
+            ${{ needs.create-release-draft.outputs.version }}-${{ matrix.target }}.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,21 +1,23 @@
 name: Release
-run-name: Release ${{ github.ref_name }}
 on:
   push:
-    branches:
+    branches: ["main"]
-      - "main"
+  pull_request:
+    branches: ["main"]
+    types: [opened, synchronize, labled, unlabled]
+  workflow_dispatch:
 
 concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 env:
-  #rust-musl-cross:x86_64-musl
+  CARGO_TERM_COLOR: always
   RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:68b86bc7cb2867259e6b233415a665ff4469c28b57763e78c3bfea1c68091561
-  RUST_LOG: trace
 
 jobs:
-  tag:
+  check-version-changed:
+    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'release-test')
     runs-on: ubuntu-24.04
     permissions:
       contents: write
@@ -24,13 +26,11 @@ jobs:
       PKG_VER: ${{ steps.versions.outputs.PKG_VER }}
       RELEASE_NOTES: ${{ steps.versions.outputs.RELEASE_NOTES }}
     steps:
-      - name: Checkout
+      - uses: actions/checkout@v4
-        uses: actions/checkout@v4
         with:
-          fetch-tags: "true"
+          fetch-tags: true
-          fetch-depth: 0
 
-      - name: Versions
+      - name: Check Versions
         id: versions
         run: |
           export CURRENT_TAG=$(git describe --tags --abbrev=0 --exclude "llvm-*")
@@ -48,236 +48,128 @@ jobs:
               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:
+  build:
     strategy:
       matrix:
-        os: [macos-14, macos-13]
+        target: [x86_64-unknown-linux-musl, aarch64-apple-darwin, x86_64-apple-darwin, x86_64-pc-windows-msvc]
         include:
-          - os: macos-13
+          - target: x86_64-unknown-linux-musl
-            arch: x64
+            type: musl
-          - os: macos-14
+            runner: ubuntu-24.04
-            arch: arm64
+          - target: aarch64-apple-darwin
-    if: ${{ needs.tag.outputs.TAG == 'new' }}
+            type: native
-    runs-on: ${{ matrix.os }}
+            runner: macos-14
-    name: "build-macos-${{ matrix.arch }}"
+          - target: x86_64-apple-darwin
-    needs: [tag]
+            type: native
+            runner: macos-13
+          - target: x86_64-pc-windows-msvc
+            type: native
+            runner: windows-2022
+    if: ${{ needs.check-version-changed.outputs.TAG == 'new' }}
+    runs-on: ${{ matrix.runner }}
+    needs: [check-version-changed]
     steps:
       - uses: actions/checkout@v4
-
-      - name: Get latest macos ${{ matrix.arch }} LLVM release artifact
-        id: get-llvm-artifact
-        uses: actions/github-script@v7
-        with:
-          result-encoding: string
-          script: |
-            const getReleaseArtifact = require("./.github/workflows/get-release-artifact.js");
-            return await getReleaseArtifact({ 
-              octokit: github, 
-              context, 
-              releasePrefix: "llvm-",
-              artifactSuffix: "-macos-${{ matrix.arch }}"
-            });
-
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
+        # without this it will override our rust flags
-          components: rust-src
-          target: wasm32-unknown-emscripten
           rustflags: ""
+          cache-key: ${{ matrix.target }}
 
-      - name: install macos deps
+      - name: Download LLVM
-        run: |
+        uses: ./.github/actions/get-llvm
-          brew install ninja
+        with:
+          target: ${{ matrix.target }}
 
-      - name: versions
+      - name: Build
+        if: ${{ matrix.type == 'native' }}
+        shell: bash
         run: |
-          rustup show
+          export LLVM_SYS_181_PREFIX=$PWD/llvm-${{ matrix.target }}
-          cargo --version
-          cmake --version
-          echo "bash:" && bash --version
-          echo "ninja:" && ninja --version
-          echo "clang:" && clang --version
-
-      - name: download llvm
-        run: |
-          curl -L -o llvm.tar.gz "${{ steps.get-llvm-artifact.outputs.result }}"
-          tar -xvf llvm.tar.gz
-
-      - 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 }}
+          mv target/release/resolc resolc-${{ matrix.target }} || mv target/release/resolc.exe resolc-${{ matrix.target }}.exe
 
-      - name: check revive
+      - name: Build
+        if: ${{ matrix.type == 'musl' }}
         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: |
-          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: Get latest linux LLVM release artifact
-        id: get-llvm-musl-artifact
-        uses: actions/github-script@v7
-        with:
-          result-encoding: string
-          script: |
-            const getReleaseArtifact = require("./.github/workflows/get-release-artifact.js")
-            return await getReleaseArtifact({
-              octokit: github,
-              context,
-              releasePrefix: "llvm-",
-              artifactSuffix: "-x86_64-linux-musl"
-            })
-
-      - 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: download llvm
-        run: |
-          curl -L -o llvm.tar.gz "${{ steps.get-llvm-musl-artifact.outputs.result }}"
-          tar -xvf llvm.tar.gz
-
-      # 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
+           chown -R root:root .
            apt update && apt upgrade -y && apt install -y pkg-config
-           export LLVM_SYS_181_PREFIX=/opt/revive/target-llvm/musl/target-final
+           export LLVM_SYS_181_PREFIX=/opt/revive/llvm-${{ matrix.target }}
            make install-bin
-           cp /root/.cargo/bin/resolc /opt/revive/resolc-out/resolc-static-linux
+           mv target/${{ matrix.target }}/release/resolc resolc-${{ matrix.target }}
            "
+          sudo chown -R $(id -u):$(id -g) .
 
-      - name: check musl
+      - name: Install Solc
+        uses: ./.github/actions/get-solc
+
+      - name: Basic Sanity Check
+        shell: bash
         run: |
-          mkdir solc
+          result=$(./resolc-${{ matrix.target }} --bin crates/integration/contracts/flipper.sol)
-          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 1 -czf resolc-static-linux.tar.gz ./resolc-out/resolc-static-linux
-
       - uses: actions/upload-artifact@v4
         with:
-          name: revive-linux
+          name: resolc-${{ matrix.target }}
-          path: |
+          path: resolc-${{ matrix.target }}*
-            ./resolc-static-linux.tar.gz
           retention-days: 1
 
+  build-wasm:
+    if: ${{ needs.check-version-changed.outputs.TAG == 'new' }}
+    runs-on: ubuntu-24.04
+    needs: [check-version-changed]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          target: wasm32-unknown-emscripten
+          # without this it will override our rust flags
+          rustflags: ""
+
+      - name: Download Host LLVM
+        uses: ./.github/actions/get-llvm
+        with:
+          target: x86_64-unknown-linux-gnu
+
+      - name: Download Wasm LLVM
+        uses: ./.github/actions/get-llvm
+        with:
+          target: wasm32-unknown-emscripten
+
+      - name: Download EMSDK
+        uses: ./.github/actions/get-emsdk
+
+      - name: Build
+        run: |
+          export LLVM_SYS_181_PREFIX=$PWD/llvm-x86_64-unknown-linux-gnu
+          export REVIVE_LLVM_TARGET_PREFIX=$PWD/llvm-wasm32-unknown-emscripten
+          source emsdk/emsdk_env.sh
+          make install-wasm
+          chmod -x ./target/wasm32-unknown-emscripten/release/resolc.wasm
+
       - name: Set Up Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: "20"
+         node-version: "20"
 
-      - name: Get latest emscripten LLVM release artifact
+      - name: Basic Sanity Check
-        id: get-llvm-emscripten-artifact
-        uses: actions/github-script@v7
-        with:
-          result-encoding: string
-          script: |
-            const getReleaseArtifact = require("./.github/workflows/get-release-artifact.js")
-            return await getReleaseArtifact({
-              octokit: github,
-              context,
-              releasePrefix: "llvm-",
-              artifactSuffix: "-wasm32-unknown-emscripten"
-            })
-
-      - name: download llvm
-        run: |
-          curl -L -o llvm.tar.gz "${{ steps.get-llvm-emscripten-artifact.outputs.result }}"
-          tar -xvf llvm.tar.gz
-
-      - name: build wasm
-        run: |
-          make install-llvm-builder
-          revive-llvm --target-env emscripten clone
-          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: |
+          mkdir -p solc
           curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.28/soljson.js
           node -e "
           const soljson = require('solc/soljson');
@@ -313,54 +205,58 @@ jobs:
           if(!bytecode.startsWith('50564d')) { process.exit(1); }
           "
 
-      - name: compress wasm artifact
+      - name: Compress Artifact
         run: |
-          tar --strip-components 3 -czf resolc-wasm.tar.gz \
+          tar -czf $(pwd)/resolc-wasm32-unknown-emscripten.tar.gz -C ./target/wasm32-unknown-emscripten/release/ \
-            ./target/wasm32-unknown-emscripten/release/resolc.js \
+            resolc.js \
-            ./target/wasm32-unknown-emscripten/release/resolc.wasm \
+            resolc.wasm \
-            ./target/wasm32-unknown-emscripten/release/resolc_web.js
+            resolc_web.js
 
       - uses: actions/upload-artifact@v4
         with:
-          name: revive-wasm
+          name: resolc-wasm32-unknown-emscripten
-          path: |
+          path: resolc-wasm32-unknown-emscripten.tar.gz
-            resolc-wasm.tar.gz
           retention-days: 1
 
   create-release:
-    needs: [tag, build-linux-all, macos-universal-binary]
+    if: github.event_name != 'pull_request'
-    runs-on: ubuntu-24.04
+    needs: [check-version-changed, build-wasm]
+    runs-on: macos-14
     permissions:
       contents: write
-    outputs:
-      upload_url: ${{ steps.create_release.outputs.result }}
     steps:
-      - name: Download revive-wasm
+      - name: Download Artifacts
         uses: actions/download-artifact@v4
         with:
-          name: revive-wasm
+          merge-multiple: true
-          path: resolc-wasm/
 
-      - name: Download revive-linux
+      - name: Create macOS Fat Binary
-        uses: actions/download-artifact@v4
+        run: |
-        with:
+          lipo resolc-aarch64-apple-darwin resolc-x86_64-apple-darwin -create -output resolc-universal-apple-darwin
-          name: revive-linux
-          path: resolc-linux/
 
-      - name: Download revive-macos
+      - name: Compress Artifacts
-        uses: actions/download-artifact@v4
+        run: |
-        with:
+          chmod +x resolc-x86_64-unknown-linux-musl
-          name: revive-macos
+          chmod +x resolc-universal-apple-darwin
-          path: resolc-macos/
+          tar -czf resolc-x86_64-unknown-linux-musl.tar.gz resolc-x86_64-unknown-linux-musl
+          tar -czf resolc-universal-apple-darwin.tar.gz resolc-universal-apple-darwin
+          zip -j resolc-x86_64-pc-windows-msvc.zip resolc-x86_64-pc-windows-msvc.exe
 
       - name: create-release
         uses: softprops/action-gh-release@v2
         with:
-          body: ${{ needs.tag.outputs.RELEASE_NOTES }}
+          body: |
-          tag_name: ${{ needs.tag.outputs.PKG_VER }}
+            ## Changelog
-          name: ${{ needs.tag.outputs.PKG_VER }}
+            ${{ needs.check-version-changed.outputs.RELEASE_NOTES }}
+
+            ## Note for macOS Users
+            The macOS binary is unsigned and it needs to be made runnable using `xattr -c resolc-universal-apple-darwin`.
+          tag_name: ${{ needs.check-version-changed.outputs.PKG_VER }}
+          name: ${{ needs.check-version-changed.outputs.PKG_VER }}
           draft: true
+          target_commitish: ${{ github.sha }}
           files: |
-            ./resolc-linux/resolc-static-linux.tar.gz
+            resolc-x86_64-unknown-linux-musl.tar.gz
-            ./resolc-macos/resolc-macos.tar.gz
+            resolc-universal-apple-darwin.tar.gz
-            ./resolc-wasm/resolc-wasm.tar.gz
+            resolc-wasm32-unknown-emscripten.tar.gz
+            resolc-x86_64-pc-windows-msvc.zip

.github/workflows/rust.yml

@@ -1,58 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["main"]
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  build-ubuntu-x86:
-    runs-on: ubuntu-24.04
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install solc
-        run: |
-          mkdir -p solc
-          curl -sSL --output solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.28/solc-static-linux
-          chmod +x solc/solc
-          echo "$(pwd)/solc/" >> $GITHUB_PATH
-
-      - name: Install LLVM
-        run: |
-          curl -sSL --output llvm.tar.xz https://github.com/paritytech/revive/releases/download/v0.1.0-dev.7/clang+llvm-18.1.8-x86_64-linux-gnu-ubuntu-24.04.tar.xz
-          mkdir llvm18
-          tar Jxf llvm.tar.xz -C llvm18/
-          echo "LLVM_SYS_181_PREFIX=$(pwd)/llvm18" >> $GITHUB_ENV
-
-      - name: Install geth
-        run: |
-          sudo add-apt-repository -y ppa:ethereum/ethereum
-          sudo apt update
-          sudo apt install -y ethereum
-
-      - name: Machete
-        uses: bnjbvr/cargo-machete@main
-
-      - name: Format
-        run: make format
-
-      - name: Clippy
-        run: make clippy
-
-      - name: Test cargo workspace
-        run: make test-workspace
-
-      - name: Test CLI
-        run: make test-cli
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: ${{ github.job }}-resolc
-          path: ./target/release/resolc
-          retention-days: 1

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

@@ -0,0 +1,45 @@
+name: Test LLVM Builder
+on:
+  pull_request:
+    branches: ["main"]
+    types: [opened, synchronize]
+    paths:
+      - 'LLVM.lock'
+      - 'crates/llvm-builder/**'
+      - '.github/workflows/test-llvm-builder.yml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        runner: [parity-large, macos-14, windows-2022]
+    runs-on: ${{ matrix.runner }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          # without this it will override our rust flags
+          rustflags: ""
+          cache-key: ${{ matrix.runner }}
+
+      - name: Install 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 Dependencies
+        if: matrix.runner == 'macos-14'
+        run: |
+          brew install ninja
+
+      - name: Test
+        run: make test-llvm-builder
+        env:
+          RUST_LOG: trace

.github/workflows/test-wasm.yml

@@ -0,0 +1,98 @@
+name: Test Wasm Version
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+    types: [opened, synchronize]
+
+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
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          target: wasm32-unknown-emscripten
+          # without this it will override our rust flags
+          rustflags: ""
+
+      - name: Download Host LLVM
+        uses: ./.github/actions/get-llvm
+        with:
+          target: x86_64-unknown-linux-gnu
+
+      - name: Download Wasm LLVM
+        uses: ./.github/actions/get-llvm
+        with:
+          target: wasm32-unknown-emscripten
+
+      - name: Install emsdk
+        uses: ./.github/actions/get-emsdk
+
+      - name: Set LLVM Environment Variables
+        run: |
+          echo "LLVM_SYS_181_PREFIX=$(pwd)/llvm-x86_64-unknown-linux-gnu" >> $GITHUB_ENV
+          echo "REVIVE_LLVM_TARGET_PREFIX=$(pwd)/llvm-wasm32-unknown-emscripten" >> $GITHUB_ENV
+
+      - name: Build Revive
+        run: |
+          source emsdk/emsdk_env.sh
+          make install-wasm
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: revive-wasm
+          path: |
+            ${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc.js
+            ${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc.wasm
+            ${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc_web.js
+          retention-days: 1
+
+  test:
+    needs: build
+    strategy:
+      matrix:
+        os: ["ubuntu-24.04", "macos-14", "windows-2022"]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Create Target Directory
+        run: mkdir -p ${{ env.REVIVE_WASM_INSTALL_DIR }}
+
+      - name: Download Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: revive-wasm
+          path: ${{ env.REVIVE_WASM_INSTALL_DIR }}
+
+      - name: Set Up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "20"
+
+      - name: Install Node Packages
+        run: npm install
+
+      - name: Run Playwright tests
+        run: |
+          cd js
+          npx playwright install --with-deps
+          npx playwright test
+
+      - name: Test revive
+        run: |
+          echo "Running tests for ${{ matrix.os }}"
+          npm run test:wasm

.github/workflows/test.yml

@@ -0,0 +1,57 @@
+name: Test
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+    types: [opened, synchronize]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  test:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          # without this it will override our rust flags
+          rustflags: ""
+
+      - name: Install Solc
+        uses: ./.github/actions/get-solc
+
+      - name: Download LLVM
+        uses: ./.github/actions/get-llvm
+        with:
+          target: x86_64-unknown-linux-gnu
+
+      - name: Set LLVM Environment Variables
+        run: |
+          echo "LLVM_SYS_181_PREFIX=$(pwd)/llvm-x86_64-unknown-linux-gnu" >> $GITHUB_ENV
+
+      - name: Install Geth
+        run: |
+          sudo add-apt-repository -y ppa:ethereum/ethereum
+          sudo apt update
+          sudo apt install -y ethereum
+
+      - name: Machete
+        uses: bnjbvr/cargo-machete@v0.7.1
+
+      - name: Format
+        run: make format
+
+      - name: Clippy
+        run: make clippy
+
+      - name: Test cargo workspace
+        run: make test-workspace
+
+      - name: Test CLI
+        run: make test-cli

CHANGELOG.md

@@ -4,7 +4,22 @@
 
 This is a development pre-release.
 
-Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
+Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
+
+## 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
 
@@ -14,7 +29,7 @@ Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
 
 ### Added
 
-### Changed 
+### Changed
 
 ### Fixed
 - A bug causing incorrect loads from the emulated EVM linear memory.
@@ -30,7 +45,7 @@ Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
 - Support for the `coinbase` opcode.
 - The resolc web JS version.
 
-### Changed 
+### Changed
 - Missing the `--overwrite` flag emits an error instead of a warning.
 - The `resolc` executable prints the help by default.
 - Removed support for legacy EVM assembly (EVMLA) translation.
@@ -52,7 +67,7 @@ This is a development pre-release.
 
 ### Added
 
-### Changed 
+### Changed
 - Syscalls with more than 6 arguments now pack them into registers.
 
 ### Fixed
@@ -92,9 +107,9 @@ This is a development pre-release.
 - Calls forward maximum weight limits instead of 0, anticipating a change in polkadot-sdk where weight limits of 0 no longer interprets as uncapped limit.
 
 ### Fixed
-- A linker bug which was preventing certain contracts from linking with the PVM linker. 
+- A linker bug which was preventing certain contracts from linking with the PVM linker.
 - JS: Fix encoding conversion from JS string (UTF-16) to UTF-8.
-- The git commit hash slug is always displayed in the version string. 
+- The git commit hash slug is always displayed in the version string.
 
 ## v0.1.0-dev.6
 

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.1.0-dev.11"
+version = "0.1.0-dev.12"
 authors = [
     "Cyrill Leutwiler <cyrill@parity.io>",
     "Parity Technologies <admin@parity.io>",
@@ -14,19 +14,19 @@ repository = "https://github.com/paritytech/revive"
 rust-version = "1.81.0"
 
 [workspace.dependencies]
-revive-benchmarks = { version = "0.1.0-dev.11", path = "crates/benchmarks" }
+revive-benchmarks = { version = "0.1.0-dev.12", path = "crates/benchmarks" }
-revive-builtins = { version = "0.1.0-dev.11", path = "crates/builtins" }
+revive-builtins = { version = "0.1.0-dev.12", path = "crates/builtins" }
-revive-common = { version = "0.1.0-dev.11", path = "crates/common" }
+revive-common = { version = "0.1.0-dev.12", path = "crates/common" }
-revive-differential = { version = "0.1.0-dev.11", path = "crates/differential" }
+revive-differential = { version = "0.1.0-dev.12", path = "crates/differential" }
-revive-integration = { version = "0.1.0-dev.11", path = "crates/integration" }
+revive-integration = { version = "0.1.0-dev.12", path = "crates/integration" }
-revive-linker = { version = "0.1.0-dev.11", path = "crates/linker" }
+revive-linker = { version = "0.1.0-dev.12", path = "crates/linker" }
-lld-sys = { version = "0.1.0-dev.11", path = "crates/lld-sys" }
+lld-sys = { version = "0.1.0-dev.12", path = "crates/lld-sys" }
-revive-llvm-context = { version = "0.1.0-dev.11", path = "crates/llvm-context" }
+revive-llvm-context = { version = "0.1.0-dev.12", path = "crates/llvm-context" }
-revive-runtime-api = { version = "0.1.0-dev.11", path = "crates/runtime-api" }
+revive-runtime-api = { version = "0.1.0-dev.12", path = "crates/runtime-api" }
-revive-runner = { version = "0.1.0-dev.11", path = "crates/runner" }
+revive-runner = { version = "0.1.0-dev.12", path = "crates/runner" }
-revive-solidity = { version = "0.1.0-dev.11", path = "crates/solidity" }
+revive-solidity = { version = "0.1.0-dev.12", path = "crates/solidity" }
-revive-stdlib = { version = "0.1.0-dev.11", path = "crates/stdlib" }
+revive-stdlib = { version = "0.1.0-dev.12", path = "crates/stdlib" }
-revive-build-utils = { version = "0.1.0-dev.11", path = "crates/build-utils" }
+revive-build-utils = { version = "0.1.0-dev.12", path = "crates/build-utils" }
 
 hex = "0.4.3"
 cc = "1.2"
@@ -72,7 +72,7 @@ assert_fs = "1.1"
 # 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 = "274a781e8ca1a9432c7ec87593bd93214abbff50" }
+polkadot-sdk = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c29e72a8628835e34deb6aa7db9a78a2e4eabcee" }
 
 # llvm
 [workspace.dependencies.inkwell]

RELEASE.md

@@ -4,10 +4,11 @@ Prior to the first stable release we neither have formal release processes nor d
 
 To create a new pre-release:
 
-1. Merge a release PR which updates the `-dev.X` versions in the workspace `Cargo.toml` and updates the `CHANGELOG.md` accordingly. The release workflow will attempt to build and publish a new release whenever the latest git tag does not match the cargo package version.
+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.
-2. 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).
+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.
-3. 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)
+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).
-4. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly
+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)
+5. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly
 
 # LLVM release
 

crates/integration/Cargo.toml

@@ -15,6 +15,7 @@ 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": 1110,
+  "Baseline": 1443,
-  "Computation": 2389,
+  "Computation": 2788,
-  "DivisionArithmetics": 14822,
+  "DivisionArithmetics": 9748,
-  "ERC20": 23973,
+  "ERC20": 19203,
-  "Events": 1605,
+  "Events": 2201,
-  "FibonacciIterative": 2023,
+  "FibonacciIterative": 2041,
-  "Flipper": 1989,
+  "Flipper": 2632,
-  "SHA1": 17026
+  "SHA1": 8958
 }

crates/integration/contracts/DelegateCaller.sol

@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.28;
+
+/* runner.json
+{
+    "differential": true,
+    "actions": [
+        {
+            "Instantiate": {
+                "code": {
+                    "Solidity": {
+                        "contract": "DelegateCaller"
+                    }
+                }
+            }
+        },
+        {
+            "Call": {
+                "dest": {
+                    "Instantiated": 0
+                },
+                "data": "e466c6c9"
+            }
+        }
+    ]
+}
+*/
+
+contract DelegateCaller {
+    function delegateNoContract() external returns (bool) {
+        address testAddress = 0x0000000000000000000000000000000000000000;
+        (bool success, ) = testAddress.delegatecall(
+            abi.encodeWithSignature("test()")
+        );
+        return success;
+    }
+}

crates/integration/contracts/FunctionType.sol

@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.28;
+
+/* runner.json
+{
+    "differential": true,
+    "actions": [
+        {
+            "Instantiate": {
+                "code": {
+                    "Solidity": {
+                        "contract": "FunctionType"
+                    }
+                }
+            }
+        },
+        {
+            "Call": {
+                "dest": {
+                    "Instantiated": 0
+                },
+                "data": "b8c9d365"
+            }
+        }
+    ]
+}
+*/
+
+contract FunctionType {
+    uint public immutable x = 42;
+
+    function h() public view returns (function() external view returns (uint)) {
+        return this.x;
+    }
+}

crates/integration/contracts/MCopyOverlap.sol

@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8;
+
+/* runner.json
+{
+    "differential": true,
+    "actions": [
+        {
+            "Instantiate": {
+                "code": {
+                    "Solidity": {
+                        "contract": "MCopyOverlap"
+                    }
+                }
+            }
+        },
+        {
+            "Call": {
+                "dest": {
+                    "Instantiated": 0
+                },
+                "data": "afdce848"
+            }
+        }
+    ]
+}
+*/
+
+function copy(
+    uint dstOffset,
+    uint srcOffset,
+    uint length
+) pure returns (bytes memory out) {
+    out = hex"2222222222222222333333333333333344444444444444445555555555555555"
+    hex"6666666666666666777777777777777788888888888888889999999999999999"
+    hex"aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbccccccccccccccccdddddddddddddddd";
+    assembly {
+        mcopy(
+            add(add(out, 0x20), dstOffset),
+            add(add(out, 0x20), srcOffset),
+            length
+        )
+    }
+}
+
+contract MCopyOverlap {
+    function mcopy_to_right_overlap() public pure returns (bytes memory) {
+        return copy(0x20, 0x10, 0x30);
+    }
+}

crates/integration/src/cases.rs

@@ -1,6 +1,7 @@
 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)]
@@ -250,7 +251,7 @@ sol!(
 case!("Storage.sol", Storage, transientCall, storage_transient, value: U256);
 
 impl Contract {
-    fn build(calldata: Vec<u8>, name: &'static str, code: &str) -> Self {
+    pub fn build(calldata: Vec<u8>, name: &'static str, code: &str) -> Self {
         Self {
             name,
             evm_runtime: compile_evm_bin_runtime(name, code),
@@ -258,11 +259,19 @@ 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};
@@ -302,14 +311,47 @@ mod tests {
         };
 
         [
-            Contract::baseline as fn() -> Contract,
+            (|| {
-            Contract::flipper as fn() -> Contract,
+                Contract::build_size_opt(
-            (|| Contract::odd_product(0)) as fn() -> Contract,
+                    vec![],
-            (|| Contract::fib_iterative(U256::ZERO)) as fn() -> Contract,
+                    "Baseline",
-            Contract::erc20 as fn() -> Contract,
+                    include_str!("../contracts/Baseline.sol"),
-            (|| Contract::sha1(Bytes::new())) as fn() -> Contract,
+                )
-            (|| Contract::division_arithmetics_div(U256::ZERO, U256::ZERO)) as fn() -> Contract,
+            }) as _,
-            (|| 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

@@ -33,6 +33,7 @@ test_spec!(msize, "MSize", "MSize.sol");
 test_spec!(sha1, "SHA1", "SHA1.sol");
 test_spec!(block, "Block", "Block.sol");
 test_spec!(mcopy, "MCopy", "MCopy.sol");
+test_spec!(mcopy_overlap, "MCopyOverlap", "MCopyOverlap.sol");
 test_spec!(events, "Events", "Events.sol");
 test_spec!(storage, "Storage", "Storage.sol");
 test_spec!(mstore8, "MStore8", "MStore8.sol");
@@ -56,6 +57,8 @@ 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");
+test_spec!(delegate_no_contract, "DelegateCaller", "DelegateCaller.sol");
+test_spec!(function_type, "FunctionType", "FunctionType.sol");
 
 fn instantiate(path: &str, contract: &str) -> Vec<SpecsAction> {
     vec![Instantiate {

crates/linker/src/lib.rs

@@ -52,7 +52,6 @@ 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/lld-sys/build.rs

@@ -96,7 +96,7 @@ fn main() {
     revive_build_utils::llvm_cxx_flags()
         .split_whitespace()
         .fold(&mut cc::Build::new(), |builder, flag| builder.flag(flag))
-        .flag("-Wno-unused-parameter")
+        .warnings(false)
         .cpp(true)
         .file("src/linker.cpp")
         .compile("liblinker.a");

crates/llvm-builder/Cargo.toml

@@ -32,6 +32,7 @@ tar = { workspace = true }
 flate2 = { workspace = true }
 env_logger = { workspace = true }
 log = { workspace = true }
+which = { workspace = true }
 
 [dev-dependencies]
 assert_cmd = { workspace = true }

crates/llvm-builder/src/builtins.rs

@@ -1,5 +1,8 @@
 //! Utilities for compiling the LLVM compiler-rt builtins.
 
+use crate::utils::path_windows_to_unix as to_unix;
+use std::{env::consts::EXE_EXTENSION, process::Command};
+
 /// Static CFLAGS variable passed to the compiler building the compiler-rt builtins.
 const C_FLAGS: [&str; 6] = [
     "--target=riscv64",
@@ -44,24 +47,31 @@ fn cmake_dynamic_args(
 
     let mut clang_path = llvm_target_host.to_path_buf();
     clang_path.push("bin/clang");
+    clang_path.set_extension(EXE_EXTENSION);
 
     let mut clangxx_path = llvm_target_host.to_path_buf();
     clangxx_path.push("bin/clang++");
+    clangxx_path.set_extension(EXE_EXTENSION);
 
     let mut llvm_config_path = llvm_target_host.to_path_buf();
     llvm_config_path.push("bin/llvm-config");
+    llvm_config_path.set_extension(EXE_EXTENSION);
 
     let mut ar_path = llvm_target_host.to_path_buf();
     ar_path.push("bin/llvm-ar");
+    ar_path.set_extension(EXE_EXTENSION);
 
     let mut nm_path = llvm_target_host.to_path_buf();
     nm_path.push("bin/llvm-nm");
+    nm_path.set_extension(EXE_EXTENSION);
 
     let mut ranlib_path = llvm_target_host.to_path_buf();
     ranlib_path.push("bin/llvm-ranlib");
+    ranlib_path.set_extension(EXE_EXTENSION);
 
     let mut linker_path = llvm_target_host.to_path_buf();
     linker_path.push("bin/ld.lld");
+    linker_path.set_extension(EXE_EXTENSION);
 
     Ok([
         format!(
@@ -76,12 +86,18 @@ fn cmake_dynamic_args(
         format!("-DCMAKE_C_FLAGS='{}'", C_FLAGS.join(" ")),
         format!("-DCMAKE_ASM_FLAGS='{}'", C_FLAGS.join(" ")),
         format!("-DCMAKE_CXX_FLAGS='{}'", C_FLAGS.join(" ")),
-        format!("-DCMAKE_C_COMPILER='{}'", clang_path.to_string_lossy()),
+        format!(
-        format!("-DCMAKE_ASM_COMPILER='{}'", clang_path.to_string_lossy()),
+            "-DCMAKE_C_COMPILER='{}'",
-        format!("-DCMAKE_CXX_COMPILER='{}'", clangxx_path.to_string_lossy()),
+            to_unix(clang_path.clone())?.display()
-        format!("-DCMAKE_AR='{}'", ar_path.to_string_lossy()),
+        ),
-        format!("-DCMAKE_NM='{}'", nm_path.to_string_lossy()),
+        format!("-DCMAKE_ASM_COMPILER='{}'", to_unix(clang_path)?.display()),
-        format!("-DCMAKE_RANLIB='{}'", ranlib_path.to_string_lossy()),
+        format!(
+            "-DCMAKE_CXX_COMPILER='{}'",
+            to_unix(clangxx_path)?.display()
+        ),
+        format!("-DCMAKE_AR='{}'", to_unix(ar_path)?.display()),
+        format!("-DCMAKE_NM='{}'", to_unix(nm_path)?.display()),
+        format!("-DCMAKE_RANLIB='{}'", to_unix(ranlib_path)?.display()),
         format!(
             "-DLLVM_CONFIG_PATH='{}'",
             llvm_config_path.to_string_lossy()
@@ -101,7 +117,13 @@ pub fn build(
     log::info!("building compiler-rt for rv64emac");
 
     crate::utils::check_presence("cmake")?;
-    crate::utils::check_presence("ninja")?;
+
+    let generator = if cfg!(target_os = "windows") {
+        "Visual Studio 17 2022"
+    } else {
+        crate::utils::check_presence("ninja")?;
+        "Ninja"
+    };
 
     let llvm_module_compiler_rt = crate::LLVMPath::llvm_module_compiler_rt()?;
     let llvm_compiler_rt_build = crate::LLVMPath::llvm_build_compiler_rt()?;
@@ -114,7 +136,7 @@ pub fn build(
                 "-B",
                 llvm_compiler_rt_build.to_string_lossy().as_ref(),
                 "-G",
-                "Ninja",
+                generator,
             ])
             .args(CMAKE_STATIC_ARGS)
             .args(cmake_dynamic_args(build_type, target_env)?)
@@ -131,7 +153,17 @@ pub fn build(
         "LLVM compiler-rt building cmake",
     )?;
 
-    crate::utils::ninja(&llvm_compiler_rt_build)?;
+    crate::utils::command(
+        Command::new("cmake").args([
+            "--build",
+            llvm_compiler_rt_build.to_string_lossy().as_ref(),
+            "--target",
+            "install",
+            "--config",
+            build_type.to_string().as_str(),
+        ]),
+        "Building",
+    )?;
 
     Ok(())
 }

crates/llvm-builder/src/lib.rs

@@ -214,7 +214,7 @@ pub fn build(
                 sanitizer,
             )?;
         } else if cfg!(target_os = "windows") {
-            platforms::x86_64_windows_gnu::build(
+            platforms::x86_64_windows_msvc::build(
                 build_type,
                 targets,
                 llvm_projects,

crates/llvm-builder/src/platforms/mod.rs

@@ -8,7 +8,7 @@ pub mod wasm32_emscripten;
 pub mod x86_64_linux_gnu;
 pub mod x86_64_linux_musl;
 pub mod x86_64_macos;
-pub mod x86_64_windows_gnu;
+pub mod x86_64_windows_msvc;
 
 use std::str::FromStr;
 

crates/llvm-builder/src/platforms/shared.rs

@@ -8,7 +8,7 @@ use std::path::Path;
 use std::process::Command;
 
 /// The build options shared by all platforms.
-pub const SHARED_BUILD_OPTS: [&str; 19] = [
+pub const SHARED_BUILD_OPTS: [&str; 21] = [
     "-DPACKAGE_VENDOR='Parity Technologies'",
     "-DCMAKE_BUILD_WITH_INSTALL_RPATH=1",
     "-DLLVM_BUILD_DOCS='Off'",
@@ -28,6 +28,8 @@ pub const SHARED_BUILD_OPTS: [&str; 19] = [
     "-DCMAKE_EXPORT_COMPILE_COMMANDS='On'",
     "-DPython3_FIND_REGISTRY='LAST'", // Use Python version from $PATH, not from registry
     "-DBUG_REPORT_URL='https://github.com/paritytech/contract-issues/issues/'",
+    "-DCLANG_ENABLE_ARCMT='Off'",
+    "-DCLANG_ENABLE_STATIC_ANALYZER='Off'",
 ];
 
 /// The build options shared by all platforms except MUSL.

crates/llvm-builder/src/platforms/x86_64_windows_msvc.rs

@@ -1,7 +1,6 @@
 //! The revive LLVM amd64 `windows-gnu` builder.
 
 use std::collections::HashSet;
-use std::path::PathBuf;
 use std::process::Command;
 
 use crate::build_type::BuildType;
@@ -28,10 +27,6 @@ pub fn build(
     sanitizer: Option<Sanitizer>,
 ) -> anyhow::Result<()> {
     crate::utils::check_presence("cmake")?;
-    crate::utils::check_presence("clang")?;
-    crate::utils::check_presence("clang++")?;
-    crate::utils::check_presence("lld")?;
-    crate::utils::check_presence("ninja")?;
 
     let llvm_module_llvm =
         LLVMPath::llvm_module_llvm().and_then(crate::utils::path_windows_to_unix)?;
@@ -48,15 +43,12 @@ pub fn build(
                 "-B",
                 llvm_build_final.to_string_lossy().as_ref(),
                 "-G",
-                "Ninja",
+                "Visual Studio 17 2022",
                 format!(
                     "-DCMAKE_INSTALL_PREFIX='{}'",
                     llvm_target_final.to_string_lossy().as_ref(),
                 )
                 .as_str(),
-                format!("-DCMAKE_BUILD_TYPE='{build_type}'").as_str(),
-                "-DCMAKE_C_COMPILER='clang'",
-                "-DCMAKE_CXX_COMPILER='clang++'",
                 format!(
                     "-DLLVM_TARGETS_TO_BUILD='{}'",
                     targets
@@ -75,7 +67,7 @@ pub fn build(
                         .join(";")
                 )
                 .as_str(),
-                "-DLLVM_USE_LINKER='lld'",
+                "-DLLVM_BUILD_LLVM_C_DYLIB=Off",
             ])
             .args(crate::platforms::shared::shared_build_opts_default_target(
                 default_target,
@@ -107,20 +99,16 @@ pub fn build(
         "LLVM building cmake",
     )?;
 
-    crate::utils::ninja(llvm_build_final.as_ref())?;
+    crate::utils::command(
-
+        Command::new("cmake").args([
-    let libstdcpp_source_path = match std::env::var("LIBSTDCPP_SOURCE_PATH") {
+            "--build",
-        Ok(libstdcpp_source_path) => PathBuf::from(libstdcpp_source_path),
+            llvm_build_final.to_string_lossy().as_ref(),
-        Err(error) => anyhow::bail!(
+            "--target",
-            "The `LIBSTDCPP_SOURCE_PATH` must be set to the path to the libstdc++.a static library: {}", error
+            "install",
-        ),
+            "--config",
-    };
+            build_type.to_string().as_str(),
-    let mut libstdcpp_destination_path = llvm_target_final;
+        ]),
-    libstdcpp_destination_path.push("./lib/libstdc++.a");
+        "Building with msbuild",
-    fs_extra::file::copy(
-        crate::utils::path_windows_to_unix(libstdcpp_source_path)?,
-        crate::utils::path_windows_to_unix(libstdcpp_destination_path)?,
-        &fs_extra::file::CopyOptions::default(),
     )?;
 
     Ok(())

crates/llvm-builder/src/utils.rs

@@ -7,6 +7,7 @@ use std::process::Command;
 use std::process::Stdio;
 use std::time::Duration;
 
+use anyhow::Context;
 use path_slash::PathBufExt;
 
 /// The LLVM host repository URL.
@@ -131,11 +132,8 @@ pub fn path_windows_to_unix<P: AsRef<Path> + PathBufExt>(path: P) -> anyhow::Res
 
 /// Checks if the tool exists in the system.
 pub fn check_presence(name: &str) -> anyhow::Result<()> {
-    let description = &format!("checking the `{name}` executable");
+    which::which(name).with_context(|| format!("Tool `{name}` is missing. Please install"))?;
-    log::info!("{description}");
+    Ok(())
-
-    command(Command::new("which").arg(name), description)
-        .map_err(|_| anyhow::anyhow!("Tool `{}` is missing. Please install", name))
 }
 
 /// Identify XCode version using `pkgutil`.

crates/llvm-builder/tests/build.rs

@@ -53,6 +53,16 @@ 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")
@@ -65,12 +75,6 @@ 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")
@@ -100,6 +104,10 @@ 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();
 
@@ -123,6 +131,10 @@ fn build_with_sanitizers() -> anyhow::Result<()> {
         .arg("build")
         .arg("--sanitizer")
         .arg("Address")
+        .arg("--llvm-projects")
+        .arg("lld")
+        .arg("--llvm-projects")
+        .arg("clang")
         .assert()
         .success();
 
@@ -136,10 +148,31 @@ 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 && \
-        source {}emsdk_env.sh && \
+        cd {} && . ./emsdk_env.sh && cd .. && \
-        {program} --target-env emscripten build --llvm-projects clang --llvm-projects lld",
+        {program} --target-env emscripten build --llvm-projects lld",
         revive_llvm_builder::LLVMPath::DIRECTORY_EMSDK_SOURCE,
     );
 

crates/llvm-context/src/lib.rs

@@ -21,17 +21,25 @@ 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::immutable_data_load::ImmutableDataLoad as PolkaVMImmutableDataLoadFunction;
+pub use self::polkavm::context::function::runtime::revive::Exit as PolkaVMExitFunction;
+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;
@@ -47,8 +55,12 @@ 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/context/address_space.rs

@@ -8,10 +8,6 @@ pub enum AddressSpace {
     Stack,
     /// The heap memory.
     Heap,
-    /// The generic memory page.
-    Storage,
-    /// The transient storage.
-    TransientStorage,
 }
 
 impl From<AddressSpace> for inkwell::AddressSpace {
@@ -19,8 +15,6 @@ impl From<AddressSpace> for inkwell::AddressSpace {
         match value {
             AddressSpace::Stack => Self::from(0),
             AddressSpace::Heap => Self::from(1),
-            AddressSpace::Storage => Self::from(5),
-            AddressSpace::TransientStorage => Self::from(6),
         }
     }
 }

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

@@ -1,9 +1,6 @@
 //! The LLVM runtime functions.
 
-use inkwell::types::BasicType;
-
 use crate::optimizer::Optimizer;
-use crate::polkavm::context::address_space::AddressSpace;
 use crate::polkavm::context::function::declaration::Declaration as FunctionDeclaration;
 use crate::polkavm::context::function::Function;
 
@@ -19,9 +16,6 @@ pub struct LLVMRuntime<'ctx> {
     pub exp: FunctionDeclaration<'ctx>,
     /// The corresponding LLVM runtime function.
     pub sign_extend: FunctionDeclaration<'ctx>,
-
-    /// The corresponding LLVM runtime function.
-    pub sha3: FunctionDeclaration<'ctx>,
 }
 
 impl<'ctx> LLVMRuntime<'ctx> {
@@ -37,9 +31,6 @@ impl<'ctx> LLVMRuntime<'ctx> {
     /// The corresponding runtime function name.
     pub const FUNCTION_SIGNEXTEND: &'static str = "__signextend";
 
-    /// The corresponding runtime function name.
-    pub const FUNCTION_SHA3: &'static str = "__sha3";
-
     /// A shortcut constructor.
     pub fn new(
         llvm: &'ctx inkwell::context::Context,
@@ -65,43 +56,11 @@ impl<'ctx> LLVMRuntime<'ctx> {
         Function::set_default_attributes(llvm, sign_extend, optimizer);
         Function::set_pure_function_attributes(llvm, sign_extend);
 
-        let sha3 = Self::declare(
-            module,
-            Self::FUNCTION_SHA3,
-            llvm.custom_width_int_type(revive_common::BIT_LENGTH_WORD as u32)
-                .fn_type(
-                    vec![
-                        llvm.ptr_type(AddressSpace::Heap.into())
-                            .as_basic_type_enum()
-                            .into(),
-                        llvm.custom_width_int_type(revive_common::BIT_LENGTH_WORD as u32)
-                            .as_basic_type_enum()
-                            .into(),
-                        llvm.custom_width_int_type(revive_common::BIT_LENGTH_BOOLEAN as u32)
-                            .as_basic_type_enum()
-                            .into(),
-                    ]
-                    .as_slice(),
-                    false,
-                ),
-            Some(inkwell::module::Linkage::External),
-        );
-        Function::set_default_attributes(llvm, sha3, optimizer);
-        Function::set_attributes(
-            llvm,
-            sha3,
-            //vec![Attribute::ArgMemOnly, Attribute::ReadOnly],
-            vec![],
-            false,
-        );
-
         Self {
             add_mod,
             mul_mod,
             exp,
             sign_extend,
-
-            sha3,
         }
     }
 

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

@@ -81,8 +81,7 @@ 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.
@@ -110,30 +109,21 @@ impl<'ctx> Function<'ctx> {
     pub fn set_attributes(
         llvm: &'ctx inkwell::context::Context,
         declaration: Declaration<'ctx>,
-        attributes: Vec<Attribute>,
+        attributes: &[Attribute],
         force: bool,
     ) {
-        for attribute_kind in attributes.into_iter() {
+        for attribute_kind in attributes {
             match attribute_kind {
                 Attribute::Memory => unimplemented!("`memory` attributes are not implemented"),
                 attribute_kind @ Attribute::AlwaysInline if force => {
-                    let is_optimize_none_set = declaration
+                    declaration.value.remove_enum_attribute(
-                        .value
+                        inkwell::attributes::AttributeLoc::Function,
-                        .get_enum_attribute(
+                        Attribute::NoInline as u32,
-                            inkwell::attributes::AttributeLoc::Function,
+                    );
-                            Attribute::OptimizeNone as u32,
+                    declaration.value.add_attribute(
-                        )
+                        inkwell::attributes::AttributeLoc::Function,
-                        .is_some();
+                        llvm.create_enum_attribute(*attribute_kind as u32, 0),
-                    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(
@@ -142,12 +132,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),
                 ),
             }
         }
@@ -178,27 +168,16 @@ impl<'ctx> Function<'ctx> {
         declaration: Declaration<'ctx>,
         optimizer: &Optimizer,
     ) {
-        if optimizer.settings().level_middle_end == inkwell::OptimizationLevel::None {
+        if optimizer.settings().level_middle_end_size == SizeLevel::Z {
-            Self::remove_attributes(
-                declaration,
-                &[Attribute::OptimizeForSize, Attribute::AlwaysInline],
-            );
             Self::set_attributes(
                 llvm,
                 declaration,
-                vec![Attribute::OptimizeNone, Attribute::NoInline],
+                &[Attribute::OptimizeForSize, Attribute::MinSize],
-                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, vec![Attribute::NoFree], false);
+        Self::set_attributes(llvm, declaration, &[Attribute::NoFree], false);
     }
 
     /// Sets the front-end runtime attributes.
@@ -208,7 +187,7 @@ impl<'ctx> Function<'ctx> {
         optimizer: &Optimizer,
     ) {
         if optimizer.settings().level_middle_end_size == SizeLevel::Z {
-            Self::set_attributes(llvm, declaration, vec![Attribute::NoInline], false);
+            Self::set_attributes(llvm, declaration, &[Attribute::NoInline], false);
         }
     }
 
@@ -220,7 +199,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

@@ -0,0 +1,269 @@
+//! 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

@@ -145,7 +145,7 @@ where
         crate::PolkaVMFunction::set_attributes(
             context.llvm(),
             entry,
-            vec![crate::PolkaVMAttribute::NoReturn],
+            &[crate::PolkaVMAttribute::NoReturn],
             true,
         );
 

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

@@ -1,118 +0,0 @@
-//! 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,8 +1,9 @@
 //! The front-end runtime functions.
 
+pub mod arithmetics;
 pub mod deploy_code;
 pub mod entry;
-pub mod immutable_data_load;
+pub mod revive;
 pub mod runtime_code;
 
 /// The main entry function name.
@@ -13,6 +14,3 @@ 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

@@ -0,0 +1,147 @@
+//! 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,6 +10,7 @@ pub mod function;
 pub mod global;
 pub mod r#loop;
 pub mod pointer;
+pub mod runtime;
 pub mod solidity_data;
 pub mod yul_data;
 
@@ -31,6 +32,8 @@ 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;
@@ -41,10 +44,13 @@ 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;
 
@@ -721,6 +727,7 @@ where
         name: &str,
     ) -> Pointer<'ctx> {
         let pointer = self.builder.build_alloca(r#type, name).unwrap();
+
         pointer
             .as_instruction()
             .unwrap()
@@ -768,60 +775,18 @@ where
     ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>> {
         match pointer.address_space {
             AddressSpace::Heap => {
-                let heap_pointer = self.build_heap_gep(
+                let name = <PolkaVMLoadHeapWordFunction as RuntimeFunction<D>>::NAME;
-                    self.builder().build_ptr_to_int(
+                let declaration =
-                        pointer.value,
+                    <PolkaVMLoadHeapWordFunction as RuntimeFunction<D>>::declaration(self);
-                        self.xlen_type(),
+                let arguments = [self
-                        "offset_ptrtoint",
-                    )?,
-                    pointer
-                        .r#type
-                        .size_of()
-                        .expect("should be IntValue")
-                        .const_truncate(self.xlen_type()),
-                )?;
-
-                let value = self
                     .builder()
-                    .build_load(pointer.r#type, heap_pointer.value, name)?;
+                    .build_ptr_to_int(pointer.value, self.xlen_type(), "offset_ptrtoint")?
-                self.basic_block()
+                    .as_basic_value_enum()];
-                    .get_last_instruction()
+                Ok(self
-                    .expect("Always exists")
+                    .build_call(declaration, &arguments, "heap_load")
-                    .set_alignment(revive_common::BYTE_LENGTH_BYTE as u32)
+                    .unwrap_or_else(|| {
-                    .expect("Alignment is valid");
+                        panic!("revive runtime function {name} should return a value")
-
+                    }))
-                self.build_byte_swap(value)
-            }
-            AddressSpace::Storage | AddressSpace::TransientStorage => {
-                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
@@ -847,60 +812,13 @@ where
     {
         match pointer.address_space {
             AddressSpace::Heap => {
-                let heap_pointer = self.build_heap_gep(
+                let declaration =
-                    self.builder().build_ptr_to_int(
+                    <PolkaVMStoreHeapWordFunction as RuntimeFunction<D>>::declaration(self);
-                        pointer.value,
+                let arguments = [
-                        self.xlen_type(),
+                    pointer.to_int(self).as_basic_value_enum(),
-                        "offset_ptrtoint",
+                    value.as_basic_value_enum(),
-                    )?,
+                ];
-                    value
+                self.build_call(declaration, &arguments, "heap_store");
-                        .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 => {
-                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();
@@ -946,9 +864,6 @@ where
     where
         T: BasicType<'ctx>,
     {
-        assert_ne!(pointer.address_space, AddressSpace::Storage);
-        assert_ne!(pointer.address_space, AddressSpace::TransientStorage);
-
         let value = unsafe {
             self.builder
                 .build_gep(pointer.r#type, pointer.value, indexes, name)
@@ -1115,38 +1030,16 @@ where
         offset: inkwell::values::IntValue<'ctx>,
         length: inkwell::values::IntValue<'ctx>,
     ) -> anyhow::Result<()> {
-        let offset_truncated = self.safe_truncate_int_to_xlen(offset)?;
+        self.build_call(
-        let length_truncated = self.safe_truncate_int_to_xlen(length)?;
+            <Exit as RuntimeFunction<D>>::declaration(self),
-        let offset_into_heap = self.build_heap_gep(offset_truncated, length_truncated)?;
+            &[flags.into(), offset.into(), length.into()],
-
+            "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>,
@@ -1160,29 +1053,19 @@ where
             "expected XLEN or WORD sized int type for memory offset",
         );
 
-        let truncated =
+        Ok(self
-            self.builder()
+            .build_call(
-                .build_int_truncate(value, self.xlen_type(), "offset_truncated")?;
+                <WordToPointer as RuntimeFunction<D>>::declaration(self),
-        let extended =
+                &[value.into()],
-            self.builder()
+                "word_to_pointer",
-                .build_int_z_extend(truncated, self.word_type(), "offset_extended")?;
+            )
-        let is_overflow = self.builder().build_int_compare(
+            .unwrap_or_else(|| {
-            inkwell::IntPredicate::NE,
+                panic!(
-            value,
+                    "revive runtime function {} should return a value",
-            extended,
+                    <WordToPointer as RuntimeFunction<D>>::NAME,
-            "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`.
@@ -1222,34 +1105,6 @@ where
         Ok(memory_size_value.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",
-        )?;
-
-        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
     /// enough memory if `offset + length` would be out of bounds.
     /// # Panics
@@ -1262,19 +1117,8 @@ where
         assert_eq!(offset.get_type(), self.xlen_type());
         assert_eq!(length.get_type(), self.xlen_type());
 
-        self.build_heap_alloc(offset, length)?;
+        let pointer = self.build_sbrk(offset, length)?;
-
+        Ok(Pointer::new(self.byte_type(), AddressSpace::Stack, pointer))
-        let heap_start = self
-            .module()
-            .get_global(revive_runtime_api::polkavm_imports::MEMORY)
-            .expect("the memory symbol should have been declared")
-            .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.
@@ -1445,13 +1289,6 @@ where
                     inkwell::attributes::AttributeLoc::Param(index as u32),
                     self.llvm.create_enum_attribute(Attribute::NoFree as u32, 0),
                 );
-                if function == self.llvm_runtime().sha3 {
-                    call_site_value.add_attribute(
-                        inkwell::attributes::AttributeLoc::Param(index as u32),
-                        self.llvm
-                            .create_enum_attribute(Attribute::ReadOnly as u32, 0),
-                    );
-                }
                 if Some(argument.get_type()) == function.r#type.get_return_type() {
                     if function
                         .r#type
@@ -1580,4 +1417,8 @@ 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/heap.rs

@@ -0,0 +1,110 @@
+//! 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/mod.rs

@@ -7,6 +7,9 @@ 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/storage.rs

@@ -0,0 +1,135 @@
+//! 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

@@ -0,0 +1,113 @@
+//! 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,8 +2,13 @@
 
 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>(
@@ -59,11 +64,11 @@ pub fn division<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    wrapped_division(context, operand_2, || {
+    let name = <PolkaVMDivisionFunction as RuntimeFunction<D>>::NAME;
-        Ok(context
+    let declaration = <PolkaVMDivisionFunction as RuntimeFunction<D>>::declaration(context);
-            .builder()
+    Ok(context
-            .build_int_unsigned_div(operand_1, operand_2, "DIV")?)
+        .build_call(declaration, &[operand_1.into(), operand_2.into()], "div")
-    })
+        .unwrap_or_else(|| panic!("revive runtime function {name} should return a value",)))
 }
 
 /// Translates the arithmetic remainder.
@@ -75,11 +80,11 @@ pub fn remainder<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    wrapped_division(context, operand_2, || {
+    let name = <PolkaVMRemainderFunction as RuntimeFunction<D>>::NAME;
-        Ok(context
+    let declaration = <PolkaVMRemainderFunction as RuntimeFunction<D>>::declaration(context);
-            .builder()
+    Ok(context
-            .build_int_unsigned_rem(operand_1, operand_2, "MOD")?)
+        .build_call(declaration, &[operand_1.into(), operand_2.into()], "rem")
-    })
+        .unwrap_or_else(|| panic!("revive runtime function {name} should return a value",)))
 }
 
 /// Translates the signed arithmetic division.
@@ -94,54 +99,11 @@ pub fn division_signed<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    assert_eq!(
+    let name = <PolkaVMSignedDivisionFunction as RuntimeFunction<D>>::NAME;
-        operand_2.get_type().get_bit_width(),
+    let declaration = <PolkaVMSignedDivisionFunction as RuntimeFunction<D>>::declaration(context);
-        revive_common::BIT_LENGTH_WORD as u32
+    Ok(context
-    );
+        .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.
@@ -153,53 +115,9 @@ pub fn remainder_signed<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    wrapped_division(context, operand_2, || {
+    let name = <PolkaVMSignedRemainderFunction as RuntimeFunction<D>>::NAME;
-        Ok(context
+    let declaration = <PolkaVMSignedRemainderFunction as RuntimeFunction<D>>::declaration(context);
-            .builder()
+    Ok(context
-            .build_int_signed_rem(operand_1, operand_2, "SMOD")?)
+        .build_call(declaration, &[operand_1.into(), operand_2.into()], "srem")
-    })
+        .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,84 +2,183 @@
 
 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: Vec<inkwell::values::IntValue<'ctx>>,
+    topics: [inkwell::values::BasicValueEnum<'ctx>; N],
 ) -> anyhow::Result<()>
 where
     D: Dependency + Clone,
 {
-    let input_offset = context.safe_truncate_int_to_xlen(input_offset)?;
+    let declaration = <EventLog<N> as RuntimeFunction<D>>::declaration(context);
-    let input_length = context.safe_truncate_int_to_xlen(input_length)?;
+    let mut arguments = vec![
-    let input_pointer = context.builder().build_ptr_to_int(
+        context.safe_truncate_int_to_xlen(input_offset)?.into(),
-        context.build_heap_gep(input_offset, input_length)?.value,
+        context.safe_truncate_int_to_xlen(input_length)?.into(),
-        context.xlen_type(),
+    ];
-        "event_input_offset",
+    arguments.extend_from_slice(&topics);
-    )?;
+    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,10 +4,206 @@ 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.
 ///
@@ -27,14 +223,15 @@ 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(runtime::FUNCTION_LOAD_IMMUTABLE_DATA)
+                    .get_function(name)
                     .expect("is always declared for runtime code")
                     .borrow()
                     .declaration(),
                 &[],
-                runtime::FUNCTION_LOAD_IMMUTABLE_DATA,
+                name,
             );
             load_from_memory(context, index)
         }

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

@@ -85,5 +85,14 @@ where
         offset,
         "mstore8_destination",
     );
-    context.build_store(pointer, value)
+    let pointer = context.build_sbrk(
+        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::pointer::Pointer;
+use crate::polkavm::context::runtime::RuntimeFunction;
 use crate::polkavm::context::Context;
+use crate::polkavm::evm::immutable::Store;
 use crate::polkavm::Dependency;
 
 /// Translates the `return` instruction.
@@ -18,55 +18,11 @@ where
     match context.code_type() {
         None => anyhow::bail!("Return is not available if the contract part is undefined"),
         Some(CodeType::Deploy) => {
-            let immutable_data_size_pointer = context
+            context.build_call(
-                .get_global(revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_SIZE)?
+                <Store as RuntimeFunction<D>>::declaration(context),
-                .value
+                Default::default(),
-                .as_pointer_value();
+                "store_immutable_data",
-            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) => {}
     }
@@ -100,11 +56,7 @@ pub fn stop<D>(context: &mut Context<D>) -> anyhow::Result<()>
 where
     D: Dependency + Clone,
 {
-    r#return(
+    r#return(context, context.word_const(0), context.word_const(0))
-        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,8 +1,10 @@
 //! Translates the storage operations.
 
-use crate::polkavm::context::address_space::AddressSpace;
+use crate::polkavm::context::runtime::RuntimeFunction;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
+use crate::PolkaVMLoadStorageWordFunction;
+use crate::PolkaVMStoreStorageWordFunction;
 
 /// Translates the storage load.
 pub fn load<'ctx, D>(
@@ -12,10 +14,12 @@ pub fn load<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let mut slot_ptr = context.build_alloca_at_entry(context.word_type(), "slot_pointer");
+    let name = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::NAME;
-    slot_ptr.address_space = AddressSpace::Storage;
+    let declaration = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    context.builder().build_store(slot_ptr.value, position)?;
+    let arguments = [context.xlen_type().const_zero().into(), position.into()];
-    context.build_load(slot_ptr, "storage_load_value")
+    Ok(context
+        .build_call(declaration, &arguments, "storage_load")
+        .unwrap_or_else(|| panic!("runtime function {name} should return a value")))
 }
 
 /// Translates the storage store.
@@ -27,10 +31,13 @@ pub fn store<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let mut slot_ptr = context.build_alloca_at_entry(context.word_type(), "slot_pointer");
+    let declaration = <PolkaVMStoreStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    slot_ptr.address_space = AddressSpace::Storage;
+    let arguments = [
-    context.builder().build_store(slot_ptr.value, position)?;
+        context.xlen_type().const_zero().into(),
-    context.build_store(slot_ptr, value)?;
+        position.into(),
+        value.into(),
+    ];
+    context.build_call(declaration, &arguments, "storage_store");
     Ok(())
 }
 
@@ -42,10 +49,15 @@ pub fn transient_load<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let mut slot_ptr = context.build_alloca_at_entry(context.word_type(), "slot_pointer");
+    let name = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::NAME;
-    slot_ptr.address_space = AddressSpace::TransientStorage;
+    let declaration = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    context.builder().build_store(slot_ptr.value, position)?;
+    let arguments = [
-    context.build_load(slot_ptr, "transient_storage_load_value")
+        context.xlen_type().const_int(1, false).into(),
+        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.
@@ -57,9 +69,12 @@ pub fn transient_store<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let mut slot_ptr = context.build_alloca_at_entry(context.word_type(), "slot_pointer");
+    let declaration = <PolkaVMStoreStorageWordFunction 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_store(slot_ptr, value)?;
+        position.into(),
+        value.into(),
+    ];
+    context.build_call(declaration, &arguments, "storage_store");
     Ok(())
 }

crates/runner/Cargo.toml

@@ -34,3 +34,4 @@ 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,6 +274,7 @@ 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

@@ -13,18 +13,18 @@ uint32_t __memory_size = 0;
 
 void * __sbrk_internal(uint32_t offset, uint32_t size) {
     if (offset >= MAX_MEMORY_SIZE || size > MAX_MEMORY_SIZE) {
-        return NULL;
+        POLKAVM_TRAP();
     }
 
     uint32_t new_size = ALIGN(offset + size);
     if (new_size > MAX_MEMORY_SIZE) {
-        return NULL;
+        POLKAVM_TRAP();
     }
     if (new_size > __memory_size) {
         __memory_size = new_size;
     }
 
-    return (void *)&__memory[__memory_size];
+    return (void *)&__memory[offset];
 }
 
 void * memset(void *b, int c, size_t len) {

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

@@ -40,6 +40,9 @@ pub enum Flag {
     /// The assembly code
     #[serde(rename = "evm.assembly")]
     Assembly,
+    /// The Ir
+    #[serde(rename = "ir")]
+    Ir,
 }
 
 impl std::fmt::Display for Flag {
@@ -57,6 +60,7 @@ 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)]
+#[derive(Debug, Default, Serialize, Deserialize, PartialEq)]
 pub struct File {
     /// The per-file output selections.
     #[serde(rename = "", skip_serializing_if = "Option::is_none")]
@@ -45,6 +45,7 @@ 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,17 +2,22 @@
 
 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, Default, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, Default, PartialEq)]
 pub struct Selection {
     /// Only the 'all' wildcard is available for robustness reasons.
     #[serde(rename = "*", skip_serializing_if = "Option::is_none")]
-    pub all: Option<FileSelection>,
+    all: Option<FileSelection>,
+
+    #[serde(skip_serializing_if = "BTreeMap::is_empty", flatten)]
+    pub files: BTreeMap<String, FileSelection>,
 }
 
 impl Selection {
@@ -20,6 +25,7 @@ impl Selection {
     pub fn new_required() -> Self {
         Self {
             all: Some(FileSelection::new_required()),
+            files: BTreeMap::new(),
         }
     }
 
@@ -28,6 +34,66 @@ 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,6 +32,9 @@ 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,6 +6,7 @@ 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;
@@ -31,6 +32,7 @@ struct CachedBlob {
     contract_name: String,
     solidity: String,
     solc_optimizer_enabled: bool,
+    opt: String,
 }
 
 /// Checks if the required executables are present in `${PATH}`.
@@ -254,7 +256,12 @@ 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(contract_name, source_code, true)
+    compile_blob_with_options(
+        contract_name,
+        source_code,
+        true,
+        OptimizerSettings::cycles(),
+    )
 }
 
 /// Compile the EVM bin-runtime of `contract_name` found in given `source_code`.
@@ -283,6 +290,7 @@ fn compile_evm(
         contract_name: contract_name.to_owned(),
         solidity: source_code.to_owned(),
         solc_optimizer_enabled,
+        opt: String::new(),
     };
 
     let cache = if runtime {
@@ -322,11 +330,13 @@ 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) {
@@ -338,7 +348,7 @@ pub fn compile_blob_with_options(
         [(file_name.into(), source_code.into())].into(),
         Default::default(),
         None,
-        revive_llvm_context::OptimizerSettings::cycles(),
+        optimizer_settings,
         solc_optimizer_enabled,
     )
     .expect("source should compile")

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,10 +682,7 @@ 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)
             }
@@ -695,10 +692,7 @@ impl FunctionCall {
                     context,
                     arguments[0].into_int_value(),
                     arguments[1].into_int_value(),
-                    arguments[2..]
+                    [arguments[2], arguments[3]],
-                        .iter()
-                        .map(|argument| argument.into_int_value())
-                        .collect(),
                 )
                 .map(|_| None)
             }
@@ -708,10 +702,7 @@ impl FunctionCall {
                     context,
                     arguments[0].into_int_value(),
                     arguments[1].into_int_value(),
-                    arguments[2..]
+                    [arguments[2], arguments[3], arguments[4]],
-                        .iter()
-                        .map(|argument| argument.into_int_value())
-                        .collect(),
                 )
                 .map(|_| None)
             }
@@ -721,10 +712,7 @@ impl FunctionCall {
                     context,
                     arguments[0].into_int_value(),
                     arguments[1].into_int_value(),
-                    arguments[2..]
+                    [arguments[2], arguments[3], arguments[4], arguments[5]],
-                        .iter()
-                        .map(|argument| argument.into_int_value())
-                        .collect(),
                 )
                 .map(|_| None)
             }

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(),
+            &self.attributes.clone().into_iter().collect::<Vec<_>>(),
             true,
         );
         function

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

@@ -185,7 +185,28 @@ where
         &mut self,
         context: &mut revive_llvm_context::PolkaVMContext<D>,
     ) -> anyhow::Result<()> {
-        revive_llvm_context::PolkaVMImmutableDataLoadFunction.declare(context)?;
+        revive_llvm_context::PolkaVMLoadImmutableDataFunction.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)?;
 
@@ -202,7 +223,6 @@ where
             revive_llvm_context::PolkaVMFunctionDeployCode,
             revive_llvm_context::PolkaVMFunctionRuntimeCode,
             revive_llvm_context::PolkaVMFunctionEntry,
-            revive_llvm_context::PolkaVMFunctionImmutableDataLoad,
         ]
         .into_iter()
         {
@@ -215,6 +235,28 @@ 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(())
     }
 
@@ -230,7 +272,6 @@ 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)?;