bump PVM

Signed-off-by: xermicus <cyrill@parity.io>

.cargo/config.toml

@@ -10,8 +10,8 @@ rustflags = [
     "-Clink-arg=-sWASM_ASYNC_COMPILATION=0",
     "-Clink-arg=-sDYNAMIC_EXECUTION=0",
     "-Clink-arg=-sALLOW_TABLE_GROWTH=1",
-    "-Clink-arg=--js-library=js/emscripten/embed/soljson_interface.js",
-    "-Clink-arg=--pre-js=js/emscripten/embed/pre.js",
+    "-Clink-arg=--js-library=js/embed/soljson_interface.js",
+    "-Clink-arg=--pre-js=js/embed/pre.js",
     "-Clink-arg=-sSTACK_SIZE=128kb",
     "-Clink-arg=-sNODEJS_CATCH_EXIT=0"
 ]

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

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

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

@@ -1,70 +0,0 @@
-# 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

@@ -1,36 +0,0 @@
-name: "Install Solidity Compiler"
-description: "Installs the Ethereum solc Solidity compiler frontend executable"
-
-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.30/${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/scripts/json_generator.py

@@ -1,175 +0,0 @@
-#!/usr/bin/env python3
-"""
-This script generates JSON files for different platforms based on GitHub release data.
-It fetches release information from a specified GitHub repository and tag,
-parses the release assets, and generates JSON files for each platform with relevant metadata.
-It also handles checksum files and updates a list.json file for each platform.
-It requires the GITHUB_TOKEN environment variable to be set for authentication.
-Usage:
-    python json_generator.py <repo> <tag>
-"""
-import os
-import sys
-import json
-import requests
-
-def validate_github_token():
-    """Validate that GITHUB_TOKEN environment variable is set."""
-    if 'GITHUB_TOKEN' not in os.environ:
-        print("Error: GITHUB_TOKEN environment variable is not set.")
-        sys.exit(1)
-
-def fetch_release_data(repo, tag):
-    """Fetch release data from GitHub API."""
-    url = f"https://api.github.com/repos/{repo}/releases/tags/{tag}"
-    headers = {
-        'Authorization': f"Bearer {os.environ['GITHUB_TOKEN']}",
-        'Accept': 'application/vnd.github+json',
-        'X-GitHub-Api-Version': '2022-11-28'
-    }
-
-    try:
-        response = requests.get(url, headers=headers)
-        response.raise_for_status()
-        return response.json()
-    except requests.RequestException as e:
-        print(f"Error fetching release data: {e}")
-        sys.exit(1)
-
-def fetch_checksum_file(release_data):
-    """
-    Fetch the checksum.txt file from the release assets
-    and parse it into a dictionary mapping file names to their SHA256 checksums.
-    """
-    checksums = {}
-
-    # Find the checksum.txt asset URL
-    checksum_asset = None
-    for asset in release_data['assets']:
-        if asset['name'] == 'checksums.txt':
-            checksum_asset = asset
-            break
-
-    if not checksum_asset:
-        print("Warning: checksum.txt file not found in release assets.")
-        return checksums
-
-    # Download the checksum file
-    headers = {
-        'Authorization': f"Bearer {os.environ['GITHUB_TOKEN']}",
-        'Accept': 'application/octet-stream'
-    }
-
-    try:
-        response = requests.get(checksum_asset['browser_download_url'], headers=headers)
-        response.raise_for_status()
-
-        # Parse checksum file
-        for line in response.text.splitlines():
-            if line.strip():
-                checksum, filename = line.strip().split(None, 1)
-                checksums[filename] = checksum
-
-        return checksums
-    except requests.RequestException as e:
-        print(f"Error fetching checksum file: {e}")
-        return checksums
-    except Exception as e:
-        print(f"Error parsing checksum file: {e}")
-        return checksums
-
-def extract_build_hash(target_commitish):
-    """Extract the first 8 characters of the commit hash."""
-    return f"commit.{target_commitish[:8]}"
-
-def generate_asset_json(release_data, asset, checksums):
-    """Generate JSON for a specific asset."""
-    version = release_data['tag_name'].lstrip('v')
-    build = extract_build_hash(release_data['target_commitish'])
-    long_version = f"{version}+{build}"
-
-    # Get SHA256 checksum if available
-    sha256 = checksums.get(asset['name'], "")
-
-    return {
-        "name": asset['name'],
-        "version": version,
-        "build": build,
-        "longVersion": long_version,
-        "url": asset['browser_download_url'],
-        "sha256": sha256,
-        "firstSolcVersion": os.environ.get("FIRST_SOLC_VERSION", ""),
-        "lastSolcVersion": os.environ.get("LAST_SOLC_VERSION", "")
-    }
-
-def save_platform_json(platform_folder, asset_json, tag):
-    """Save asset JSON and update list.json for a specific platform."""
-    # Create platform folder if it doesn't exist
-    os.makedirs(platform_folder, exist_ok=True)
-
-    # Update or create list.json
-    list_file_path = os.path.join(platform_folder, "list.json")
-
-    if os.path.exists(list_file_path):
-        with open(list_file_path, 'r') as f:
-            try:
-                list_data = json.load(f)
-            except json.JSONDecodeError:
-                list_data = {"builds": [], "releases": {}, "latestRelease": ""}
-    else:
-        list_data = {"builds": [], "releases": {}, "latestRelease": ""}
-
-    # Remove any existing entry with the same path
-    list_data['builds'] = [
-        build for build in list_data['builds']
-        if build['version'] != asset_json['version']
-    ]
-    # Add the new build
-    list_data['builds'].append(asset_json)
-
-    # Update releases
-    version = asset_json['version']
-    list_data['releases'][version] = f"{asset_json['name']}+{asset_json['longVersion']}"
-
-    # Update latest release
-    list_data['latestRelease'] = version
-
-    with open(list_file_path, 'w') as f:
-        json.dump(list_data, f, indent=4)
-
-def main():
-    # Validate arguments
-    if len(sys.argv) != 3:
-        print("Usage: python script.py <repo> <tag>")
-        sys.exit(1)
-
-    repo, tag = sys.argv[1], sys.argv[2]
-
-    # Validate GitHub token
-    validate_github_token()
-
-    # Fetch release data
-    release_data = fetch_release_data(repo, tag)
-
-    # Fetch checksums
-    checksums = fetch_checksum_file(release_data)
-
-    # Mapping of asset names to platform folders
-    platform_mapping = {
-        'resolc-x86_64-unknown-linux-musl': 'linux',
-        'resolc-universal-apple-darwin': 'macos',
-        'resolc-x86_64-pc-windows-msvc.exe': 'windows',
-        'resolc_web.js': 'wasm'
-    }
-
-    # Process each asset
-    for asset in release_data['assets']:
-        platform_name = platform_mapping.get(asset['name'])
-        if platform_name:
-            platform_folder = os.path.join(platform_name)
-            asset_json = generate_asset_json(release_data, asset, checksums)
-            save_platform_json(platform_folder, asset_json, tag)
-            print(f"Processed {asset['name']} for {platform_name}")
-
-if __name__ == "__main__":
-    main()

.github/scripts/json_generator_nightly.py

@@ -1,155 +0,0 @@
-#!/usr/bin/env python3
-"""
-This script generates JSON files for different platforms based on GitHub data.
-Requires the GITHUB_SHA, FIRST_SOLC_VERSION, LAST_SOLC_VERSION, TAG and FILEPATH environment variables to be set.
-Usage:
-    python json_generator_nightly.py
-"""
-import os
-import sys
-import json
-from datetime import datetime
-
-def validate_env_variables():
-    """Validate that environment variables are set."""
-    if "GITHUB_SHA" not in os.environ:
-        print("Error: GITHUB_SHA environment variable is not set.")
-        sys.exit(1)
-    if "FIRST_SOLC_VERSION" not in os.environ:
-        print("Error: FIRST_SOLC_VERSION environment variable is not set.")
-        sys.exit(1)
-    if "LAST_SOLC_VERSION" not in os.environ:
-        print("Error: LAST_SOLC_VERSION environment variable is not set.")
-        sys.exit(1)
-    if "TAG" not in os.environ:
-        print("Error: TAG environment variable is not set.")
-        sys.exit(1)
-    if "FILEPATH" not in os.environ:
-        print("Error: FILEPATH environment variable is not set.")
-        sys.exit(1)
-
-
-def fetch_data_file():
-    """
-    Fetch the data.json file with artifacts urls and sha256 checksums
-    and parse it into a single dictionary mapping artifact names to their URLs and SHAs.
-    """
-    # read data.json file
-    artifacts_data = {}
-    data_file_path = os.environ["FILEPATH"]
-    if not os.path.exists(data_file_path):
-        print("Error: data.json file not found.")
-        sys.exit(1)
-    with open(data_file_path, 'r') as f:
-        try:
-            artifacts_data = json.load(f)
-        except json.JSONDecodeError:
-            print("Error: data.json file is not a valid JSON.")
-            sys.exit(1)
-
-    result = {}
-
-    for item in artifacts_data:
-        for key, value in item.items():
-            if key.endswith('_url'):
-                base_key = key.rsplit('_url', 1)[0]
-                if base_key not in result:
-                    result[base_key] = {}
-                result[base_key]['url'] = value
-            elif key.endswith('_sha'):
-                base_key = key.rsplit('_sha', 1)[0]
-                if base_key not in result:
-                    result[base_key] = {}
-                result[base_key]['sha'] = value
-
-    return result
-
-
-
-
-
-def extract_build_hash():
-    """Extract the first 8 characters of the commit hash."""
-    sha = os.environ.get("GITHUB_SHA")
-    return f"commit.{sha[:8]}"
-
-def generate_asset_json_nightly(name, url, checksum):
-    """Generate JSON for a specific asset."""
-    # Date in format YYYY-MM-DD
-    date = datetime.now().strftime("%Y.%-m.%-d")
-    last_version = os.environ.get("TAG").replace('v','')
-    version = f"{last_version}-nightly.{date}"
-    SHA = os.environ.get("GITHUB_SHA", "")[:8]
-    build = f"commit.{SHA}"
-    long_version = f"{version}+{build}"
-
-    return {
-        "name": name,
-        "version": version,
-        "build": build,
-        "longVersion": long_version,
-        "url": url,
-        "sha256": checksum,
-        "firstSolcVersion": os.environ.get("FIRST_SOLC_VERSION"),
-        "lastSolcVersion": os.environ.get("LAST_SOLC_VERSION")
-    }
-
-def save_platform_json(platform_folder, asset_json):
-    """Save asset JSON and update list.json for a specific platform."""
-    # Create platform folder if it doesn't exist
-    os.makedirs(platform_folder, exist_ok=True)
-
-    # Update or create list.json
-    list_file_path = os.path.join(platform_folder, "list.json")
-
-    if os.path.exists(list_file_path):
-        with open(list_file_path, 'r') as f:
-            try:
-                list_data = json.load(f)
-            except json.JSONDecodeError:
-                list_data = {"builds": [], "releases": {}, "latestRelease": ""}
-    else:
-        list_data = {"builds": [], "releases": {}, "latestRelease": ""}
-
-    # Remove any existing entry with the same path
-    list_data['builds'] = [
-        build for build in list_data['builds']
-        if build['version'] != asset_json['version']
-    ]
-    # Add the new build
-    list_data['builds'].append(asset_json)
-
-    # Update releases
-    version = asset_json['version']
-    list_data['releases'][version] = f"{asset_json['name']}+{asset_json['longVersion']}"
-
-    # Update latest release
-    list_data['latestRelease'] = version
-
-    with open(list_file_path, 'w') as f:
-        json.dump(list_data, f, indent=4)
-
-def main():
-
-    validate_env_variables()
-    data = fetch_data_file()
-
-    # Mapping of asset names to platform folders
-    platform_mapping = {
-        'resolc-x86_64-unknown-linux-musl': 'linux',
-        'resolc-universal-apple-darwin': 'macos',
-        'resolc-x86_64-pc-windows-msvc': 'windows',
-        'resolc-web.js': 'wasm'
-    }
-
-    # Process each asset
-    for asset in data.keys():
-        platform_name = platform_mapping.get(asset)
-        if platform_name:
-            platform_folder = os.path.join(platform_name)
-            asset_json = generate_asset_json_nightly(asset, data[asset]['url'], data[asset]['sha'])
-            save_platform_json(platform_folder, asset_json)
-            print(f"Processed {asset} for {platform_name}")
-
-if __name__ == "__main__":
-    main()

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

@@ -0,0 +1,143 @@
+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
+  BUN_VERSION: 1.1.43
+
+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 Bun on Windows
+        if: runner.os == 'Windows'
+        run: |
+          Set-ExecutionPolicy RemoteSigned -Scope CurrentUser
+          iex (new-object net.webclient).downloadstring('https://get.scoop.sh')
+          scoop install bun@${{ env.BUN_VERSION }}
+          scoop install wget
+          Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH
+
+      - name: Install Bun on macOS and Linux
+        if: runner.os != 'Windows'
+        run: |
+          curl -fsSL https://bun.sh/install | bash -s bun-v${{ env.BUN_VERSION }}
+          echo "$HOME/.bun/bin" >> $GITHUB_PATH
+
+      - name: Install packages
+        run: npm install
+
+      - 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/generate_versions.yml

@@ -1,64 +0,0 @@
-name: Generate JSON for resolc-bin
-on:
-  release:
-    types: [published]
-
-jobs:
-  generateJson:
-    runs-on: ubuntu-latest
-    if: contains(github.event.release.tag_name, 'llvm') == false
-    environment: tags
-    env:
-      # the token is needed for json_generator.py
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          path: tmp
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          repository: paritytech/resolc-bin
-          path: resolc-bin
-
-      - uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ secrets.REVIVE_JSON_APP_ID }}
-          private-key: ${{ secrets.REVIVE_JSON_APP_KEY }}
-          owner: paritytech
-          repositories: resolc-bin
-
-      - name: Generate json and push
-        env:
-          TOKEN: ${{ steps.app-token.outputs.token }}
-          APP_NAME: "paritytech-revive-json"
-          Green: "\e[32m"
-          NC: "\e[0m"
-        run: |
-          sudo apt-get update && sudo apt-get install -y wget
-          wget https://github.com/${GITHUB_REPOSITORY}/releases/download/${GITHUB_REF_NAME}/resolc-x86_64-unknown-linux-musl
-          chmod +x resolc-x86_64-unknown-linux-musl
-          export FIRST_SOLC_VERSION=$(./resolc-x86_64-unknown-linux-musl --supported-solc-versions | cut -f 1 -d "," | tr -d ">=")
-          export LAST_SOLC_VERSION=$(./resolc-x86_64-unknown-linux-musl --supported-solc-versions | cut -f 2 -d "," | tr -d "<=")
-
-          cd resolc-bin
-          python ../tmp/.github/scripts/json_generator.py ${GITHUB_REPOSITORY} ${{ github.event.release.tag_name }}
-
-          echo "${Green}Add new remote with gh app token${NC}"
-          git remote set-url origin $(git config remote.origin.url | sed "s/github.com/${APP_NAME}:${TOKEN}@github.com/g")
-
-          echo "${Green}Remove http section that causes issues with gh app auth token${NC}"
-          sed -i.bak '/\[http/d' ./.git/config
-          sed -i.bak '/extraheader/d' ./.git/config
-
-          git config user.email "ci@parity.io"
-          git config user.name "${APP_NAME}"
-
-          git add .
-          git commit -m "Update json"
-          git push origin main
-
-          echo "::notice::info.list files were successfully published to https://github.com/paritytech/resolc-bin"

.github/workflows/release-llvm.yml

@@ -1,137 +0,0 @@
-name: Release LLVM
-on:
-  workflow_dispatch:
-    inputs:
-      llvm_version:
-        type: string
-        required: true
-        description: llvm version in "x.x.x" format, e.g. "18.1.8"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  create-release-draft:
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: write
-    outputs:
-      version: ${{ steps.resolve-version.outputs.version }}
-    steps:
-      - id: resolve-version
-        run: |
-          echo "version=llvm-${{ inputs.llvm_version }}-revive.${GITHUB_SHA:0:7}" >> $GITHUB_OUTPUT
-
-      - name: Create Release
-        uses: softprops/action-gh-release@v2
-        with:
-          name: ${{ steps.resolve-version.outputs.version }}
-          body: "LLVM is a dependency of revive. The LLVM releases are used by our CI to build revive."
-          draft: true
-          tag_name: ${{ steps.resolve-version.outputs.version }}
-
-  build:
-    strategy:
-      matrix:
-        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:
-          - target: x86_64-unknown-linux-gnu
-            builder-arg: gnu
-            host: linux
-            runner: parity-large
-          - target: x86_64-unknown-linux-musl
-            builder-arg: musl
-            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
-        with:
-          # without this it will override our rust flags
-          rustflags: ""
-          cache-key: ${{ matrix.target }}
-
-      - name: Install Dependencies
-        if: ${{ matrix.host == 'linux' }}
-        run: |
-          sudo apt-get update && sudo apt-get install -y cmake ninja-build curl git libssl-dev pkg-config clang lld musl
-
-      - name: Install Dependencies
-        if: ${{ matrix.host == 'macos' }}
-        run: |
-          brew install ninja
-
-      - name: Install Dependencies
-        if: ${{ matrix.host == 'windows' }}
-        run: |
-          choco install ninja
-
-      - name: Install LLVM Builder
-        run: |
-          cargo install --locked --force --path crates/llvm-builder
-
-      - name: Clone LLVM
-        run: |
-          revive-llvm --target-env ${{ matrix.builder-arg }} clone
-
-      - name: Build LLVM
-        if: ${{ matrix.target != 'wasm32-unknown-emscripten' }}
-        run: |
-          revive-llvm --target-env ${{ matrix.builder-arg }} build --llvm-projects lld --llvm-projects clang
-
-      - name: Build LLVM
-        if: ${{ matrix.target == 'wasm32-unknown-emscripten' }}
-        run: |
-          source emsdk/emsdk_env.sh
-          revive-llvm --target-env ${{ matrix.builder-arg }} build --llvm-projects lld
-
-      - name: Remove Unnecessary Binaries
-        shell: bash
-        run: |
-          cd target-llvm/${{ matrix.builder-arg }}/target-final/bin/
-          rm -f diagtool* llvm-libtool-darwin* llvm-lipo* llvm-pdbutil* llvm-dwarfdump* llvm-nm* llvm-readobj* llvm-cfi-verify* \
-              sancov* llvm-debuginfo-analyzer* llvm-objdump* llvm-profgen* llvm-extract* llvm-jitlink* llvm-c-test* llvm-gsymutil* llvm-dwp* \
-              dsymutil* llvm-dwarfutil* llvm-exegesis* lli clang-rename* bugpoint* clang-extdef-mapping* clang-refactor* c-index-test* \
-              llvm-reduce* llvm-lto* clang-linker-wrapper* llc* llvm-lto2* llvm-otool* llvm-readelf* \
-              clang-repl* clang-check* clang-scan-deps*
-          cd -
-
-      - name: Package Artifact
-        shell: bash
-        run: |
-          mv target-llvm/${{ matrix.builder-arg }}/target-final/ llvm-${{ matrix.target }}
-          tar -czf "${{ needs.create-release-draft.outputs.version }}-${{ matrix.target }}.tar.gz" llvm-${{ matrix.target }}
-
-      - name: Add Artifact to Release
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: ${{ needs.create-release-draft.outputs.version }}
-          draft: true
-          files: |
-            ${{ needs.create-release-draft.outputs.version }}-${{ matrix.target }}.tar.gz

.github/workflows/release-nightly.yml

@@ -1,385 +0,0 @@
-name: Nightly Release
-on:
-  schedule:
-    # Run every day at 01:00 UTC
-    - cron: "0 1 * * *"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  CARGO_TERM_COLOR: always
-  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:c0154e992adb791c3b848dd008939d19862549204f8cb26f5ca7a00f629e6067
-
-jobs:
-  # check if there were commits yesterday
-  check_commits:
-    runs-on: ubuntu-latest
-    outputs:
-      has_commits: ${{ steps.check_commits.outputs.has_commits }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0 # Fetch full history to check previous commits
-          ref: "main"
-
-      - name: Check for commits from yesterday
-        id: check_commits
-        run: |
-          # Get yesterday's date in YYYY-MM-DD format
-          YESTERDAY=$(date -d "yesterday" +%Y-%m-%d)
-          echo "Checking for commits from: $YESTERDAY"
-
-          # Check if there were any commits yesterday
-          COMMIT_COUNT=$(git log --oneline --since="$YESTERDAY 00:00:00" --until="$YESTERDAY 23:59:59" | wc -l)
-
-          echo "Found $COMMIT_COUNT commits from yesterday"
-
-          if [ $COMMIT_COUNT -gt 0 ]; then
-            echo "has_commits=true" >> $GITHUB_OUTPUT
-            echo "✅ Found $COMMIT_COUNT commits from yesterday - continuing workflow"
-          else
-            echo "has_commits=false" >> $GITHUB_OUTPUT
-            echo "❌ No commits found from yesterday - skipping remaining steps"
-            echo "::notice::❌ No commits found from yesterday - skipping remaining steps"
-          fi
-
-  build:
-    # github actions matrix jobs don't support multiple outputs
-    # ugly workaround from https://github.com/orgs/community/discussions/17245#discussioncomment-11222880
-    if: ${{ needs.check_commits.outputs.has_commits == 'true' }}
-    outputs:
-      resolc-x86_64-unknown-linux-musl_url: ${{ steps.set-output.outputs.resolc-x86_64-unknown-linux-musl_url }}
-      resolc-x86_64-unknown-linux-musl_sha: ${{ steps.set-output.outputs.resolc-x86_64-unknown-linux-musl_sha }}
-      resolc-aarch64-apple-darwin_url: ${{ steps.set-output.outputs.resolc-aarch64-apple-darwin_url }}
-      resolc-aarch64-apple-darwin_sha: ${{ steps.set-output.outputs.resolc-aarch64-apple-darwin_sha }}
-      resolc-x86_64-apple-darwin_url: ${{ steps.set-output.outputs.resolc-x86_64-apple-darwin_url }}
-      resolc-x86_64-apple-darwin_sha: ${{ steps.set-output.outputs.resolc-x86_64-apple-darwin_sha }}
-      resolc-x86_64-pc-windows-msvc_url: ${{ steps.set-output.outputs.resolc-x86_64-pc-windows-msvc_url }}
-      resolc-x86_64-pc-windows-msvc_sha: ${{ steps.set-output.outputs.resolc-x86_64-pc-windows-msvc_sha }}
-    strategy:
-      matrix:
-        target:
-          [
-            x86_64-unknown-linux-musl,
-            aarch64-apple-darwin,
-            x86_64-apple-darwin,
-            x86_64-pc-windows-msvc,
-          ]
-        include:
-          - target: x86_64-unknown-linux-musl
-            type: musl
-            runner: ubuntu-24.04
-          - target: aarch64-apple-darwin
-            type: native
-            runner: macos-14
-          - target: x86_64-apple-darwin
-            type: native
-            runner: macos-13
-          - target: x86_64-pc-windows-msvc
-            type: native
-            runner: windows-2022
-    runs-on: ${{ matrix.runner }}
-    needs: [check_commits]
-    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.target }}
-
-      - name: Download LLVM
-        uses: ./.github/actions/get-llvm
-        with:
-          target: ${{ matrix.target }}
-
-      - name: Build
-        if: ${{ matrix.type == 'native' }}
-        shell: bash
-        run: |
-          export LLVM_SYS_181_PREFIX=$PWD/llvm-${{ matrix.target }}
-          make install-bin
-          mv target/release/resolc resolc-${{ matrix.target }} || mv target/release/resolc.exe resolc-${{ matrix.target }}.exe
-
-      - name: Build
-        if: ${{ matrix.type == 'musl' }}
-        run: |
-          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/llvm-${{ matrix.target }}
-           make install-bin
-           mv target/${{ matrix.target }}/release/resolc resolc-${{ matrix.target }}
-           "
-          sudo chown -R $(id -u):$(id -g) .
-
-      - name: Install Solc
-        uses: ./.github/actions/get-solc
-
-      - name: Basic Sanity Check
-        shell: bash
-        run: |
-          result=$(./resolc-${{ matrix.target }} --bin crates/integration/contracts/flipper.sol)
-          echo $result
-          if [[ $result == *'0x50564d'* ]]; then exit 0; else exit 1; fi
-
-      - name: Upload artifacts (nightly)
-        uses: actions/upload-artifact@v4
-        id: artifact-upload-step
-        with:
-          name: resolc-${{ matrix.target }}
-          path: resolc-${{ matrix.target }}*
-          retention-days: 40
-
-      - name: Set output variables (nightly)
-        id: set-output
-        shell: bash
-        run: |
-          echo "Artifact URL is ${{ steps.artifact-upload-step.outputs.artifact-url }}"
-          echo "Artifact SHA is ${{ steps.artifact-upload-step.outputs.artifact-digest }}"
-          echo "resolc-${{ matrix.target }}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}"
-          echo "resolc-${{ matrix.target }}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}" >> "$GITHUB_OUTPUT"
-          echo "resolc-${{ matrix.target }}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}"
-          echo "resolc-${{ matrix.target }}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}" >> "$GITHUB_OUTPUT"
-
-  build-wasm:
-    runs-on: ubuntu-24.04
-    needs: [check_commits]
-    if: ${{ needs.check_commits.outputs.has_commits == 'true' }}
-    outputs:
-      resolc-web.js_url: ${{ steps.set-output.outputs.resolc_web_js_url }}
-      resolc-web.js_sha: ${{ steps.set-output.outputs.resolc_web_js_sha }}
-    env:
-      RELEASE_RESOLC_WASM_URI: https://github.com/paritytech/revive/releases/download/${{ github.ref_name }}/resolc.wasm
-    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"
-
-      - name: Basic Sanity Check
-        run: |
-          mkdir -p solc
-          curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.30/soljson.js
-          node -e "
-          const soljson = require('solc/soljson');
-          const createRevive = require('./target/wasm32-unknown-emscripten/release/resolc.js');
-
-          const compiler = createRevive();
-          compiler.soljson = soljson;
-
-          const standardJsonInput =
-          {
-            language: 'Solidity',
-            sources: {
-              'MyContract.sol': {
-                content: 'pragma solidity ^0.8.0; contract MyContract { function greet() public pure returns (string memory) { return \'Hello\'; } }',
-              },
-            },
-            settings: { optimizer: { enabled: false } }
-          };
-
-          compiler.writeToStdin(JSON.stringify(standardJsonInput));
-          compiler.callMain(['--standard-json']);
-
-          // Collect output
-          const stdout = compiler.readFromStdout();
-          const stderr = compiler.readFromStderr();
-
-          if (stderr) { console.error(stderr); process.exit(1); }
-
-          let out = JSON.parse(stdout);
-          let bytecode = out.contracts['MyContract.sol']['MyContract'].evm.bytecode.object
-          console.log(bytecode);
-
-          if(!bytecode.startsWith('50564d')) { process.exit(1); }
-          "
-
-      - name: Compress Artifact
-        run: |
-          mkdir -p resolc-wasm32-unknown-emscripten
-          mv ./target/wasm32-unknown-emscripten/release/resolc.js ./resolc-wasm32-unknown-emscripten/
-          mv ./target/wasm32-unknown-emscripten/release/resolc.wasm ./resolc-wasm32-unknown-emscripten/
-          mv ./target/wasm32-unknown-emscripten/release/resolc_web.js ./resolc-wasm32-unknown-emscripten/
-
-      # There is no way to upload several files as several artifacts with a single upload-artifact step
-      # It's needed to have resolc_web.js separately for night builds for resolc-bin repo
-      # https://github.com/actions/upload-artifact/issues/331
-      - name: Upload artifact resolc.js (nightly)
-        uses: actions/upload-artifact@v4
-        with:
-          name: resolc.js
-          path: resolc-wasm32-unknown-emscripten/resolc.js
-          retention-days: 40
-
-      - name: Upload artifacts resolc.wasm (nightly)
-        uses: actions/upload-artifact@v4
-        with:
-          name: resolc.wasm
-          path: resolc-wasm32-unknown-emscripten/resolc.wasm
-          retention-days: 40
-
-      - name: Upload artifacts resolc_web.js (nightly)
-        uses: actions/upload-artifact@v4
-        id: artifact-upload-step
-        with:
-          name: resolc_web.js
-          path: resolc-wasm32-unknown-emscripten/resolc_web.js
-          retention-days: 40
-
-      - name: Set output variables
-        id: set-output
-        env:
-          TARGET: resolc_web_js
-        run: |
-          echo "Artifact URL is ${{ steps.artifact-upload-step.outputs.artifact-url }}"
-          echo "Artifact SHA is ${{ steps.artifact-upload-step.outputs.artifact-digest }}"
-          echo "${TARGET}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}"
-          echo "${TARGET}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}" >> "$GITHUB_OUTPUT"
-          echo "${TARGET}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}""
-          echo "${TARGET}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}"" >> "$GITHUB_OUTPUT"
-
-  create-macos-fat-binary:
-    if: ${{ needs.check_commits.outputs.has_commits == 'true' }}
-    needs: [build]
-    outputs:
-      resolc-universal-apple-darwin_url: ${{ steps.set-output.outputs.resolc-universal-apple-darwin_url }}
-      resolc-universal-apple-darwin_sha: ${{ steps.set-output.outputs.resolc-universal-apple-darwin_sha }}
-    runs-on: macos-14
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          merge-multiple: true
-
-      - name: Create macOS Fat Binary
-        run: |
-          lipo resolc-aarch64-apple-darwin resolc-x86_64-apple-darwin -create -output resolc-universal-apple-darwin
-
-      - name: Make Executable
-        run: |
-          chmod +x resolc-universal-apple-darwin
-
-      - uses: actions/upload-artifact@v4
-        id: artifact-upload-step
-        with:
-          name: resolc-universal-apple-darwin
-          path: resolc-universal-apple-darwin
-          retention-days: 40
-
-      - name: Set output variables
-        id: set-output
-        env:
-          TARGET: resolc-universal-apple-darwin
-        run: |
-          echo "Artifact URL is ${{ steps.artifact-upload-step.outputs.artifact-url }}"
-          echo "Artifact SHA is ${{ steps.artifact-upload-step.outputs.artifact-digest }}"
-          echo "${TARGET}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}"
-          echo "${TARGET}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}" >> "$GITHUB_OUTPUT"
-          echo "${TARGET}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}""
-          echo "${TARGET}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}"" >> "$GITHUB_OUTPUT"
-
-  generate-nightly-json:
-    runs-on: ubuntu-24.04
-    if: ${{ needs.check_commits.outputs.has_commits == 'true' }}
-    environment: tags
-    needs: [build-wasm, build, create-macos-fat-binary, check_commits]
-    steps:
-      - name: Checkout revive
-        uses: actions/checkout@v4
-        with:
-          path: revive
-
-      - name: Checkout resolc-bin
-        uses: actions/checkout@v4
-        with:
-          repository: paritytech/resolc-bin
-          path: resolc-bin
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          merge-multiple: true
-          path: bins
-
-      - uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ secrets.REVIVE_JSON_APP_ID }}
-          private-key: ${{ secrets.REVIVE_JSON_APP_KEY }}
-          owner: paritytech
-          repositories: resolc-bin
-
-      - name: Generate JSON
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          TOKEN: ${{ steps.app-token.outputs.token }}
-          APP_NAME: "paritytech-revive-json"
-          Green: "\e[32m"
-          NC: "\e[0m"
-        run: |
-          echo '[' > data.json
-          echo '${{ toJSON(needs.build.outputs) }}' >> data.json
-          echo ',' >> data.json
-          echo '${{ toJSON(needs.build-wasm.outputs) }}' >> data.json
-          echo ',' >> data.json
-          echo '${{ toJSON(needs.create-macos-fat-binary.outputs) }}' >> data.json
-          echo ']' >> data.json
-          chmod +x bins/resolc-x86_64-unknown-linux-musl
-          export FIRST_SOLC_VERSION=$(./bins/resolc-x86_64-unknown-linux-musl --supported-solc-versions | cut -f 1 -d "," | tr -d ">=")
-          export LAST_SOLC_VERSION=$(./bins/resolc-x86_64-unknown-linux-musl --supported-solc-versions | cut -f 2 -d "," | tr -d "<=")
-          export FILEPATH=$(readlink -f data.json)
-          export TAG=$(cd revive;gh release list --json name,isLatest --jq '.[] | select(.isLatest)|.name')
-          cd resolc-bin
-          mkdir -p nightly
-          cd nightly
-          python3 ../../revive/.github/scripts/json_generator_nightly.py
-          cd ..
-          git status
-
-          echo "${Green}Add new remote with gh app token${NC}"
-          git remote set-url origin $(git config remote.origin.url | sed "s/github.com/${APP_NAME}:${TOKEN}@github.com/g")
-
-          echo "${Green}Remove http section that causes issues with gh app auth token${NC}"
-          sed -i.bak '/\[http/d' ./.git/config
-          sed -i.bak '/extraheader/d' ./.git/config
-
-          git config user.email "ci@parity.io"
-          git config user.name "${APP_NAME}"
-
-          git add nightly/
-          git commit -m "Update nightly json"
-          git push origin main
-
-          echo "::notice::nightly info.list files were successfully published to https://github.com/paritytech/resolc-bin"

.github/workflows/release.yml

@@ -1,329 +0,0 @@
-name: Build & Release
-on:
-  push:
-    branches: ["main"]
-    tags:
-      - "v*"
-  pull_request:
-    branches: ["main"]
-    types: [opened, synchronize, labeled, unlabeled]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  CARGO_TERM_COLOR: always
-  # if changed, dont forget to update the env var in release-nightly.yml
-  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:c0154e992adb791c3b848dd008939d19862549204f8cb26f5ca7a00f629e6067
-
-jobs:
-  check-version-changed:
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: write
-    env:
-      CURRENT_TAG: ${{ github.ref_name }}
-    outputs:
-      RELEASE_NOTES: ${{ steps.versions.outputs.RELEASE_NOTES }}
-    steps:
-      - uses: actions/checkout@v4
-
-      # Check that tag and version in Cargo.toml match
-      - name: Check versions
-        id: versions
-        run: |
-          if [[ $CURRENT_TAG == 'main' ]];
-            then
-              echo "::notice::Tag $CURRENT_TAG is not a release tag, skipping the check in the main branch";
-              exit 0
-            fi
-
-          if [[ $CURRENT_TAG != "v"* ]];
-            then
-              echo "::notice::Tag $CURRENT_TAG is not a release tag, skipping the check in a PR";
-              exit 0
-            fi
-
-          export PKG_VER=v$(cat crates/resolc/Cargo.toml | grep -A 5 package] | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d " ")
-          echo "Current tag $CURRENT_TAG"
-          echo "Package version $PKG_VER"
-          #
-          if [[ $CURRENT_TAG != $PKG_VER  ]];
-            then
-              echo "::error::Tag $CURRENT_TAG doesn't match package version $PKG_VER in Cargo.toml, please fix";
-              exit 1
-            fi
-
-          # Generating release notes early, in order to avoid checkout at the last step
-          export RELEASE_NOTES="$(sed '/^## '${CURRENT_TAG}'/,/^## 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:
-    strategy:
-      matrix:
-        target:
-          [
-            x86_64-unknown-linux-musl,
-            aarch64-apple-darwin,
-            x86_64-apple-darwin,
-            x86_64-pc-windows-msvc,
-          ]
-        include:
-          - target: x86_64-unknown-linux-musl
-            type: musl
-            runner: ubuntu-24.04
-          - target: aarch64-apple-darwin
-            type: native
-            runner: macos-14
-          - target: x86_64-apple-darwin
-            type: native
-            runner: macos-13
-          - target: x86_64-pc-windows-msvc
-            type: native
-            runner: windows-2022
-    runs-on: ${{ matrix.runner }}
-    needs: [check-version-changed]
-    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.target }}
-
-      - name: Download LLVM
-        uses: ./.github/actions/get-llvm
-        with:
-          target: ${{ matrix.target }}
-
-      - name: Build
-        if: ${{ matrix.type == 'native' }}
-        shell: bash
-        run: |
-          export LLVM_SYS_181_PREFIX=$PWD/llvm-${{ matrix.target }}
-          make install-bin
-          mv target/release/resolc resolc-${{ matrix.target }} || mv target/release/resolc.exe resolc-${{ matrix.target }}.exe
-
-      - name: Build
-        if: ${{ matrix.type == 'musl' }}
-        run: |
-          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/llvm-${{ matrix.target }}
-           make install-bin
-           mv target/${{ matrix.target }}/release/resolc resolc-${{ matrix.target }}
-           "
-          sudo chown -R $(id -u):$(id -g) .
-
-      - name: Install Solc
-        uses: ./.github/actions/get-solc
-
-      - name: Basic Sanity Check
-        shell: bash
-        run: |
-          result=$(./resolc-${{ matrix.target }} --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: resolc-${{ matrix.target }}
-          path: resolc-${{ matrix.target }}*
-          retention-days: 1
-
-  build-wasm:
-    runs-on: ubuntu-24.04
-    needs: [check-version-changed]
-    env:
-      RELEASE_RESOLC_WASM_URI: https://github.com/paritytech/revive/releases/download/${{ github.ref_name }}/resolc.wasm
-    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"
-
-      - name: Basic Sanity Check
-        run: |
-          mkdir -p solc
-          curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.30/soljson.js
-          node -e "
-          const soljson = require('solc/soljson');
-          const createRevive = require('./target/wasm32-unknown-emscripten/release/resolc.js');
-
-          const compiler = createRevive();
-          compiler.soljson = soljson;
-
-          const standardJsonInput =
-          {
-            language: 'Solidity',
-            sources: {
-              'MyContract.sol': {
-                content: 'pragma solidity ^0.8.0; contract MyContract { function greet() public pure returns (string memory) { return \'Hello\'; } }',
-              },
-            },
-            settings: { optimizer: { enabled: false } }
-          };
-
-          compiler.writeToStdin(JSON.stringify(standardJsonInput));
-          compiler.callMain(['--standard-json']);
-
-          // Collect output
-          const stdout = compiler.readFromStdout();
-          const stderr = compiler.readFromStderr();
-
-          if (stderr) { console.error(stderr); process.exit(1); }
-
-          let out = JSON.parse(stdout);
-          let bytecode = out.contracts['MyContract.sol']['MyContract'].evm.bytecode.object
-          console.log(bytecode);
-
-          if(!bytecode.startsWith('50564d')) { process.exit(1); }
-          "
-
-      - name: Compress Artifact
-        run: |
-          mkdir -p resolc-wasm32-unknown-emscripten
-          mv ./target/wasm32-unknown-emscripten/release/resolc.js ./resolc-wasm32-unknown-emscripten/
-          mv ./target/wasm32-unknown-emscripten/release/resolc.wasm ./resolc-wasm32-unknown-emscripten/
-          mv ./target/wasm32-unknown-emscripten/release/resolc_web.js ./resolc-wasm32-unknown-emscripten/
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: resolc-wasm32-unknown-emscripten
-          path: resolc-wasm32-unknown-emscripten/*
-          retention-days: 1
-
-  create-release:
-    if: startsWith(github.ref_name, 'v')
-    needs: [check-version-changed, build-wasm]
-    runs-on: macos-14
-    environment: tags
-    steps:
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          merge-multiple: true
-
-      - name: Create macOS Fat Binary
-        run: |
-          lipo resolc-aarch64-apple-darwin resolc-x86_64-apple-darwin -create -output resolc-universal-apple-darwin
-
-      - name: Make Executable
-        run: |
-          chmod +x resolc-x86_64-unknown-linux-musl
-          chmod +x resolc-universal-apple-darwin
-
-      - name: Create sha-256 checksum
-        run: |
-          shasum -a 256 resolc-x86_64-unknown-linux-musl > checksums.txt
-          shasum -a 256 resolc-universal-apple-darwin >> checksums.txt
-          shasum -a 256 resolc-x86_64-pc-windows-msvc.exe >> checksums.txt
-          shasum -a 256 resolc.js >> checksums.txt
-          shasum -a 256 resolc.wasm >> checksums.txt
-          shasum -a 256 resolc_web.js >> checksums.txt
-
-      - uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ secrets.REVIVE_RELEASE_APP_ID }}
-          private-key: ${{ secrets.REVIVE_RELEASE_APP_KEY }}
-
-      - name: create-release
-        uses: softprops/action-gh-release@v2
-        with:
-          body: |
-            ## Changelog
-            ${{ 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: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
-          prerelease: true
-          token: ${{ steps.app-token.outputs.token }}
-          target_commitish: ${{ github.sha }}
-          files: |
-            resolc-x86_64-unknown-linux-musl
-            resolc-universal-apple-darwin
-            resolc-x86_64-pc-windows-msvc.exe
-            resolc.js
-            resolc.wasm
-            resolc_web.js
-            checksums.txt
-
-  npm-release:
-    needs: [create-release]
-    runs-on: macos-14
-    environment: tags
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          merge-multiple: true
-
-      - name: Set Up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: "20"
-
-      - run: npm ci -w js/resolc
-
-      - name: Build
-        run: |
-          cp -f resolc.{wasm,js} js/resolc/src/resolc
-          npm -w js/resolc run build
-
-      - name: npm pack
-        run: npm -w js/resolc pack
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: npm_package
-          path: "parity-resolc-*.tgz"
-
-      - uses: octokit/request-action@bbedc70b1981e610d89f1f8de88311a1fc02fb83
-        with:
-          route: POST /repos/paritytech/npm_publish_automation/actions/workflows/publish.yml/dispatches
-          ref: main
-          inputs: '${{ format(''{{ "artifact_name": "npm_package", "repo": "{0}", "run_id": "{1}" }}'', github.repository, github.run_id) }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.NPM_PUBLISH_AUTOMATION_TOKEN }}

.github/workflows/rust.yml

@@ -0,0 +1,59 @@
+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: |
+          git clone https://github.com/xermicus/go-ethereum --branch=cl/fix-runner-state-dump --depth=1
+          cd go-ethereum
+          make all
+          echo "$(pwd)/build/bin/" >> $GITHUB_PATH
+
+      - 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

@@ -1,47 +0,0 @@
-name: Test LLVM Builder
-on:
-  pull_request:
-    branches: ["main"]
-    types: [opened, synchronize]
-    paths:
-      - 'LLVM.lock'
-      - 'crates/llvm-builder/**'
-      - '.github/workflows/test-llvm-builder.yml'
-    paths-ignore:
-      - "**.md"
-
-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

@@ -1,107 +0,0 @@
-name: Test Wasm Version
-on:
-  push:
-    branches: ["main"]
-    paths-ignore:
-      - "**.md"
-  pull_request:
-    branches: ["main"]
-    types: [opened, synchronize]
-    paths-ignore:
-      - "**.md"
-
-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: Test emscripten
-        run: |
-          echo "Running tests for ${{ matrix.os }}"
-          npm run test:wasm
-
-      - name: Test @parity/resolc
-        run: |
-          echo "Running tests for ${{ matrix.os }}"
-          npm run -w js/resolc test
-
-      - name: Run Playwright tests
-        run: |
-          cd js/emscripten
-          npx playwright install --with-deps
-          npx playwright test

.github/workflows/test.yml

@@ -1,58 +0,0 @@
-name: Test
-on:
-  push:
-    branches: ["main"]
-    paths-ignore:
-      - "**.md"
-  pull_request:
-    branches: ["main"]
-    types: [opened, synchronize]
-    paths-ignore:
-      - "**.md"
-
-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

.gitignore

@@ -1,5 +1,4 @@
 /target
-/js/resolc/dist
 target-llvm
 *.dot
 .vscode/
@@ -12,6 +11,7 @@ target-llvm
 node_modules
 artifacts
 tmp
+package-lock.json
 /*.html
 /build
 soljson.js

.prettierrc.json

@@ -1,6 +0,0 @@
-{
-  "trailingComma": "es5",
-  "tabWidth": 2,
-  "semi": false,
-  "singleQuote": true
-}

CHANGELOG.md

@@ -4,163 +4,8 @@
 
 This is a development pre-release.
 
-Supported `polkadot-sdk` rev: `2503.0.1`
-
-## v0.4.0
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev: `2503.0.1`
-
-### Added
-- Line debug information per YUL builtin and for `if` statements.
-- Column numbers in debug information.
-- Support for the YUL optimizer details in the standard json input definition.
-- The `revive-explorer` compiler utility.
-- `revive-yul`: The AST visitor interface.
-
-### Fixed
-- The debug info source file matches the YUL path in `--debug-output-dir`, allowing tools to display the source line. 
-
-## v0.3.0
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev: `2503.0.1`
-
-### Fixed
-
-- llvm-context: Bugfix the SAR YUL builtin translation.
-- runtime-api: Add the missing `memset` builtin.
-- npm package: Bugfix the exports field defined in the `package.json`.
-
-
-## v0.2.0
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev: `2503.0.1`
-
-### Changed
-
-- Removed the license printer from the `resolc` binary.
-- EVM bytecode is no longer requested from solc (except in test utils) leading to less compilation work in the pipeline.
-
-### Fixed
-
-- solc-json-interface: Serializing of any custom key in the JSON input is only skipped if not provided.
-- npm package resolution no longer fails with an 'ERR_PACKAGE_PATH_NOT_EXPORTED' error for packages defining exports fields in the `package.json`.
-
-## v0.1.0
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev: `2503.0.1`
-
-### Added
-
-- Add the PolkaVM heap size, stack size and debug info CLI compiler options to the standard JSON settings. This makes the standard JSON input succint for reproducible builds.
-
-### Changed
-
-- Supported `polkadot-sdk` version is now `2503.0.1`
-- The `emsdk` version is now `4.0.9`
-
-### Fixed
-
-## v0.1.0-dev.16
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
-
-### Added
-
-- Move the npm package from paritytech/js-revive, into this repo. The package `@parity/resolc` will be deployed to npm for each release.
-- Support for solc v0.8.30
-
-### Changed
-
-- By default, heavy size optimizations are applied.
-
-### Fixed
-
-- @parity/resolc: The solc dependency package is constrained to the latest supported version, preventing breaking the package ever time a new solc package was released. 
-- The resolc npm package no longer ignores the optimizer settings
-
-## v0.1.0-dev.14
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
-
-### Added
-
-- The `revive-runner` helper utility binary which helps to run contracts locally without a blockchain node.
-- Allow configuration of the EVM heap memory size and stack size via CLI flags and JSON input settings.
-
-### Changed
-
-- The default PVM stack memory size was increased from 16kb to 32kb.
-
-### Fixed
-
-- Constructors avoid storing zero sized immutable data on exit.
-
-## v0.1.0-dev.13
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
-
-### Added
-
-- Support for solc v0.8.29
-- Decouples the solc JSON-input-output type definitions from the Solidity fronted and expose them via a dedicated crate.
-- `--supported-solc-versions` for `resolc` binary to return a `semver` range of supported `solc` versions.
-- Support for passing LLVM command line options via the prcoess input or providing one or more `--llvm-arg='..'` resolc CLI flag. This allows more fine-grained control over the LLVM backend configuration.
-
-### Changed
-
-- Storage keys and values are big endian. This was a pre-mature optimization because for the contract itself it this is a no-op and thus not observable. However we should consider the storage layout as part of the contract ABI. The endianness of transient storage values are still kept as-is.
-- Running `resolc` using webkit is no longer supported.
-
-### Fixed
-
-- A missing byte swap for the create2 salt value.
-
-## v0.1.0-dev.12
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev: `21f6f0705e53c15aa2b8a5706b208200447774a9`
-
-### Added
-
-- Per file output selection for `--standard-json` mode.
-- The `ir` output selection option for `--standard-json` mode.
-
-### Changed
-
-- Improved code size: Large contracts compile to smaller code blobs when enabling aggressive size optimizations (`-Oz`).
-
-### Fixed
-
-## v0.1.0-dev.11
-
-This is a development pre-release.
-
 Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
 
-### Added
-
-### Changed
-
-### Fixed
-
-- A bug causing incorrect loads from the emulated EVM linear memory.
-- A missing integer truncate after switching to 64bit.
-
 ## v0.1.0-dev.10
 
 This is a development pre-release.
@@ -168,12 +13,10 @@ This is a development pre-release.
 Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
 
 ### Added
-
 - Support for the `coinbase` opcode.
 - The resolc web JS version.
 
 ### Changed 
-
 - Missing the `--overwrite` flag emits an error instead of a warning.
 - The `resolc` executable prints the help by default.
 - Removed support for legacy EVM assembly (EVMLA) translation.
@@ -183,7 +26,6 @@ Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
   If detected, the re-entrant call flag is not set and 0 deposit limit is endowed.
 
 ### Fixed
-
 - Solidity: Add the solc `--libraries` files to sources.
 - A data race in tests.
 - Fix `broken pipe` errors.
@@ -197,11 +39,9 @@ This is a development pre-release.
 ### Added
 
 ### Changed 
-
 - Syscalls with more than 6 arguments now pack them into registers.
 
 ### Fixed
-
 - Remove reloading of the resolc.js file (fix issue with relative path in web worker)
 
 ## v0.1.0-dev.8
@@ -209,18 +49,15 @@ This is a development pre-release.
 This is a development pre-release.
 
 ### Added
-
 - The `revive-llvm-builder` crate with the `revive-llvm` helper utility for streamlined management of the LLVM framework dependency.
 - Initial support for running `resolc` in the browser.
 
 ### Changed
-
 - Suported contracts runtime is polkadot-sdk git version `d62a90c8c729acd98c7e9a5cab9803b8b211ffc5`.
 - The minimum supported Rust version is `1.81.0`.
 - Error out early instead of invoking `solc` with invalid base or include path flags.
 
 ### Fixed
-
 - Decouple the LLVM target dependency from the LLVM host dependency.
 - Do not error out if no files and no errors were produced. This aligns resolc closer to solc.
 - Fixes input normalization in the Wasm version.
@@ -230,20 +67,17 @@ This is a development pre-release.
 This is a development pre-release.
 
 ### Added
-
 - Implement the `GASPRICE` opcode.
 - Implement the `BASEFEE` opcode.
 - Implement the `GASLIMIT` opcode.
 
 ### Changed
-
 - The `GAS` opcode now returns the remaining `ref_time`.
 - Contracts can now be supplied call data input of arbitrary size.
-- Some syscalls now return the value in a register, slightly improving emitted contract code.
+- Some syscalls now return the value in a register, slightly improving  emitted contract code.
 - 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. 
 - JS: Fix encoding conversion from JS string (UTF-16) to UTF-8.
 - The git commit hash slug is always displayed in the version string. 
@@ -253,7 +87,6 @@ This is a development pre-release.
 This is a development pre-release.
 
 # Added
-
 - Implement the `BLOCKHASH` opcode.
 - Implement delegate calls.
 - Implement the `GASPRICE` opcode. Currently hard-coded to return `1`.
@@ -261,24 +94,21 @@ This is a development pre-release.
 - Initial support for emitting debug info (opt in via the `-g` flag)
 
 # Changed
-
 - resolc now emits 64bit PolkaVM blobs, reducing contract code size and execution time.
 - The RISC-V bit-manipulation target feature (`zbb`) is enabled.
 
 # Fixed
-
 - Compilation to Wasm (for usage in node and web browsers)
 
+
 ## v0.1.0-dev.5
 
 This is development pre-release.
 
 # Added
-
 - Implement the `CODESIZE` and `EXTCODESIZE` opcodes.
 
 # Changed
-
 - Include the full revive version in the contract metadata.
 
 # Fixed
@@ -288,11 +118,9 @@ This is development pre-release.
 This is development pre-release.
 
 # Added
-
 - Support the `ORIGIN` opcode.
 
 # Changed
-
 - Update polkavm to `v0.14.0`.
 - Enable the `a`, `fast-unaligned-access` and `xtheadcondmov` LLVM target features, decreasing the code size for some contracts.
 

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.1.0"
+version = "0.1.0-dev.10"
 authors = [
     "Cyrill Leutwiler <cyrill@parity.io>",
     "Parity Technologies <admin@parity.io>",
@@ -11,79 +11,75 @@ authors = [
 license = "MIT/Apache-2.0"
 edition = "2021"
 repository = "https://github.com/paritytech/revive"
-rust-version = "1.85.0"
+rust-version = "1.81.0"
 
 [workspace.dependencies]
-resolc = { version = "0.3.0", path = "crates/resolc" }
-revive-benchmarks = { version = "0.1.0", path = "crates/benchmarks" }
-revive-builtins = { version = "0.1.0", path = "crates/builtins" }
-revive-common = { version = "0.1.0", path = "crates/common" }
-revive-differential = { version = "0.1.0", path = "crates/differential" }
-revive-explorer = { version = "0.1.0", path = "crates/explore" }
-revive-integration = { version = "0.1.1", path = "crates/integration" }
-revive-linker = { version = "0.1.0", path = "crates/linker" }
-lld-sys = { version = "0.1.0", path = "crates/lld-sys" }
-revive-llvm-context = { version = "0.3.0", path = "crates/llvm-context" }
-revive-runtime-api = { version = "0.2.0", path = "crates/runtime-api" }
-revive-runner = { version = "0.1.0", path = "crates/runner" }
-revive-solc-json-interface = { version = "0.2.0", path = "crates/solc-json-interface" }
-revive-stdlib = { version = "0.1.1", path = "crates/stdlib" }
-revive-build-utils = { version = "0.1.0", path = "crates/build-utils" }
-revive-yul = { version = "0.2.1", path = "crates/yul" }
+revive-benchmarks = { version = "0.1.0-dev.10", path = "crates/benchmarks" }
+revive-builtins = { version = "0.1.0-dev.10", path = "crates/builtins" }
+revive-common = { version = "0.1.0-dev.10", path = "crates/common" }
+revive-differential = { version = "0.1.0-dev.10", path = "crates/differential" }
+revive-integration = { version = "0.1.0-dev.10", path = "crates/integration" }
+revive-linker = { version = "0.1.0-dev.10", path = "crates/linker" }
+lld-sys = { version = "0.1.0-dev.10", path = "crates/lld-sys" }
+revive-llvm-context = { version = "0.1.0-dev.10", path = "crates/llvm-context" }
+revive-runtime-api = { version = "0.1.0-dev.10", path = "crates/runtime-api" }
+revive-runner = { version = "0.1.0-dev.10", path = "crates/runner" }
+revive-solidity = { version = "0.1.0-dev.10", path = "crates/solidity" }
+revive-stdlib = { version = "0.1.0-dev.10", path = "crates/stdlib" }
+revive-build-utils = { version = "0.1.0-dev.10", path = "crates/build-utils" }
 
 hex = "0.4.3"
 cc = "1.2"
-libc = "0.2.172"
-tempfile = "3.20"
+libc = "0.2.169"
+tempfile = "3.16"
 anyhow = "1.0"
 semver = { version = "1.0", features = ["serde"] }
 itertools = "0.14"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["arbitrary_precision"] }
-regex = "1.11"
-once_cell = "1.21"
+regex = "1.10"
+once_cell = "1.20"
 num = "0.4.3"
 sha1 = "0.10"
 sha3 = "0.10"
 thiserror = "2.0"
 which = "7.0"
 path-slash = "0.2"
-rayon = "1.10"
+rayon = "1.8"
 clap = { version = "4", default-features = false, features = ["derive"] }
-polkavm-common = "0.24.0"
-polkavm-linker = "0.24.0"
-polkavm-disassembler = "0.24.0"
-polkavm = "0.24.0"
-alloy-primitives = { version = "1.1", features = ["serde"] }
-alloy-sol-types = "1.1"
-alloy-genesis = "1.0"
-alloy-serde = "1.0"
-alloy-core = "1.3"
-env_logger = { version = "0.11.8", default-features = false }
-serde_stacker = "0.1.12"
-criterion = { version = "0.6", features = ["html_reports"] }
-log = { version = "0.4.27" }
-git2 = { version = "0.20.2", default-features = false }
+polkavm-common = "0.21.0"
+polkavm-linker = "0.21.0"
+polkavm-disassembler = "0.21.0"
+polkavm = "0.21.0"
+alloy-primitives = { version = "0.8.21", features = ["serde"] }
+alloy-sol-types = "0.8.21"
+alloy-genesis = "0.11.0"
+alloy-serde = "0.11.0"
+env_logger = { version = "0.11.6", default-features = false }
+serde_stacker = "0.1.11"
+criterion = { version = "0.5.1", features = ["html_reports"] }
+log = { version = "0.4.25" }
+git2 = { version = "0.20.0", default-features = false }
 downloader = "0.2.8"
-flate2 = "1.1"
-fs_extra = "1.3"
+flate2 = "1.0.35"
+fs_extra = "1.3.0"
 num_cpus = "1"
 tar = "0.4"
 toml = "0.8"
 assert_cmd = "2.0"
 assert_fs = "1.1"
-pallet-revive-uapi = "0.7.0"
 
 # polkadot-sdk and friends
-codec = { version = "3.7.5", default-features = false, package = "parity-scale-codec" }
+codec = { version = "3.6.12", default-features = false, package = "parity-scale-codec" }
 scale-info = { version = "2.11.6", default-features = false }
-polkadot-sdk = { version = "2503.0.1" }
+polkadot-sdk = { git = "https://github.com/paritytech/polkadot-sdk", branch = "at/disable-validation" }
 
 # llvm
 [workspace.dependencies.inkwell]
-version = "0.6.0"
+git = "https://github.com/TheDan64/inkwell.git"
+rev = "7b410298b6a93450adaa90b1841d5805a3038f12"
 default-features = false
-features = ["serde", "llvm18-1", "no-libffi-linking", "target-riscv"]
+features = ["serde", "llvm18-0", "no-libffi-linking", "target-riscv"]
 
 [profile.bench]
 inherits = "release"

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.85.0 AS llvm-builder
+FROM rust:1.84.0 AS llvm-builder
 WORKDIR /opt/revive
 
 RUN apt update && \ 
@@ -11,7 +11,7 @@ RUN make install-llvm-builder
 RUN revive-llvm --target-env musl clone
 RUN revive-llvm --target-env musl build  --llvm-projects lld --llvm-projects clang
 
-FROM messense/rust-musl-cross@sha256:c0154e992adb791c3b848dd008939d19862549204f8cb26f5ca7a00f629e6067 AS resolc-builder
+FROM messense/rust-musl-cross:x86_64-musl AS resolc-builder
 WORKDIR /opt/revive
 
 RUN apt update && \ 

Makefile

@@ -5,15 +5,14 @@
 	install-wasm \
 	install-llvm-builder \
 	install-llvm \
-	install-revive-runner \
-	install-revive-explorer \
 	format \
 	clippy \
 	machete \
 	test \
 	test-integration \
-	test-resolc \
+	test-solidity \
 	test-workspace \
+	test-cli \
 	test-wasm \
 	test-llvm-builder
 	bench \
@@ -24,28 +23,22 @@
 install: install-bin install-npm
 
 install-bin:
-	cargo install --force --locked --path crates/resolc
+	cargo install --path crates/solidity
 
 install-npm:
 	npm install && npm fund
 
 install-wasm: install-npm
-	cargo build --target wasm32-unknown-emscripten -p resolc --release --no-default-features
+	cargo build --target wasm32-unknown-emscripten -p revive-solidity --release --no-default-features
 	npm run build:package
 
 install-llvm-builder:
-	cargo install --force --locked --path crates/llvm-builder
+	cargo install --path crates/llvm-builder
 
 install-llvm: install-llvm-builder
 	revive-llvm clone
 	revive-llvm build --llvm-projects lld --llvm-projects clang
 
-install-revive-runner:
-	cargo install --locked --force --path crates/runner --no-default-features
-
-install-revive-explorer:
-	cargo install --locked --force --path crates/explorer --no-default-features
-
 format:
 	cargo fmt --all --check
 
@@ -56,17 +49,20 @@ machete:
 	cargo install cargo-machete
 	cargo machete
 
-test: format clippy machete test-workspace install-revive-runner install-revive-explorer
+test: format clippy machete test-cli test-workspace
 
 test-integration: install-bin
 	cargo test --package revive-integration
 
-test-resolc: install
-	cargo test --package resolc
+test-solidity: install
+	cargo test --package revive-solidity
 
 test-workspace: install
 	cargo test --workspace --exclude revive-llvm-builder
 
+test-cli: install
+	npm run test:cli
+
 test-wasm: install-wasm
 	npm run test:wasm
 
@@ -90,6 +86,9 @@ clean:
 	cargo clean ; \
 	revive-llvm clean ; \
 	rm -rf node_modules ; \
-	rm -rf crates/resolc/src/tests/cli/artifacts ; \
-	cargo uninstall resolc ; \
-	cargo uninstall revive-llvm-builder ;
+	rm -rf crates/solidity/src/tests/cli-tests/artifacts ; \
+	cargo uninstall revive-solidity ; \
+	cargo uninstall revive-llvm-builder ; \
+	rm -f package-lock.json ; \
+	rm -rf js/dist ; \
+	rm -f js/src/resolc.{wasm,js}

README.md

@@ -1,5 +1,5 @@
-![CI](https://github.com/paritytech/revive/actions/workflows/test.yml/badge.svg)
-[![Docs](https://img.shields.io/badge/Docs-contracts.polkadot.io-brightgreen.svg)](https://contracts.polkadot.io/revive_compiler/)
+![CI](https://github.com/paritytech/revive/actions/workflows/rust.yml/badge.svg)
+[![Docs](https://img.shields.io/badge/Docs-contracts.polkadot.io-brightgreen.svg)](https://contracts.polkadot.io)
 
 # revive
 
@@ -14,39 +14,10 @@ This is experimental software in active development and not ready just yet for p
 Discussion around the development is hosted on the [Polkadot Forum](https://forum.polkadot.network/t/contracts-update-solidity-on-polkavm/6949#a-new-solidity-compiler-1).
 
 ## Installation
-Building Solidity contracts for PolkaVM requires installing the following two compilers:
-- `resolc`: The revive Solidity compiler YUL frontend and PolkaVM code generator (provided by this repository).
-- `solc`: The [Ethereum Solidity reference compiler](https://github.com/ethereum/solidity/) implemenation.`resolc` uses `solc` during the compilation process, please refer to the [Ethereum Solidity documentation](https://docs.soliditylang.org/en/latest/installing-solidity.html) for installation instructions.
 
-### `resolc` binary releases
-`resolc` is distributed as a standalone binary (with `solc` as the only external dependency). Please download one of our [binary releases](https://github.com/paritytech/revive/releases) for your target platform and mind the platform specific instructions below.
+`resolc` depends on the [solc](https://github.com/ethereum/solidity) binary installed on your system.
 
-<details>
-  <summary>MacOS users</summary>
-
-> **MacOS** users need to clear the `downloaded` attribute from the binary and set the executable flag.
-> ```sh
-> xattr -rc resolc-universal-apple-darwin
-> chmod +x resolc-universal-apple-darwin
-> ```
-
-</details>
-
-<details>
-  <summary>Linux users</summary>
-
-> **Linux** users need to set the executable flag.
-> ```sh
-> chmod +x resolc-x86_64-unknown-linux-musl
-> ```
-
-</details>
-
-
-### `resolc` NPM package
-We distribute the revive compiler as [node.js module](https://www.npmjs.com/package/@parity/resolc) and [hardhat plugin](https://www.npmjs.com/package/@parity/hardhat-polkadot-resolc).
-
-Note: The `solc` dependency is bundled via NPM packaging and defaults to the latest supported version.
+Download and install the `resolc` frontend executable for your platform from our [releases](https://github.com/paritytech/revive/releases).
 
 ## Building from source
 
@@ -54,44 +25,22 @@ Building revive requires a [stable Rust installation](https://rustup.rs/) and a
 
 ### LLVM
 
-`revive` depends on a custom build of LLVM `v18.1.8` with the RISC-V _embedded_ target, including the `compiler-rt` builtins. You can either download a build from our releases (recommended for older hardware) or build it from source.
+`revive` depends on a custom build of LLVM `v18.1.8` with the RISC-V _embedded_ target, including the `compiler-rt` builtins. Use the provided [revive-llvm](crates/llvm-builder/README.md) utility to compile a compatible LLVM build locally and point `$LLVM_SYS_181_PREFIX` to the installation afterwards.
 
-<details>
-  <summary>Download from our LLVM releases</summary>
+The `Makefile` provides a shortcut target to obtain a compatible LLVM build:
 
-Download the [latest LLVM build](https://github.com/paritytech/revive/releases?q=LLVM+binaries+release&expanded=true) from our releases.
-
-> **MacOS** users need to clear the `downloaded` attribute from all binaries after extracting the archive:
-> ```sh
-> xattr -rc </path/to/the/extracted/archive>/target-llvm/gnu/target-final/bin/*
-> ```
-
-After extracting the archive, point `$LLVM_SYS_181_PREFIX` to it:
-```sh
-export LLVM_SYS_181_PREFIX=</path/to/the/extracted/archive>/target-llvm/gnu/target-final
-```
-
-</details>
-
-<details>
-  <summary>Building from source</summary>
-
-The `Makefile` provides a shortcut target to obtain a compatible LLVM build, using the provided [revive-llvm](crates/llvm-builder/README.md) utility. Once installed, point `$LLVM_SYS_181_PREFIX` to the installation afterwards:
-
-```sh
+```bash
 make install-llvm
 export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final
 ```
 
-</details>
-
 ### The `resolc` Solidity frontend
 
-To build the `resolc` Solidity frontend executable, make sure you have obtained a compatible LLVM build and did export the `LLVM_SYS_181_PREFIX` environment variable pointing to it (see [above](#LLVM)).
+To build the `resolc` Solidity frontend executable, make sure you have obtained a compatible LLVM build using [revive-llvm](crates/llvm-builder/README.md) and did export the `LLVM_SYS_181_PREFIX` environment variable pointing to it (see [above](#LLVM)).
 
 To install the `resolc` Solidity frontend executable:
 
-```sh
+```bash
 make install-bin
 resolc --version
 ```
@@ -100,10 +49,7 @@ resolc --version
 
 Cross-compile the `resolc.js` frontend executable to Wasm for running it in a Node.js or browser environment. The `REVIVE_LLVM_TARGET_PREFIX` environment variable is used to control the target environment LLVM dependency.
 
-<details>
-  <summary>Instructions for cross-compilation to wasm32-unknown-emscripten</summary>
-
-```sh
+```bash
 # Build the host LLVM dependency with PolkaVM target support
 make install-llvm
 export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final
@@ -119,26 +65,21 @@ make install-wasm
 make test-wasm
 ```
 
-</details>
-
-## Development
+### Development
 
 Please consult the [Makefile](Makefile) targets to learn how to run tests and benchmarks. 
 Ensure that your branch passes `make test` locally when submitting a pull request.
 
-### Design overview
-See the [relevant section in our documentation](https://contracts.polkadot.io/revive_compiler/architecture) to learn more about how the compiler works. 
+## Design overview
 
-### Tests
+`revive` uses [solc](https://github.com/ethereum/solidity/), the Ethereum Solidity compiler, as the [Solidity frontend](crates/solidity/src/lib.rs) to process smart contracts written in Solidity. The YUL IR code (or legacy EVM assembly as a fallback for older `solc` versions) emitted by `solc` is then translated to LLVM IR, targetting [Polkadots `revive` pallet](https://docs.rs/pallet-revive/latest/pallet_revive/trait.SyscallDoc.html).
+[Frontend](https://github.com/matter-labs/era-compiler-solidity) and [code generator](https://github.com/matter-labs/era-compiler-llvm-context) are based of ZKSync `zksolc`.
+
+## Tests
 
 Before running the tests, ensure that Geth (Go Ethereum) is installed on your system. Follow the installation guide here: [Installing Geth](https://geth.ethereum.org/docs/getting-started/installing-geth).
 Once Geth is installed, you can run the tests using the following command:
 
-```sh
+```bash
 make test
 ```
-# Acknowledgements
-
-The revive compiler project, after some early experiments with EVM bytecode translations, decided to fork the `era-compiler` framework.
-[Frontend](https://github.com/matter-labs/era-compiler-solidity), [code generator](https://github.com/matter-labs/era-compiler-llvm-context) and some supporting libraries are based of ZKSync `zksolc`. I'd like to express my gratitude and thank the original authors for providing a useable code base under a generous license.
-

RELEASE.md

@@ -4,26 +4,8 @@ Prior to the first stable release we neither have formal release processes nor d
 
 To create a new pre-release:
 
-1. Create a release PR which, if necessary:
-  - Updates the versions in the workspace `Cargo.toml`
-  - Updates the version in each crate `Cargo.toml`
-  - Updates the version of the NPM package in `js/resolc/package.json`
-  - Updates the `CHANGELOG.md` to reflect all observable changes
-2. If the CI passes, merge the release PR.
-3. Push a `vX.Y.Z` tag that has the same version as in `Cargo.toml`
-4. The release workflow will attempt to build and publish a new pre-release if the latest tag does match the cargo package version.
-5. Wait for the `Release` workflow to finish. It should create the pre-release with the same name.
-6. Check that pre-release was created on the [Releases page](https://github.com/paritytech/revive/releases) with all artifacts.
-7. After the release is published, another workflow should start automatically and update json files in https://github.com/paritytech/resolc-bin. Check the changes.
-8. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly
-
-# `resolc` NPM package release
-
-Will happen automatically.
-
-# LLVM release
-
-To create a new LLVM release, run "Release LLVM" workflow. Use current LLVM version as parameter, e.g. `18.1.8`.
-Version suffix will be resolved automatically.  
-The workflows will create new GitHub release, and upload LLVM binaries.
-Next release of resolc will use newly created binaries.  
+1. Merge a release PR which updates the `-dev.X` versions in the workspace `Cargo.toml` and updates the `CHANGELOG.md` accordingly
+2. Push a release tag to `main`
+3. Create a __pre-release__ from the tag and manually upload the `resolc` binary from docker image
+4. Manually upload `resolc.js`, `resolc-web.js` and `resolc.wasm` from the `build-revive-wasm` action artifacts.
+5. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly

STATUS.md

@@ -0,0 +1,30 @@
+# Known issues
+
+The following is known and we are either working on it or it is a hard limitation. Please do not open a new issue.
+
+## Release
+
+`0.1.0-dev-2`
+
+## Missing features
+
+- [Libraries with public functions are not supported](https://github.com/paritytech/revive/issues/91)
+- [Automatic import resolution is not supported](https://github.com/paritytech/revive/issues/98)
+- The emulated EVM linear contract memory is limited to 64kb in size. Will be fixed with support for metered dynamic memory.
+- [The contract calldata is currently limited to 1kb in size](https://github.com/paritytech/revive/issues/57)
+- [EIP-4844 opcodes are not supported](https://github.com/paritytech/revive/issues/64)
+- [Delegate calls are not supported](https://github.com/paritytech/revive/issues/67)
+- [The `blockhash` opcode is not supported](https://github.com/paritytech/revive/issues/61)
+- [The `extcodesize` opcode is not supported](https://github.com/paritytech/revive/issues/58)
+- [The `origin` opcode is not supported](https://github.com/paritytech/revive/issues/59)
+- [Gas limits for contract calls are ignored](https://github.com/paritytech/revive/issues/60)
+- [Gas related opcodes are not supported](https://github.com/paritytech/revive/issues/60)
+- IPFS metadata hashes are not supported
+- [Compiled contract artifacts can exceed the pallet static memory limit and fail to deploy](https://github.com/paritytech/revive/issues/96).
+- [Transfers to inexistant accounts will fail if the transferred value lies below the ED.](https://github.com/paritytech/revive/issues/83) Will be fixed in the pallet to make the ED completely transparent for contracts.
+
+## Wontfix
+
+Please consult our documentation to learn more about Solidity and EVM features likely to remain unsupported (and why they will not be supported).
+
+TODO: Insert link to the relevant documentation section.

crates/benchmarks/BENCHMARKS.md

@@ -15,58 +15,58 @@
 
 ### Baseline
 
-|         | `EVM`                    | `PVMInterpreter`                 |
-|:--------|:-------------------------|:-------------------------------- |
-| **`0`** | `10.08 us` (✅ **1.00x**) | `10.32 us` (✅ **1.02x slower**)  |
+|         | `EVM`                   | `PVMInterpreter`                 |
+|:--------|:------------------------|:-------------------------------- |
+| **`0`** | `3.36 us` (✅ **1.00x**) | `11.84 us` (❌ *3.52x slower*)    |
 
 ### OddPorduct
 
-|              | `EVM`                     | `PVMInterpreter`                 |
-|:-------------|:--------------------------|:-------------------------------- |
-| **`10000`**  | `3.60 ms` (✅ **1.00x**)   | `1.57 ms` (🚀 **2.28x faster**)   |
-| **`100000`** | `34.72 ms` (✅ **1.00x**)  | `14.82 ms` (🚀 **2.34x faster**)  |
-| **`300000`** | `105.01 ms` (✅ **1.00x**) | `44.11 ms` (🚀 **2.38x faster**)  |
+|              | `EVM`                    | `PVMInterpreter`                 |
+|:-------------|:-------------------------|:-------------------------------- |
+| **`10000`**  | `3.11 ms` (✅ **1.00x**)  | `1.53 ms` (🚀 **2.03x faster**)   |
+| **`100000`** | `30.70 ms` (✅ **1.00x**) | `15.54 ms` (🚀 **1.98x faster**)  |
+| **`300000`** | `92.68 ms` (✅ **1.00x**) | `45.47 ms` (🚀 **2.04x faster**)  |
 
 ### TriangleNumber
 
 |              | `EVM`                    | `PVMInterpreter`                 |
 |:-------------|:-------------------------|:-------------------------------- |
-| **`10000`**  | `2.43 ms` (✅ **1.00x**)  | `1.12 ms` (🚀 **2.17x faster**)   |
-| **`100000`** | `24.20 ms` (✅ **1.00x**) | `10.86 ms` (🚀 **2.23x faster**)  |
-| **`360000`** | `88.69 ms` (✅ **1.00x**) | `38.46 ms` (🚀 **2.31x faster**)  |
+| **`10000`**  | `2.29 ms` (✅ **1.00x**)  | `1.09 ms` (🚀 **2.11x faster**)   |
+| **`100000`** | `22.84 ms` (✅ **1.00x**) | `10.66 ms` (🚀 **2.14x faster**)  |
+| **`360000`** | `82.29 ms` (✅ **1.00x**) | `37.01 ms` (🚀 **2.22x faster**)  |
 
 ### FibonacciRecursive
 
 |          | `EVM`                     | `PVMInterpreter`                  |
 |:---------|:--------------------------|:--------------------------------- |
-| **`12`** | `144.17 us` (✅ **1.00x**) | `150.85 us` (✅ **1.05x slower**)  |
-| **`16`** | `938.71 us` (✅ **1.00x**) | `922.11 us` (✅ **1.02x faster**)  |
-| **`20`** | `6.54 ms` (✅ **1.00x**)   | `6.20 ms` (✅ **1.05x faster**)    |
-| **`24`** | `45.73 ms` (✅ **1.00x**)  | `41.98 ms` (✅ **1.09x faster**)   |
+| **`12`** | `135.67 us` (✅ **1.00x**) | `125.02 us` (✅ **1.09x faster**)  |
+| **`16`** | `903.75 us` (✅ **1.00x**) | `762.79 us` (✅ **1.18x faster**)  |
+| **`20`** | `6.12 ms` (✅ **1.00x**)   | `4.96 ms` (✅ **1.23x faster**)    |
+| **`24`** | `42.05 ms` (✅ **1.00x**)  | `33.86 ms` (✅ **1.24x faster**)   |
 
 ### FibonacciIterative
 
 |           | `EVM`                    | `PVMInterpreter`                 |
 |:----------|:-------------------------|:-------------------------------- |
-| **`64`**  | `23.00 us` (✅ **1.00x**) | `31.88 us` (❌ *1.39x slower*)    |
-| **`128`** | `35.28 us` (✅ **1.00x**) | `42.43 us` (❌ *1.20x slower*)    |
-| **`256`** | `60.12 us` (✅ **1.00x**) | `61.20 us` (✅ **1.02x slower**)  |
+| **`64`**  | `15.04 us` (✅ **1.00x**) | `29.45 us` (❌ *1.96x slower*)    |
+| **`128`** | `26.36 us` (✅ **1.00x**) | `42.19 us` (❌ *1.60x slower*)    |
+| **`256`** | `48.61 us` (✅ **1.00x**) | `65.71 us` (❌ *1.35x slower*)    |
 
 ### FibonacciBinet
 
 |           | `EVM`                    | `PVMInterpreter`                 |
 |:----------|:-------------------------|:-------------------------------- |
-| **`64`**  | `23.01 us` (✅ **1.00x**) | `47.74 us` (❌ *2.07x slower*)    |
-| **`128`** | `25.44 us` (✅ **1.00x**) | `49.67 us` (❌ *1.95x slower*)    |
-| **`256`** | `28.66 us` (✅ **1.00x**) | `53.01 us` (❌ *1.85x slower*)    |
+| **`64`**  | `15.22 us` (✅ **1.00x**) | `41.46 us` (❌ *2.72x slower*)    |
+| **`128`** | `17.05 us` (✅ **1.00x**) | `42.84 us` (❌ *2.51x slower*)    |
+| **`256`** | `19.00 us` (✅ **1.00x**) | `44.36 us` (❌ *2.34x slower*)    |
 
 ### SHA1
 
 |           | `EVM`                     | `PVMInterpreter`                  |
 |:----------|:--------------------------|:--------------------------------- |
-| **`1`**   | `135.87 us` (✅ **1.00x**) | `243.75 us` (❌ *1.79x slower*)    |
-| **`64`**  | `258.45 us` (✅ **1.00x**) | `355.70 us` (❌ *1.38x slower*)    |
-| **`512`** | `1.10 ms` (✅ **1.00x**)   | `1.09 ms` (✅ **1.01x faster**)    |
+| **`1`**   | `110.04 us` (✅ **1.00x**) | `216.11 us` (❌ *1.96x slower*)    |
+| **`64`**  | `209.04 us` (✅ **1.00x**) | `309.48 us` (❌ *1.48x slower*)    |
+| **`512`** | `903.65 us` (✅ **1.00x**) | `980.49 us` (✅ **1.09x slower**)  |
 
 ---
 Made with [criterion-table](https://github.com/nu11ptr/criterion-table)

crates/differential/Cargo.toml

@@ -1,6 +1,5 @@
 [package]
 name = "revive-differential"
-description = "utilities for differential testing the revive compiler against EVM"
 version.workspace = true
 license.workspace = true
 edition.workspace = true

crates/explorer/Cargo.toml

@@ -1,20 +0,0 @@
-[package]
-name = "revive-explorer"
-version.workspace = true
-license.workspace = true
-edition.workspace = true
-repository.workspace = true
-authors.workspace = true
-description = "Helper utility to inspect debug builds"
-
-[[bin]]
-name = "revive-explorer"
-path = "src/main.rs"
-
-[dependencies]
-anyhow = { workspace = true }
-clap = { workspace = true, features = ["help", "std", "derive"] }
-num_cpus = { workspace = true }
-
-revive-yul = { workspace = true }
-

crates/explorer/README.md

@@ -1,49 +0,0 @@
-# revive-explorer
-
-The `revive-explorer` is a helper utility for exploring the compilers YUL lowering unit.
-
-It analyzes a given shared objects from the debug dump and outputs:
-- The count of each YUL statement translated.
-- A per YUL statement break-down of bytecode size contributed per.
-- Estimated `yul-phaser` cost parameters.
-
-Example:
-
-```
-statements count:
-	block 532
-	Caller 20
-	Not 73
-	Gas 24
-	Shr 2
-    ...
-	Shl 259
-	SetImmutable 2
-	CodeSize 1
-	CallDataLoad 87
-	Return 56
-bytes per statement:
-	Or 756
-	CodeCopy 158
-	Log3 620
-	Return 1562
-	MStore 36128
-	...
-	ReturnDataCopy 2854
-	DataOffset 28
-	assignment 1194
-	Number 540
-	CallValue 4258
-yul-phaser parameters:
-	--break-cost 1
-	--variable-declaration-cost 3
-	--function-call-cost 8
-	--if-cost 4
-	--expression-statement-cost 6
-	--function-definition-cost 11
-	--switch-cost 3
-	--block-cost 1
-	--leave-cost 1
-	--assignment-cost 1
-```
-

crates/explorer/src/dwarfdump.rs

@@ -1,68 +0,0 @@
-//! The `llvm-dwarfdump` utility helper library.
-
-use std::{
-    path::{Path, PathBuf},
-    process::{Command, Stdio},
-};
-
-pub static EXECUTABLE: &str = "llvm-dwarfdump";
-pub static DEBUG_LINES_ARGUMENTS: [&str; 1] = ["--debug-line"];
-pub static SOURCE_FILE_ARGUMENTS: [&str; 1] = ["--show-sources"];
-
-/// Calls the `llvm-dwarfdump` tool to extract debug line information
-/// from the shared object at `path`. Returns the output.
-///
-/// Provide `Some(dwarfdump_exectuable)` to override the default executable.
-pub fn debug_lines(
-    shared_object: &Path,
-    dwarfdump_executable: &Option<PathBuf>,
-) -> anyhow::Result<String> {
-    dwarfdump(shared_object, dwarfdump_executable, &DEBUG_LINES_ARGUMENTS)
-}
-
-/// Calls the `llvm-dwarfdump` tool to extract the source file name.
-/// Returns the source file path.
-///
-/// Provide `Some(dwarfdump_exectuable)` to override the default executable.
-pub fn source_file(
-    shared_object: &Path,
-    dwarfdump_executable: &Option<PathBuf>,
-) -> anyhow::Result<PathBuf> {
-    let output = dwarfdump(shared_object, dwarfdump_executable, &SOURCE_FILE_ARGUMENTS)?;
-    let output = output.trim();
-
-    if output.is_empty() {
-        anyhow::bail!(
-            "the shared object at path `{}` doesn't contain the source file name. Hint: compile with debug information (-g)?",
-            shared_object.display()
-        );
-    }
-
-    Ok(output.into())
-}
-
-/// The internal `llvm-dwarfdump` helper function.
-fn dwarfdump(
-    shared_object: &Path,
-    dwarfdump_executable: &Option<PathBuf>,
-    arguments: &[&str],
-) -> anyhow::Result<String> {
-    let executable = dwarfdump_executable
-        .to_owned()
-        .unwrap_or_else(|| PathBuf::from(EXECUTABLE));
-
-    let output = Command::new(executable)
-        .args(arguments)
-        .arg(shared_object)
-        .stdin(Stdio::null())
-        .stdout(Stdio::piped())
-        .stderr(Stdio::piped())
-        .spawn()?
-        .wait_with_output()?;
-
-    if !output.status.success() {
-        anyhow::bail!(String::from_utf8_lossy(&output.stderr).to_string());
-    }
-
-    Ok(String::from_utf8_lossy(&output.stdout).to_string())
-}

crates/explorer/src/dwarfdump_analyzer.rs

@@ -1,222 +0,0 @@
-//! The core dwarf dump analyzer library.
-
-use std::{
-    collections::HashMap,
-    path::{Path, PathBuf},
-};
-
-use revive_yul::lexer::token::location::Location;
-
-use crate::location_mapper::{self, LocationMapper};
-
-/// The dwarf dump analyzer.
-///
-/// Loads debug information from `llvm-dwarfdump` and calculates statistics
-/// about the compiled YUL statements:
-/// - Statements count
-/// - Per-statement
-#[derive(Debug, Default)]
-pub struct DwarfdumpAnalyzer {
-    /// The YUL source file path.
-    source: PathBuf,
-
-    /// The YUL location to statements map.
-    location_map: HashMap<Location, String>,
-
-    /// The `llvm-dwarfdump --debug-lines` output.
-    debug_lines: String,
-
-    /// The observed statements.
-    statements_count: HashMap<String, usize>,
-    /// The observed statement to instructions size.
-    statements_size: HashMap<String, u64>,
-}
-
-impl DwarfdumpAnalyzer {
-    /// The debug info analyzer constructor.
-    ///
-    /// `source` is the path to the YUL source file.
-    /// `debug_lines` is the `llvm-dwarfdump --debug-lines` output.
-    pub fn new(source: &Path, debug_lines: String) -> Self {
-        Self {
-            source: source.to_path_buf(),
-            debug_lines,
-            ..Default::default()
-        }
-    }
-
-    /// Run the analysis.
-    pub fn analyze(&mut self) -> anyhow::Result<()> {
-        self.map_locations()?;
-        self.analyze_statements()?;
-        Ok(())
-    }
-
-    /// Populate the maps so that we can always unwrap later.
-    fn map_locations(&mut self) -> anyhow::Result<()> {
-        self.location_map = LocationMapper::map_locations(&self.source)?;
-
-        self.statements_count = HashMap::with_capacity(self.location_map.len());
-        self.statements_size = HashMap::with_capacity(self.location_map.len());
-
-        for statement in self.location_map.values() {
-            if !self.statements_size.contains_key(statement) {
-                self.statements_size.insert(statement.clone(), 0);
-            }
-
-            *self.statements_count.entry(statement.clone()).or_insert(0) += 1;
-        }
-
-        Ok(())
-    }
-
-    /// Analyze how much bytes of insturctions each statement contributes.
-    fn analyze_statements(&mut self) -> anyhow::Result<()> {
-        let mut previous_offset = 0;
-        let mut previous_location = Location::new(0, 0);
-
-        for line in self
-            .debug_lines
-            .lines()
-            .skip_while(|line| !line.starts_with("Address"))
-            .skip(2)
-        {
-            let mut parts = line.split_whitespace();
-            let (Some(offset), Some(line), Some(column)) =
-                (parts.next(), parts.next(), parts.next())
-            else {
-                continue;
-            };
-
-            let current_offset = u64::from_str_radix(offset.trim_start_matches("0x"), 16)?;
-            let mut current_location = Location::new(line.parse()?, column.parse()?);
-
-            // TODO: A bug? Needs further investigation.
-            if current_location.line == 0 && current_location.column != 0 {
-                current_location.line = previous_location.line;
-            }
-
-            if let Some(statement) = self.location_map.get(&previous_location) {
-                let contribution = current_offset - previous_offset;
-                *self.statements_size.get_mut(statement).unwrap() += contribution;
-            }
-
-            previous_offset = current_offset;
-            previous_location = current_location;
-        }
-
-        Ok(())
-    }
-
-    /// Print the per-statement count break-down.
-    pub fn display_statement_count(&self) {
-        println!("statements count:");
-        for (statement, count) in self.statements_count.iter() {
-            println!("\t{statement} {count}");
-        }
-    }
-
-    /// Print the per-statement byte size contribution break-down.
-    pub fn display_statement_size(&self) {
-        println!("bytes per statement:");
-        for (statement, size) in self.statements_size.iter() {
-            println!("\t{statement} {size}");
-        }
-    }
-
-    /// Print the estimated `yul-phaser` cost parameters.
-    pub fn display_phaser_costs(&self, yul_phaser_scale: u64) {
-        println!("yul-phaser parameters:");
-        for (parameter, cost) in self.phaser_costs(yul_phaser_scale) {
-            println!("\t{parameter} {cost}");
-        }
-    }
-
-    /// Estimate the `yul-phaser` costs using the simplified weight function:
-    /// `Total size / toal count = cost`
-    pub fn phaser_costs(&self, yul_phaser_scale: u64) -> Vec<(String, u64)> {
-        let mut costs: HashMap<String, (usize, u64)> = HashMap::with_capacity(16);
-        for (statement, count) in self
-            .statements_count
-            .iter()
-            .filter(|(_, count)| **count > 0)
-        {
-            let size = self.statements_size.get(statement).unwrap();
-            let cost = match statement.as_str() {
-                location_mapper::FOR => "--for-loop-cost",
-                location_mapper::OTHER => continue,
-                location_mapper::INTERNAL => continue,
-                location_mapper::BLOCK => "--block-cost",
-                location_mapper::FUNCTION_CALL => "--function-call-cost",
-                location_mapper::IF => "--if-cost",
-                location_mapper::SWITCH => "--switch-cost",
-                location_mapper::DECLARATION => "--variable-declaration-cost",
-                location_mapper::ASSIGNMENT => "--assignment-cost",
-                location_mapper::FUNCTION_DEFINITION => "--function-definition-cost",
-                location_mapper::IDENTIFIER => "--identifier-cost",
-                location_mapper::LITERAL => "--literal-cost",
-                _ => "--expression-statement-cost",
-            };
-
-            let entry = costs.entry(cost.to_string()).or_default();
-            entry.0 += count;
-            entry.1 += size;
-        }
-
-        let costs = costs
-            .iter()
-            .map(|(cost, (count, size))| {
-                let ratio = *size / *count as u64;
-                (cost.to_string(), ratio.min(100))
-            })
-            .collect::<Vec<_>>();
-
-        let scaled_costs = scale_to(
-            costs
-                .iter()
-                .map(|(_, ratio)| *ratio)
-                .collect::<Vec<_>>()
-                .as_slice(),
-            yul_phaser_scale,
-        );
-
-        costs
-            .iter()
-            .zip(scaled_costs)
-            .map(|((cost, _), scaled_ratio)| (cost.to_string(), scaled_ratio))
-            .collect()
-    }
-}
-
-/// Given a slice of u64 values, returns a Vec<u64> where each element
-/// is linearly scaled into the closed interval [1, 10].
-fn scale_to(data: &[u64], scale_max: u64) -> Vec<u64> {
-    if data.is_empty() {
-        return Vec::new();
-    }
-
-    let mut min = data[0];
-    let mut max = data[0];
-    for &x in &data[1..] {
-        if x < min {
-            min = x;
-        }
-        if x > max {
-            max = x;
-        }
-    }
-    if max < scale_max {
-        return data.to_vec();
-    }
-
-    let range = max - min;
-    data.iter()
-        .map(|&x| {
-            if range == 0 {
-                1
-            } else {
-                1 + (x - min) * scale_max / range
-            }
-        })
-        .collect()
-}

crates/explorer/src/lib.rs

@@ -1,6 +0,0 @@
-//! The revive explorer leverages debug info to get insights into emitted code.
-
-pub mod dwarfdump;
-pub mod dwarfdump_analyzer;
-pub mod location_mapper;
-pub mod yul_phaser;

crates/explorer/src/location_mapper.rs

@@ -1,123 +0,0 @@
-//! The location mapper utility maps YUL source locations to AST statements.
-
-use std::{collections::HashMap, path::Path};
-
-use revive_yul::{
-    lexer::{token::location::Location, Lexer},
-    parser::{
-        identifier::Identifier,
-        statement::{
-            assignment::Assignment,
-            block::Block,
-            expression::{function_call::FunctionCall, literal::Literal},
-            for_loop::ForLoop,
-            function_definition::FunctionDefinition,
-            if_conditional::IfConditional,
-            object::Object,
-            switch::Switch,
-            variable_declaration::VariableDeclaration,
-        },
-    },
-    visitor::{AstNode, AstVisitor},
-};
-
-/// Code attributed to an unknown location.
-pub const OTHER: &str = "other";
-/// Code attributed to a compiler internal location.
-pub const INTERNAL: &str = "internal";
-/// Code attributed to a block.
-pub const BLOCK: &str = "block";
-/// Code attributed to a function call.
-pub const FUNCTION_CALL: &str = "function_call";
-/// Code attributed to a for loop.
-pub const FOR: &str = "for";
-/// Code attributed to an if statement.
-pub const IF: &str = "if";
-/// Code attributed to a switch statement.
-pub const SWITCH: &str = "switch";
-/// Code attributed to a variable declaration.
-pub const DECLARATION: &str = "let";
-/// Code attributed to a variable assignement.
-pub const ASSIGNMENT: &str = "assignment";
-/// Code attributed to a function definition.
-pub const FUNCTION_DEFINITION: &str = "function_definition";
-/// Code attributed to an identifier.
-pub const IDENTIFIER: &str = "identifier";
-/// Code attributed to a literal.
-pub const LITERAL: &str = "literal";
-
-/// The location to statements mapper.
-pub struct LocationMapper(HashMap<Location, String>);
-
-impl LocationMapper {
-    /// Construct a node location map from the given YUL `source` file.
-    pub fn map_locations(source: &Path) -> anyhow::Result<HashMap<Location, String>> {
-        let mut lexer = Lexer::new(std::fs::read_to_string(source)?);
-        let ast = Object::parse(&mut lexer, None).map_err(|error| {
-            anyhow::anyhow!("Contract `{}` parsing error: {:?}", source.display(), error)
-        })?;
-
-        let mut location_map = Self(Default::default());
-        ast.accept(&mut location_map);
-        location_map.0.insert(Location::new(0, 0), OTHER.into());
-        location_map.0.insert(Location::new(1, 0), INTERNAL.into());
-
-        Ok(location_map.0)
-    }
-}
-
-impl AstVisitor for LocationMapper {
-    fn visit(&mut self, node: &impl AstNode) {
-        node.visit_children(self);
-    }
-
-    fn visit_block(&mut self, node: &Block) {
-        node.visit_children(self);
-        self.0.insert(node.location, BLOCK.into());
-    }
-
-    fn visit_assignment(&mut self, node: &Assignment) {
-        node.visit_children(self);
-        self.0.insert(node.location, ASSIGNMENT.into());
-    }
-
-    fn visit_if_conditional(&mut self, node: &IfConditional) {
-        node.visit_children(self);
-        self.0.insert(node.location, IF.into());
-    }
-
-    fn visit_variable_declaration(&mut self, node: &VariableDeclaration) {
-        node.visit_children(self);
-        self.0.insert(node.location, DECLARATION.into());
-    }
-
-    fn visit_function_call(&mut self, node: &FunctionCall) {
-        node.visit_children(self);
-        self.0.insert(node.location, node.name.to_string());
-    }
-
-    fn visit_function_definition(&mut self, node: &FunctionDefinition) {
-        node.visit_children(self);
-        self.0.insert(node.location, FUNCTION_DEFINITION.into());
-    }
-
-    fn visit_identifier(&mut self, node: &Identifier) {
-        node.visit_children(self);
-        self.0.insert(node.location, IDENTIFIER.into());
-    }
-
-    fn visit_literal(&mut self, node: &Literal) {
-        node.visit_children(self);
-        self.0.insert(node.location, LITERAL.into());
-    }
-
-    fn visit_for_loop(&mut self, node: &ForLoop) {
-        node.visit_children(self);
-        self.0.insert(node.location, FOR.into());
-    }
-
-    fn visit_switch(&mut self, node: &Switch) {
-        node.visit_children(self);
-        self.0.insert(node.location, SWITCH.into());
-    }
-}

crates/explorer/src/main.rs

@@ -1,59 +0,0 @@
-use std::path::PathBuf;
-
-use clap::Parser;
-
-use revive_explorer::{dwarfdump, dwarfdump_analyzer::DwarfdumpAnalyzer, yul_phaser};
-
-/// The `revive-explorer` is a helper utility for exploring the compilers YUL lowering unit.
-///
-/// It analyzes a given shared objects from the debug dump and outputs:
-/// - The count of each YUL statement translated.
-/// - A per YUL statement break-down of bytecode size contributed per.
-/// - Estimated `yul-phaser` cost parameters.
-///
-/// Note: This tool might not be fully accurate, especially when the code was optimized.
-#[derive(Parser, Debug)]
-#[command(version, about, long_about = None)]
-struct Args {
-    /// Path of the dwarfdump executable.
-    #[arg(short, long)]
-    dwarfdump: Option<PathBuf>,
-
-    /// The YUL phaser cost scale maximum value.
-    #[arg(short, long, default_value_t = 10)]
-    cost_scale: u64,
-
-    /// Run the provided yul-phaser executable using the estimated costs.
-    #[arg(short, long)]
-    yul_phaser: Option<PathBuf>,
-
-    /// Path of the shared object to analyze.
-    /// It must have been compiled with debug info (-g).
-    file: PathBuf,
-}
-
-fn main() -> anyhow::Result<()> {
-    let args = Args::parse();
-
-    let source_file = dwarfdump::source_file(&args.file, &args.dwarfdump)?;
-    let debug_lines = dwarfdump::debug_lines(&args.file, &args.dwarfdump)?;
-    let mut analyzer = DwarfdumpAnalyzer::new(source_file.as_path(), debug_lines);
-
-    analyzer.analyze()?;
-
-    if let Some(path) = args.yul_phaser.as_ref() {
-        yul_phaser::run(
-            path,
-            source_file.as_path(),
-            analyzer.phaser_costs(args.cost_scale).as_slice(),
-            num_cpus::get() / 2, // TODO: should be configurable.
-        )?;
-        return Ok(());
-    }
-
-    analyzer.display_statement_count();
-    analyzer.display_statement_size();
-    analyzer.display_phaser_costs(args.cost_scale);
-
-    Ok(())
-}

crates/explorer/src/yul_phaser.rs

@@ -1,79 +0,0 @@
-//! The revive explorer YUL phaser utility library.
-//!
-//! This can be used to invoke the `yul-phaser` utility,
-//! used to find better YUL optimizer sequences.
-
-use std::{
-    path::{Path, PathBuf},
-    process::{Command, Stdio},
-    thread,
-    time::{SystemTime, UNIX_EPOCH},
-};
-
-/// The `yul-phaser` sane default arguments:
-/// - Less verbose output.
-/// - Sufficient rounds.
-/// - Sufficient random population start.
-const ARGUMENTS: [&str; 6] = [
-    "--hide-round",
-    "--rounds",
-    "1000",
-    "--random-population",
-    "100",
-    "--show-only-top-chromosome",
-];
-
-/// Run multiple YUL phaser executables in parallel.
-pub fn run(
-    executable: &Path,
-    source: &Path,
-    costs: &[(String, u64)],
-    n_threads: usize,
-) -> anyhow::Result<()> {
-    let mut handles = Vec::with_capacity(n_threads);
-
-    for n in 0..n_threads {
-        let executable = executable.to_path_buf();
-        let source = source.to_path_buf();
-        let costs = costs.to_vec();
-
-        handles.push(thread::spawn(move || {
-            spawn_process(executable, source, costs, n)
-        }));
-    }
-
-    for handle in handles {
-        let _ = handle.join();
-    }
-
-    Ok(())
-}
-
-/// The `yul-phaser` process spawning helper function.
-fn spawn_process(
-    executable: PathBuf,
-    source: PathBuf,
-    costs: Vec<(String, u64)>,
-    seed: usize,
-) -> anyhow::Result<()> {
-    let cost_parameters = costs
-        .iter()
-        .flat_map(|(parameter, cost)| vec![parameter.clone(), cost.to_string()]);
-
-    let secs = SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .expect("Time went backwards")
-        .as_secs();
-
-    Command::new(executable)
-        .args(cost_parameters)
-        .args(ARGUMENTS)
-        .arg("--seed")
-        .arg((seed + secs as usize).to_string())
-        .arg(source)
-        .stdin(Stdio::null())
-        .spawn()?
-        .wait()?;
-
-    Ok(())
-}

crates/integration/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revive-integration"
-version = "0.1.1"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -13,9 +13,8 @@ alloy-sol-types = { workspace = true }
 hex = { workspace = true }
 serde_json = { workspace = true }
 
-resolc = { 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": 960,
-  "Computation": 2367,
-  "DivisionArithmetics": 9108,
-  "ERC20": 17655,
-  "Events": 1680,
-  "FibonacciIterative": 1536,
-  "Flipper": 2137,
-  "SHA1": 8299
+  "Baseline": 1110,
+  "Computation": 2389,
+  "DivisionArithmetics": 14822,
+  "ERC20": 23973,
+  "Events": 1605,
+  "FibonacciIterative": 2023,
+  "Flipper": 1989,
+  "SHA1": 17026
 }

crates/integration/contracts/AddressPredictor.sol

@@ -1,33 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.28;
-
-contract Predicted {
-    uint public salt;
-
-    constructor(uint _salt) {
-        salt = _salt;
-    }
-}
-
-contract AddressPredictor {
-    constructor(uint _salt, bytes memory _bytecode) payable {
-        address deployed = address(new Predicted{salt: bytes32(_salt)}(_salt));
-        address predicted = predictAddress(_salt, _bytecode);
-        assert(deployed == predicted);
-    }
-
-    function predictAddress(
-        uint _foo,
-        bytes memory _bytecode
-    ) public view returns (address predicted) {
-        bytes32 addr = keccak256(
-            abi.encodePacked(
-                bytes1(0xff),
-                address(this),
-                bytes32(_foo),
-                keccak256(abi.encodePacked(_bytecode, abi.encode(_foo)))
-            )
-        );
-        predicted = address(uint160(uint(addr)));
-    }
-}

crates/integration/contracts/DelegateCaller.sol

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

@@ -1,36 +0,0 @@
-// 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/LayoutAt.sol

@@ -1,52 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.29;
-
-/* runner.json
-{
-    "differential": true,
-    "actions": [
-        {
-            "Instantiate": {
-                "code": {
-                    "Solidity": {
-                        "contract": "LayoutAt"
-                    }
-                }
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "a7a0d537"
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "15393349"
-            }
-        }
-    ]
-}
-*/
-
-contract LayoutAt layout at 0xDEADBEEF + 0xCAFEBABE {
-    uint[3] public something;
-
-    constructor() payable {
-        something[0] = 1337;
-        something[1] = 42;
-        something[2] = 69;
-    }
-
-    function slotOfSomething() public pure returns (uint ret) {
-        assembly {
-            ret := something.slot
-        }
-    }
-}

crates/integration/contracts/MCopyOverlap.sol

@@ -1,51 +0,0 @@
-// 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/contracts/MLoad.sol

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

crates/integration/contracts/SAR.sol

@@ -1,49 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8;
-
-/* runner.json
-{
-    "differential": true,
-    "actions": [
-        {
-            "Instantiate": {
-                "code": {
-                    "Solidity": {
-                        "contract": "SAR"
-                    }
-                }
-            }
-        }
-    ]
-}
-*/
-
-contract SAR {
-  constructor() payable {
-    assert(sar(0x03, 0x01) == 0x01);
-    assert(
-      sar(
-        0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
-        0x01
-      ) == 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-    );
-    assert(
-      sar(
-        0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
-        0xff
-      ) == 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-    );
-    assert(
-      sar(
-        0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
-        0x100
-      ) == 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-    );
-  }
-
-  function sar(uint256 a, uint256 b) public pure returns (uint256 c) {
-    assembly {
-      c := sar(b, a)
-    }
-  }
-}

crates/integration/contracts/flipper.sol

@@ -15,7 +15,7 @@ pragma solidity ^0.8;
                 "Instantiated": 0
             },
             "key": "0000000000000000000000000000000000000000000000000000000000000000",
-            "expected": "0000000000000000000000000000000000000000000000000000000000000001"
+            "expected": "0100000000000000000000000000000000000000000000000000000000000000"
         }
     },
     {

crates/integration/src/cases.rs

@@ -1,8 +1,7 @@
 use alloy_primitives::{Address, Bytes, I256, U256};
 use alloy_sol_types::{sol, SolCall, SolConstructor};
 
-use resolc::test_utils::*;
-use revive_llvm_context::OptimizerSettings;
+use revive_solidity::test_utils::*;
 
 #[derive(Clone)]
 pub struct Contract {
@@ -250,19 +249,8 @@ sol!(
 );
 case!("Storage.sol", Storage, transientCall, storage_transient, value: U256);
 
-sol!(
-    contract Predicted {
-        constructor(uint _foo);
-    }
-    contract AddressPredictor {
-        constructor(uint _foo, bytes memory _bytecode) payable;
-    }
-);
-case!("AddressPredictor.sol", Predicted, constructorCall, predicted_constructor, salt: U256);
-case!("AddressPredictor.sol", AddressPredictor, constructorCall, address_predictor_constructor, salt: U256, bytecode: Bytes);
-
 impl Contract {
-    pub fn build(calldata: Vec<u8>, name: &'static str, code: &str) -> Self {
+    fn build(calldata: Vec<u8>, name: &'static str, code: &str) -> Self {
         Self {
             name,
             evm_runtime: compile_evm_bin_runtime(name, code),
@@ -270,19 +258,11 @@ impl Contract {
             calldata,
         }
     }
-
-    pub fn build_size_opt(calldata: Vec<u8>, name: &'static str, code: &str) -> Self {
-        Self {
-            name,
-            evm_runtime: compile_evm_bin_runtime(name, code),
-            pvm_runtime: compile_blob_with_options(name, code, true, OptimizerSettings::size()),
-            calldata,
-        }
-    }
 }
 
 #[cfg(test)]
 mod tests {
+    use alloy_primitives::{Bytes, U256};
     use rayon::iter::{IntoParallelIterator, ParallelIterator};
     use serde::{de::Deserialize, Serialize};
     use std::{collections::BTreeMap, fs::File};
@@ -322,47 +302,14 @@ mod tests {
         };
 
         [
-            (|| {
-                Contract::build_size_opt(
-                    vec![],
-                    "Baseline",
-                    include_str!("../contracts/Baseline.sol"),
-                )
-            }) as _,
-            (|| {
-                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 _,
+            Contract::baseline as fn() -> Contract,
+            Contract::flipper as fn() -> Contract,
+            (|| Contract::odd_product(0)) as fn() -> Contract,
+            (|| Contract::fib_iterative(U256::ZERO)) as fn() -> Contract,
+            Contract::erc20 as fn() -> Contract,
+            (|| Contract::sha1(Bytes::new())) as fn() -> Contract,
+            (|| Contract::division_arithmetics_div(U256::ZERO, U256::ZERO)) as fn() -> Contract,
+            (|| Contract::event(U256::ZERO)) as fn() -> Contract,
         ]
         .into_par_iter()
         .map(extract_code_size)

crates/integration/src/tests.rs

@@ -33,7 +33,6 @@ 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,11 +55,6 @@ test_spec!(create2, "CreateB", "Create2.sol");
 test_spec!(transfer, "Transfer", "Transfer.sol");
 test_spec!(send, "Send", "Send.sol");
 test_spec!(function_pointer, "FunctionPointer", "FunctionPointer.sol");
-test_spec!(mload, "MLoad", "MLoad.sol");
-test_spec!(delegate_no_contract, "DelegateCaller", "DelegateCaller.sol");
-test_spec!(function_type, "FunctionType", "FunctionType.sol");
-test_spec!(layout_at, "LayoutAt", "LayoutAt.sol");
-test_spec!(shift_arithmetic_right, "SAR", "SAR.sol");
 
 fn instantiate(path: &str, contract: &str) -> Vec<SpecsAction> {
     vec![Instantiate {
@@ -487,31 +481,3 @@ fn transfer_denies_reentrancy() {
     }
     .run();
 }
-
-#[test]
-fn create2_salt() {
-    let salt = U256::from(777);
-    let predicted = Contract::predicted_constructor(salt).pvm_runtime;
-    let predictor = Contract::address_predictor_constructor(salt, predicted.clone().into());
-    Specs {
-        actions: vec![
-            Upload {
-                origin: TestAddress::Alice,
-                code: Code::Bytes(predicted),
-                storage_deposit_limit: None,
-            },
-            Instantiate {
-                origin: TestAddress::Alice,
-                value: 0,
-                gas_limit: Some(GAS_LIMIT),
-                storage_deposit_limit: None,
-                code: Code::Bytes(predictor.pvm_runtime),
-                data: predictor.calldata,
-                salt: OptionalHex::default(),
-            },
-        ],
-        differential: false,
-        ..Default::default()
-    }
-    .run();
-}

crates/linker/src/lib.rs

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

crates/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))
-        .warnings(false)
+        .flag("-Wno-unused-parameter")
         .cpp(true)
         .file("src/linker.cpp")
         .compile("liblinker.a");

crates/llvm-builder/Cargo.toml

@@ -6,7 +6,7 @@ authors = [
     "Anton Baliasnikov <aba@matterlabs.dev>",
     "Cyrill Leutwiler <cyrill@parity.io>",
 ]
-version = "0.2.0"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -32,7 +32,6 @@ 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/README.md

@@ -59,7 +59,7 @@ Obtain a compatible build for your host platform from the release section of thi
 
    * Install the builder using `cargo`:
       ```shell
-      cargo install --force --locked --path crates/llvm-builder
+      cargo install --git https://github.com/paritytech/revive-llvm-builder --force --locked
       ```
 
       > The builder is not the LLVM framework itself, but a tool that clones its repository and runs a sequence of build commands. By default it is installed in `~/.cargo/bin/`, which is recommended to be added to your `$PATH`.
@@ -88,12 +88,7 @@ Obtain a compatible build for your host platform from the release section of thi
 
       Build artifacts end up in the `./target-llvm/gnu/target-final/` directory by default.
       The `gnu` directory depends on the supported archticture and will either be `gnu`, `musl` or `emscripten`.
-      You now need to export the final target directory `$LLVM_SYS_181_PREFIX`:
-
-      ```shell
-      export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final
-      ```
-
+      You now need to export the final target directory `$LLVM_SYS_181_PREFIX`: `export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final`
       If built with the `--enable-tests` option, test tools will be in the `./target-llvm/gnu/build-final/` directory, along with copies of the build artifacts. For all supported build options, run `revive-llvm build --help`.
 
 </details>

crates/llvm-builder/src/build_type.rs

@@ -22,7 +22,7 @@ impl std::str::FromStr for BuildType {
             "Release" => Ok(Self::Release),
             "RelWithDebInfo" => Ok(Self::RelWithDebInfo),
             "MinSizeRel" => Ok(Self::MinSizeRel),
-            value => Err(format!("Unsupported build type: `{value}`")),
+            value => Err(format!("Unsupported build type: `{}`", value)),
         }
     }
 }

crates/llvm-builder/src/builtins.rs

@@ -1,8 +1,5 @@
 //! 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",
@@ -47,31 +44,24 @@ 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!(
@@ -86,18 +76,12 @@ 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='{}'",
-            to_unix(clang_path.clone())?.display()
-        ),
-        format!("-DCMAKE_ASM_COMPILER='{}'", to_unix(clang_path)?.display()),
-        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!("-DCMAKE_C_COMPILER='{}'", clang_path.to_string_lossy()),
+        format!("-DCMAKE_ASM_COMPILER='{}'", clang_path.to_string_lossy()),
+        format!("-DCMAKE_CXX_COMPILER='{}'", clangxx_path.to_string_lossy()),
+        format!("-DCMAKE_AR='{}'", ar_path.to_string_lossy()),
+        format!("-DCMAKE_NM='{}'", nm_path.to_string_lossy()),
+        format!("-DCMAKE_RANLIB='{}'", ranlib_path.to_string_lossy()),
         format!(
             "-DLLVM_CONFIG_PATH='{}'",
             llvm_config_path.to_string_lossy()
@@ -147,17 +131,7 @@ pub fn build(
         "LLVM compiler-rt building cmake",
     )?;
 
-    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",
-    )?;
+    crate::utils::ninja(&llvm_compiler_rt_build)?;
 
     Ok(())
 }

crates/llvm-builder/src/ccache_variant.rs

@@ -16,7 +16,7 @@ impl std::str::FromStr for CcacheVariant {
         match value {
             "ccache" => Ok(Self::Ccache),
             "sccache" => Ok(Self::Sccache),
-            value => Err(format!("Unsupported ccache variant: `{value}`")),
+            value => Err(format!("Unsupported ccache variant: `{}`", value)),
         }
     }
 }

crates/llvm-builder/src/lib.rs

@@ -127,22 +127,23 @@ pub fn build(
     sanitizer: Option<sanitizer::Sanitizer>,
     enable_valgrind: bool,
 ) -> anyhow::Result<()> {
-    log::trace!("build type: {build_type:?}");
-    log::trace!("target env: {target_env:?}");
-    log::trace!("targets: {targets:?}");
-    log::trace!("llvm projects: {llvm_projects:?}");
-    log::trace!("enable rtti: {enable_rtti:?}");
-    log::trace!("default target: {default_target:?}");
-    log::trace!("eneable tests: {enable_tests:?}");
-    log::trace!("enable_coverage: {enable_coverage:?}");
-    log::trace!("extra args: {extra_args:?}");
-    log::trace!("sanitzer: {sanitizer:?}");
-    log::trace!("enable valgrind: {enable_valgrind:?}");
+    log::trace!("build type: {:?}", build_type);
+    log::trace!("target env: {:?}", target_env);
+    log::trace!("targets: {:?}", targets);
+    log::trace!("llvm projects: {:?}", llvm_projects);
+    log::trace!("enable rtti: {:?}", enable_rtti);
+    log::trace!("default target: {:?}", default_target);
+    log::trace!("eneable tests: {:?}", enable_tests);
+    log::trace!("enable_coverage: {:?}", enable_coverage);
+    log::trace!("extra args: {:?}", extra_args);
+    log::trace!("sanitzer: {:?}", sanitizer);
+    log::trace!("enable valgrind: {:?}", enable_valgrind);
 
     if !PathBuf::from(LLVMPath::DIRECTORY_LLVM_SOURCE).exists() {
         log::error!(
-            "LLVM project source directory {} does not exist (run `revive-llvm --target-env {target_env} clone`)",
-            LLVMPath::DIRECTORY_LLVM_SOURCE
+            "LLVM project source directory {} does not exist (run `revive-llvm --target-env {} clone`)",
+            LLVMPath::DIRECTORY_LLVM_SOURCE,
+            target_env
         )
     }
 
@@ -213,7 +214,7 @@ pub fn build(
                 sanitizer,
             )?;
         } else if cfg!(target_os = "windows") {
-            platforms::x86_64_windows_msvc::build(
+            platforms::x86_64_windows_gnu::build(
                 build_type,
                 targets,
                 llvm_projects,

crates/llvm-builder/src/llvm_project.rs

@@ -22,7 +22,7 @@ impl std::str::FromStr for LLVMProject {
             "lld" => Ok(Self::LLD),
             "lldb" => Ok(Self::LLDB),
             "mlir" => Ok(Self::MLIR),
-            value => Err(format!("Unsupported LLVM project to enable: `{value}`")),
+            value => Err(format!("Unsupported LLVM project to enable: `{}`", value)),
         }
     }
 }

crates/llvm-builder/src/lock.rs

@@ -30,7 +30,7 @@ impl TryFrom<&PathBuf> for Lock {
     fn try_from(path: &PathBuf) -> Result<Self, Self::Error> {
         let mut config_str = String::new();
         let mut config_file =
-            File::open(path).with_context(|| format!("Error opening {path:?} file"))?;
+            File::open(path).with_context(|| format!("Error opening {:?} file", path))?;
         config_file.read_to_string(&mut config_str)?;
         Ok(toml::from_str(&config_str)?)
     }

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_msvc;
+pub mod x86_64_windows_gnu;
 
 use std::str::FromStr;
 
@@ -29,7 +29,7 @@ impl FromStr for Platform {
     fn from_str(value: &str) -> Result<Self, Self::Err> {
         match value {
             "PolkaVM" => Ok(Self::PolkaVM),
-            value => Err(format!("Unsupported platform: `{value}`")),
+            value => Err(format!("Unsupported platform: `{}`", value)),
         }
     }
 }

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; 21] = [
+pub const SHARED_BUILD_OPTS: [&str; 19] = [
     "-DPACKAGE_VENDOR='Parity Technologies'",
     "-DCMAKE_BUILD_WITH_INSTALL_RPATH=1",
     "-DLLVM_BUILD_DOCS='Off'",
@@ -28,8 +28,6 @@ pub const SHARED_BUILD_OPTS: [&str; 21] = [
     "-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_gnu.rs

@@ -1,6 +1,7 @@
 //! The revive LLVM amd64 `windows-gnu` builder.
 
 use std::collections::HashSet;
+use std::path::PathBuf;
 use std::process::Command;
 
 use crate::build_type::BuildType;
@@ -27,6 +28,10 @@ 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)?;
@@ -43,12 +48,15 @@ pub fn build(
                 "-B",
                 llvm_build_final.to_string_lossy().as_ref(),
                 "-G",
-                "Visual Studio 17 2022",
+                "Ninja",
                 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
@@ -67,7 +75,7 @@ pub fn build(
                         .join(";")
                 )
                 .as_str(),
-                "-DLLVM_BUILD_LLVM_C_DYLIB=Off",
+                "-DLLVM_USE_LINKER='lld'",
             ])
             .args(crate::platforms::shared::shared_build_opts_default_target(
                 default_target,
@@ -99,16 +107,20 @@ pub fn build(
         "LLVM building cmake",
     )?;
 
-    crate::utils::command(
-        Command::new("cmake").args([
-            "--build",
-            llvm_build_final.to_string_lossy().as_ref(),
-            "--target",
-            "install",
-            "--config",
-            build_type.to_string().as_str(),
-        ]),
-        "Building with msbuild",
+    crate::utils::ninja(llvm_build_final.as_ref())?;
+
+    let libstdcpp_source_path = match std::env::var("LIBSTDCPP_SOURCE_PATH") {
+        Ok(libstdcpp_source_path) => PathBuf::from(libstdcpp_source_path),
+        Err(error) => anyhow::bail!(
+            "The `LIBSTDCPP_SOURCE_PATH` must be set to the path to the libstdc++.a static library: {}", error
+        ),
+    };
+    let mut libstdcpp_destination_path = llvm_target_final;
+    libstdcpp_destination_path.push("./lib/libstdc++.a");
+    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/revive_llvm/main.rs

@@ -69,8 +69,8 @@ fn main_inner() -> anyhow::Result<()> {
                 })
                 .collect();
 
-            log::debug!("extra_args: {extra_args:#?}");
-            log::debug!("extra_args_unescaped: {extra_args_unescaped:#?}");
+            log::debug!("extra_args: {:#?}", extra_args);
+            log::debug!("extra_args_unescaped: {:#?}", extra_args_unescaped);
 
             if let Some(ccache_variant) = ccache_variant {
                 revive_llvm_builder::utils::check_presence(ccache_variant.to_string().as_str())?;

crates/llvm-builder/src/sanitizer.rs

@@ -30,7 +30,7 @@ impl std::str::FromStr for Sanitizer {
             "thread" => Ok(Self::Thread),
             "dataflow" => Ok(Self::DataFlow),
             "address;undefined" => Ok(Self::AddressUndefined),
-            value => Err(format!("Unsupported sanitizer: `{value}`")),
+            value => Err(format!("Unsupported sanitizer: `{}`", value)),
         }
     }
 }

crates/llvm-builder/src/target_env.rs

@@ -20,7 +20,7 @@ impl std::str::FromStr for TargetEnv {
             "gnu" => Ok(Self::GNU),
             "musl" => Ok(Self::MUSL),
             "emscripten" => Ok(Self::Emscripten),
-            value => Err(format!("Unsupported target environment: `{value}`")),
+            value => Err(format!("Unsupported target environment: `{}`", value)),
         }
     }
 }

crates/llvm-builder/src/target_triple.rs

@@ -15,7 +15,7 @@ impl std::str::FromStr for TargetTriple {
     fn from_str(value: &str) -> Result<Self, Self::Err> {
         match value {
             "polkavm" => Ok(Self::PolkaVM),
-            value => Err(format!("Unsupported target triple: `{value}`")),
+            value => Err(format!("Unsupported target triple: `{}`", value)),
         }
     }
 }

crates/llvm-builder/src/utils.rs

@@ -7,7 +7,6 @@ use std::process::Command;
 use std::process::Stdio;
 use std::time::Duration;
 
-use anyhow::Context;
 use path_slash::PathBufExt;
 
 /// The LLVM host repository URL.
@@ -38,7 +37,7 @@ pub const MUSL_SNAPSHOTS_URL: &str = "https://git.musl-libc.org/cgit/musl/snapsh
 pub const EMSDK_SOURCE_URL: &str = "https://github.com/emscripten-core/emsdk.git";
 
 /// The emscripten SDK version.
-pub const EMSDK_VERSION: &str = "4.0.9";
+pub const EMSDK_VERSION: &str = "3.1.64";
 
 /// The subprocess runner.
 ///
@@ -92,7 +91,7 @@ pub fn unpack_tar(filename: PathBuf, path: &str) -> anyhow::Result<()> {
 pub fn download_musl(name: &str) -> anyhow::Result<()> {
     log::info!("downloading musl {name}");
     let tar_file_name = format!("{name}.tar.gz");
-    let url = format!("{MUSL_SNAPSHOTS_URL}/{tar_file_name}");
+    let url = format!("{}/{tar_file_name}", MUSL_SNAPSHOTS_URL);
     let target_path = crate::llvm_path::DIRECTORY_LLVM_TARGET
         .get()
         .unwrap()
@@ -132,8 +131,11 @@ 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<()> {
-    which::which(name).with_context(|| format!("Tool `{name}` is missing. Please install"))?;
-    Ok(())
+    let description = &format!("checking the `{name}` executable");
+    log::info!("{description}");
+
+    command(Command::new("which").arg(name), description)
+        .map_err(|_| anyhow::anyhow!("Tool `{}` is missing. Please install", name))
 }
 
 /// Identify XCode version using `pkgutil`.
@@ -223,6 +225,6 @@ pub fn install_emsdk() -> anyhow::Result<()> {
 /// The LLVM target directory default path.
 pub fn directory_target_llvm(target_env: crate::target_env::TargetEnv) -> PathBuf {
     crate::llvm_path::DIRECTORY_LLVM_TARGET
-        .get_or_init(|| PathBuf::from(format!("./target-llvm/{target_env}/")))
+        .get_or_init(|| PathBuf::from(format!("./target-llvm/{}/", target_env)))
         .clone()
 }

crates/llvm-builder/tests/build.rs

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

crates/llvm-context/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revive-llvm-context"
-version = "0.3.0"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -22,7 +22,6 @@ num = { workspace = true }
 hex = { workspace = true }
 sha3 = { workspace = true }
 inkwell = { workspace = true }
-libc = { workspace = true }
 polkavm-disassembler = { workspace = true }
 polkavm-common = { workspace = true }
 
@@ -30,4 +29,3 @@ revive-common = { workspace = true }
 revive-runtime-api = { workspace = true }
 revive-linker = { workspace = true }
 revive-stdlib = { workspace = true }
-revive-solc-json-interface = { workspace = true }

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

@@ -2,7 +2,6 @@
 
 pub mod ir_type;
 
-use std::path::Path;
 use std::path::PathBuf;
 
 use serde::Deserialize;
@@ -17,14 +16,6 @@ pub struct DebugConfig {
     pub output_directory: Option<PathBuf>,
     /// Whether debug info should be emitted.
     pub emit_debug_info: bool,
-    /// The YUL debug output file path.
-    ///
-    /// Is expected to be configured when running in YUL mode.
-    pub contract_path: Option<PathBuf>,
-    /// The YUL input file path.
-    ///
-    /// Is expected to be configured when not running in YUL mode.
-    pub yul_path: Option<PathBuf>,
 }
 
 impl DebugConfig {
@@ -33,41 +24,15 @@ impl DebugConfig {
         Self {
             output_directory,
             emit_debug_info,
-            contract_path: None,
-            yul_path: None,
         }
     }
 
-    /// Set the current YUL path.
-    pub fn set_yul_path(&mut self, yul_path: &Path) {
-        self.yul_path = yul_path.to_path_buf().into();
-    }
-
-    /// Set the current contract path.
-    pub fn set_contract_path(&mut self, contract_path: &str) {
-        self.contract_path = self.yul_source_path(contract_path);
-    }
-
-    /// Returns with the following precedence:
-    /// 1. The YUL source path if it was configured.
-    /// 2. The source YUL path from the debug output dir if it was configured.
-    /// 3. `None` if there is no debug output directory.
-    pub fn yul_source_path(&self, contract_path: &str) -> Option<PathBuf> {
-        if let Some(path) = self.yul_path.as_ref() {
-            return Some(path.clone());
-        }
-
-        self.output_directory.as_ref().map(|output_directory| {
-            let mut file_path = output_directory.to_owned();
-            let full_file_name = Self::full_file_name(contract_path, None, IRType::Yul);
-            file_path.push(full_file_name);
-            file_path
-        })
-    }
-
     /// Dumps the Yul IR.
     pub fn dump_yul(&self, contract_path: &str, code: &str) -> anyhow::Result<()> {
-        if let Some(file_path) = self.yul_source_path(contract_path) {
+        if let Some(output_directory) = self.output_directory.as_ref() {
+            let mut file_path = output_directory.to_owned();
+            let full_file_name = Self::full_file_name(contract_path, None, IRType::Yul);
+            file_path.push(full_file_name);
             std::fs::write(file_path, code)?;
         }
 

crates/llvm-context/src/lib.rs

@@ -1,7 +1,9 @@
 //! The LLVM context library.
 
-use std::ffi::CString;
-use std::sync::OnceLock;
+pub(crate) mod debug_config;
+pub(crate) mod optimizer;
+pub(crate) mod polkavm;
+pub(crate) mod target_machine;
 
 pub use self::debug_config::ir_type::IRType as DebugConfigIR;
 pub use self::debug_config::DebugConfig;
@@ -19,28 +21,17 @@ pub use self::polkavm::context::function::declaration::Declaration as PolkaVMFun
 pub use self::polkavm::context::function::intrinsics::Intrinsics as PolkaVMIntrinsicFunction;
 pub use self::polkavm::context::function::llvm_runtime::LLVMRuntime as PolkaVMLLVMRuntime;
 pub use self::polkavm::context::function::r#return::Return as PolkaVMFunctionReturn;
-pub use self::polkavm::context::function::runtime::arithmetics::Division as PolkaVMDivisionFunction;
-pub use self::polkavm::context::function::runtime::arithmetics::Remainder as PolkaVMRemainderFunction;
-pub use self::polkavm::context::function::runtime::arithmetics::SignedDivision as PolkaVMSignedDivisionFunction;
-pub use self::polkavm::context::function::runtime::arithmetics::SignedRemainder as PolkaVMSignedRemainderFunction;
 pub use self::polkavm::context::function::runtime::deploy_code::DeployCode as PolkaVMDeployCodeFunction;
 pub use self::polkavm::context::function::runtime::entry::Entry as PolkaVMEntryFunction;
-pub use self::polkavm::context::function::runtime::revive::Exit as PolkaVMExitFunction;
-pub use self::polkavm::context::function::runtime::revive::WordToPointer as PolkaVMWordToPointerFunction;
+pub use self::polkavm::context::function::runtime::immutable_data_load::ImmutableDataLoad as PolkaVMImmutableDataLoadFunction;
 pub use self::polkavm::context::function::runtime::runtime_code::RuntimeCode as PolkaVMRuntimeCodeFunction;
-pub use self::polkavm::context::function::runtime::sbrk::Sbrk as PolkaVMSbrkFunction;
 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::LoadTransientWord as PolkaVMLoadTransientStorageWordFunction;
-pub use self::polkavm::context::pointer::storage::LoadWord as PolkaVMLoadStorageWordFunction;
-pub use self::polkavm::context::pointer::storage::StoreTransientWord as PolkaVMStoreTransientStorageWordFunction;
-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;
@@ -56,16 +47,14 @@ 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;
 pub use self::polkavm::evm::return_data as polkavm_evm_return_data;
 pub use self::polkavm::evm::storage as polkavm_evm_storage;
+pub use self::polkavm::metadata_hash::MetadataHash as PolkaVMMetadataHash;
 pub use self::polkavm::r#const as polkavm_const;
 pub use self::polkavm::Dependency as PolkaVMDependency;
 pub use self::polkavm::DummyDependency as PolkaVMDummyDependency;
@@ -74,41 +63,9 @@ pub use self::polkavm::WriteLLVM as PolkaVMWriteLLVM;
 pub use self::target_machine::target::Target;
 pub use self::target_machine::TargetMachine;
 
-pub(crate) mod debug_config;
-pub(crate) mod optimizer;
-pub(crate) mod polkavm;
-pub(crate) mod target_machine;
-
-static DID_INITIALIZE: OnceLock<()> = OnceLock::new();
-
-/// Initializes the LLVM compiler backend.
-///
-/// This is a no-op if called subsequentially.
-///
-/// `llvm_arguments` are passed as-is to the LLVM CL options parser.
-pub fn initialize_llvm(target: Target, name: &str, llvm_arguments: &[String]) {
-    let Ok(_) = DID_INITIALIZE.set(()) else {
-        return; // Tests don't go through a recursive process
-    };
-
-    let argv = [name.to_string()]
-        .iter()
-        .chain(llvm_arguments)
-        .map(|arg| CString::new(arg.as_bytes()).unwrap())
-        .collect::<Vec<_>>();
-    let argv: Vec<*const libc::c_char> = argv.iter().map(|arg| arg.as_ptr()).collect();
-    let overview = CString::new("").unwrap();
-    unsafe {
-        inkwell::llvm_sys::support::LLVMParseCommandLineOptions(
-            argv.len() as i32,
-            argv.as_ptr(),
-            overview.as_ptr(),
-        );
-    }
-
-    inkwell::support::enable_llvm_pretty_stack_trace();
-
+/// Initializes the target machine.
+pub fn initialize_target(target: Target) {
     match target {
-        Target::PVM => inkwell::targets::Target::initialize_riscv(&Default::default()),
+        Target::PVM => self::polkavm::initialize_target(),
     }
 }

crates/llvm-context/src/optimizer/settings/mod.rs

@@ -2,7 +2,6 @@
 
 pub mod size_level;
 
-use revive_solc_json_interface::SolcStandardJsonInputSettingsOptimizer;
 use serde::Deserialize;
 use serde::Serialize;
 
@@ -227,18 +226,3 @@ impl std::fmt::Display for Settings {
         )
     }
 }
-
-impl TryFrom<&SolcStandardJsonInputSettingsOptimizer> for Settings {
-    type Error = anyhow::Error;
-
-    fn try_from(value: &SolcStandardJsonInputSettingsOptimizer) -> Result<Self, Self::Error> {
-        let mut result = match value.mode {
-            Some(mode) => Self::try_from_cli(mode)?,
-            None => Self::size(),
-        };
-        if value.fallback_to_optimizing_for_size.unwrap_or_default() {
-            result.enable_fallback_to_size();
-        }
-        Ok(result)
-    }
-}

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

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

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

@@ -8,6 +8,10 @@ pub enum AddressSpace {
     Stack,
     /// The heap memory.
     Heap,
+    /// The generic memory page.
+    Storage,
+    /// The transient storage.
+    TransientStorage,
 }
 
 impl From<AddressSpace> for inkwell::AddressSpace {
@@ -15,6 +19,8 @@ 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/argument.rs

@@ -4,98 +4,61 @@
 #[derive(Debug, Clone)]
 pub struct Argument<'ctx> {
     /// The actual LLVM operand.
-    pub value: Value<'ctx>,
+    pub value: inkwell::values::BasicValueEnum<'ctx>,
     /// The original AST value. Used mostly for string literals.
     pub original: Option<String>,
     /// The preserved constant value, if available.
     pub constant: Option<num::BigUint>,
 }
 
-/// The function argument can be either a pointer or a integer value.
-/// This disambiguation allows for lazy loading of variables.
-#[derive(Clone, Debug)]
-pub enum Value<'ctx> {
-    Register(inkwell::values::BasicValueEnum<'ctx>),
-    Pointer {
-        pointer: crate::polkavm::context::Pointer<'ctx>,
-        id: String,
-    },
-}
-
 impl<'ctx> Argument<'ctx> {
-    /// A shortcut constructor for register arguments.
-    pub fn value(value: inkwell::values::BasicValueEnum<'ctx>) -> Self {
+    /// The calldata offset argument index.
+    pub const ARGUMENT_INDEX_CALLDATA_OFFSET: usize = 0;
+
+    /// The calldata length argument index.
+    pub const ARGUMENT_INDEX_CALLDATA_LENGTH: usize = 1;
+
+    /// A shortcut constructor.
+    pub fn new(value: inkwell::values::BasicValueEnum<'ctx>) -> Self {
         Self {
-            value: Value::Register(value),
+            value,
             original: None,
             constant: None,
         }
     }
 
-    /// A shortcut constructor for stack arguments.
-    pub fn pointer(pointer: crate::polkavm::context::Pointer<'ctx>, id: String) -> Self {
+    /// A shortcut constructor.
+    pub fn new_with_original(
+        value: inkwell::values::BasicValueEnum<'ctx>,
+        original: String,
+    ) -> Self {
         Self {
-            value: Value::Pointer { pointer, id },
-            original: None,
+            value,
+            original: Some(original),
             constant: None,
         }
     }
 
-    /// Set the original decleratation value.
-    pub fn with_original(mut self, original: String) -> Self {
-        self.original = Some(original);
-        self
-    }
-
-    /// Set the constant value.
-    pub fn with_constant(mut self, constant: num::BigUint) -> Self {
-        self.constant = Some(constant);
-        self
+    /// A shortcut constructor.
+    pub fn new_with_constant(
+        value: inkwell::values::BasicValueEnum<'ctx>,
+        constant: num::BigUint,
+    ) -> Self {
+        Self {
+            value,
+            original: None,
+            constant: Some(constant),
+        }
     }
 
     /// Returns the inner LLVM value.
-    ///
-    /// Panics if `self` is a pointer argument.
-    pub fn _to_llvm_value(&self) -> inkwell::values::BasicValueEnum<'ctx> {
-        match &self.value {
-            Value::Register(value) => *value,
-            Value::Pointer { .. } => unreachable!("invalid register value access"),
-        }
-    }
-
-    /// Access the underlying value.
-    ///
-    /// Will emit a stack load if `self` is a pointer argument.
-    pub fn access<D: crate::polkavm::Dependency + Clone>(
-        &self,
-        context: &crate::polkavm::context::Context<'ctx, D>,
-    ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>> {
-        match &self.value {
-            Value::Register(value) => Ok(*value),
-            Value::Pointer { pointer, id } => context.build_load(*pointer, id),
-        }
-    }
-
-    /// Access the underlying value.
-    ///
-    /// Will emit a stack load if `self` is a pointer argument.
-    pub fn as_pointer<D: crate::polkavm::Dependency + Clone>(
-        &self,
-        context: &crate::polkavm::context::Context<'ctx, D>,
-    ) -> anyhow::Result<crate::polkavm::context::Pointer<'ctx>> {
-        match &self.value {
-            Value::Register(value) => {
-                let pointer = context.build_alloca_at_entry(context.word_type(), "pvm_arg");
-                context.build_store(pointer, *value)?;
-                Ok(pointer)
-            }
-            Value::Pointer { pointer, .. } => Ok(*pointer),
-        }
+    pub fn to_llvm(&self) -> inkwell::values::BasicValueEnum<'ctx> {
+        self.value
     }
 }
 
 impl<'ctx> From<inkwell::values::BasicValueEnum<'ctx>> for Argument<'ctx> {
     fn from(value: inkwell::values::BasicValueEnum<'ctx>) -> Self {
-        Self::value(value)
+        Self::new(value)
     }
 }

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

@@ -51,20 +51,11 @@ pub struct DebugInfo<'ctx> {
 
 impl<'ctx> DebugInfo<'ctx> {
     /// A shortcut constructor.
-    pub fn new(
-        module: &inkwell::module::Module<'ctx>,
-        debug_config: &crate::debug_config::DebugConfig,
-    ) -> Self {
-        let module_name = module.get_name().to_string_lossy();
-        let yul_name = debug_config
-            .contract_path
-            .as_ref()
-            .map(|path| path.display().to_string());
-
+    pub fn new(module: &inkwell::module::Module<'ctx>) -> Self {
         let (builder, compile_unit) = module.create_debug_info_builder(
             true,
             inkwell::debug_info::DWARFSourceLanguage::C,
-            yul_name.as_deref().unwrap_or_else(|| module_name.as_ref()),
+            module.get_name().to_string_lossy().as_ref(),
             "",
             "",
             false,

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

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

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

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

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

@@ -48,7 +48,6 @@ where
             function_type,
             0,
             Some(inkwell::module::Linkage::External),
-            None,
         )?;
 
         self.inner.declare(context)
@@ -75,6 +74,7 @@ where
         }
 
         context.set_basic_block(context.current_function().borrow().return_block());
+        context.set_debug_location(0, 0, None)?;
         context.build_return(None);
 
         context.pop_debug_scope();

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

@@ -1,7 +1,6 @@
 //! The entry function.
 
 use inkwell::types::BasicType;
-use revive_solc_json_interface::PolkaVMDefaultHeapMemorySize;
 
 use crate::polkavm::context::address_space::AddressSpace;
 use crate::polkavm::context::function::runtime;
@@ -25,6 +24,22 @@ impl Entry {
     where
         D: Dependency + Clone,
     {
+        context.set_global(
+            crate::polkavm::GLOBAL_HEAP_MEMORY_POINTER,
+            context.llvm().ptr_type(AddressSpace::Heap.into()),
+            AddressSpace::Stack,
+            context.xlen_type().get_undef(),
+        );
+        context.build_store(
+            context
+                .get_global(crate::polkavm::GLOBAL_HEAP_MEMORY_POINTER)?
+                .into(),
+            context.build_sbrk(
+                context.xlen_type().const_zero(),
+                context.xlen_type().const_zero(),
+            )?,
+        )?;
+
         context.set_global(
             crate::polkavm::GLOBAL_CALLDATA_SIZE,
             context.xlen_type(),
@@ -33,31 +48,10 @@ impl Entry {
         );
 
         context.set_global(
-            crate::polkavm::GLOBAL_HEAP_SIZE,
-            context.xlen_type(),
+            crate::polkavm::GLOBAL_CALL_FLAGS,
+            context.word_type(),
             AddressSpace::Stack,
-            context.xlen_type().const_zero(),
-        );
-
-        let heap_memory_type = context.byte_type().array_type(
-            context
-                .memory_config
-                .heap_size
-                .unwrap_or(PolkaVMDefaultHeapMemorySize),
-        );
-        context.set_global(
-            crate::polkavm::GLOBAL_HEAP_MEMORY,
-            heap_memory_type,
-            AddressSpace::Stack,
-            heap_memory_type.const_zero(),
-        );
-
-        let address_type = context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS);
-        context.set_global(
-            crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER,
-            address_type,
-            AddressSpace::Stack,
-            address_type.const_zero(),
+            context.word_const(0),
         );
 
         Ok(())
@@ -76,11 +70,6 @@ impl Entry {
             .build_runtime_call(revive_runtime_api::polkavm_imports::CALL_DATA_SIZE, &[])
             .expect("the call_data_size syscall method should return a value")
             .into_int_value();
-        let call_data_size_value = context.builder().build_int_truncate(
-            call_data_size_value,
-            context.xlen_type(),
-            "call_data_size_truncated",
-        )?;
         context
             .builder()
             .build_store(call_data_size_pointer, call_data_size_value)?;
@@ -101,6 +90,13 @@ impl Entry {
             .borrow()
             .get_nth_param(Self::ARGUMENT_INDEX_CALL_FLAGS);
 
+        context.set_global(
+            crate::polkavm::GLOBAL_CALL_FLAGS,
+            is_deploy.get_type(),
+            AddressSpace::Stack,
+            is_deploy.into_int_value(),
+        );
+
         let deploy_code_call_block = context.append_basic_block("deploy_code_call_block");
         let runtime_code_call_block = context.append_basic_block("runtime_code_call_block");
 
@@ -145,7 +141,6 @@ where
             entry_function_type,
             0,
             Some(inkwell::module::Linkage::External),
-            None,
         )?;
 
         context.declare_global(
@@ -175,7 +170,7 @@ where
         crate::PolkaVMFunction::set_attributes(
             context.llvm(),
             entry,
-            &[crate::PolkaVMAttribute::NoReturn],
+            vec![crate::PolkaVMAttribute::NoReturn],
             true,
         );
 

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

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

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

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

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

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

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

@@ -48,7 +48,6 @@ where
             function_type,
             0,
             Some(inkwell::module::Linkage::External),
-            None,
         )?;
 
         self.inner.declare(context)

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

@@ -1,144 +0,0 @@
-//! Emulates the linear EVM heap memory via a simulated `sbrk` system call.
-
-use inkwell::values::BasicValue;
-
-use crate::polkavm::context::attribute::Attribute;
-use crate::polkavm::context::runtime::RuntimeFunction;
-use crate::polkavm::context::Context;
-use crate::polkavm::Dependency;
-use crate::polkavm::WriteLLVM;
-
-/// Simulates the `sbrk` system call, reproducing the semantics of the EVM heap memory.
-///
-/// Parameters:
-/// - The `offset` into the emulated EVM heap memory.
-/// - The `size` of the allocation emulated EVM heap memory.
-///
-/// Returns:
-/// - A pointer to the EVM heap memory at given `offset`.
-///
-/// Semantics:
-/// - Traps if the offset is out of bounds.
-/// - Aligns the total heap memory size to the EVM word size.
-/// - Traps if the memory size would be greater than the configured EVM heap memory size.
-/// - Maintains the total memory size (`msize`) in global heap size value.
-pub struct Sbrk;
-
-impl<D> RuntimeFunction<D> for Sbrk
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__sbrk_internal";
-
-    const ATTRIBUTES: &'static [Attribute] = &[
-        Attribute::NoFree,
-        Attribute::NoRecurse,
-        Attribute::WillReturn,
-    ];
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.llvm().ptr_type(Default::default()).fn_type(
-            &[context.xlen_type().into(), context.xlen_type().into()],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
-        let offset = Self::paramater(context, 0).into_int_value();
-        let size = Self::paramater(context, 1).into_int_value();
-
-        let trap_block = context.append_basic_block("trap");
-        let offset_in_bounds_block = context.append_basic_block("offset_in_bounds");
-        let is_offset_out_of_bounds = context.builder().build_int_compare(
-            inkwell::IntPredicate::UGE,
-            offset,
-            context.heap_size(),
-            "offset_out_of_bounds",
-        )?;
-        context.build_conditional_branch(
-            is_offset_out_of_bounds,
-            trap_block,
-            offset_in_bounds_block,
-        )?;
-
-        context.set_basic_block(trap_block);
-        context.build_call(context.intrinsics().trap, &[], "invalid_trap");
-        context.build_unreachable();
-
-        context.set_basic_block(offset_in_bounds_block);
-        let mask = context
-            .xlen_type()
-            .const_int(revive_common::BYTE_LENGTH_WORD as u64 - 1, false);
-        let total_size = context
-            .builder()
-            .build_int_add(offset, size, "total_size")?;
-        let memory_size = context.builder().build_and(
-            context.builder().build_int_add(total_size, mask, "mask")?,
-            context.builder().build_not(mask, "mask_not")?,
-            "memory_size",
-        )?;
-        let size_in_bounds_block = context.append_basic_block("size_in_bounds");
-        let is_size_out_of_bounds = context.builder().build_int_compare(
-            inkwell::IntPredicate::UGT,
-            memory_size,
-            context.heap_size(),
-            "size_out_of_bounds",
-        )?;
-        context.build_conditional_branch(
-            is_size_out_of_bounds,
-            trap_block,
-            size_in_bounds_block,
-        )?;
-
-        context.set_basic_block(size_in_bounds_block);
-        let return_block = context.append_basic_block("return_pointer");
-        let new_size_block = context.append_basic_block("new_size");
-        let is_new_size = context.builder().build_int_compare(
-            inkwell::IntPredicate::UGT,
-            memory_size,
-            context
-                .get_global_value(crate::polkavm::GLOBAL_HEAP_SIZE)?
-                .into_int_value(),
-            "is_new_size",
-        )?;
-        context.build_conditional_branch(is_new_size, new_size_block, return_block)?;
-
-        context.set_basic_block(new_size_block);
-        context.build_store(
-            context.get_global(crate::polkavm::GLOBAL_HEAP_SIZE)?.into(),
-            memory_size,
-        )?;
-        context.build_unconditional_branch(return_block);
-
-        context.set_basic_block(return_block);
-        Ok(Some(
-            context
-                .build_gep(
-                    context
-                        .get_global(crate::polkavm::GLOBAL_HEAP_MEMORY)?
-                        .into(),
-                    &[context.xlen_type().const_zero(), offset],
-                    context.byte_type(),
-                    "allocation_start_pointer",
-                )
-                .value
-                .as_basic_value_enum(),
-        ))
-    }
-}
-
-impl<D> WriteLLVM<D> for Sbrk
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}

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

@@ -10,7 +10,6 @@ pub mod function;
 pub mod global;
 pub mod r#loop;
 pub mod pointer;
-pub mod runtime;
 pub mod solidity_data;
 pub mod yul_data;
 
@@ -25,9 +24,6 @@ use inkwell::debug_info::AsDIScope;
 use inkwell::debug_info::DIScope;
 use inkwell::types::BasicType;
 use inkwell::values::BasicValue;
-use revive_solc_json_interface::PolkaVMDefaultHeapMemorySize;
-use revive_solc_json_interface::PolkaVMDefaultStackMemorySize;
-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 
 use crate::optimizer::settings::Settings as OptimizerSettings;
 use crate::optimizer::Optimizer;
@@ -35,9 +31,6 @@ use crate::polkavm::DebugConfig;
 use crate::polkavm::Dependency;
 use crate::target_machine::target::Target;
 use crate::target_machine::TargetMachine;
-use crate::PolkaVMLoadHeapWordFunction;
-use crate::PolkaVMSbrkFunction;
-use crate::PolkaVMStoreHeapWordFunction;
 
 use self::address_space::AddressSpace;
 use self::attribute::Attribute;
@@ -48,13 +41,10 @@ use self::function::declaration::Declaration as FunctionDeclaration;
 use self::function::intrinsics::Intrinsics;
 use self::function::llvm_runtime::LLVMRuntime;
 use self::function::r#return::Return as FunctionReturn;
-use self::function::runtime::revive::Exit;
-use self::function::runtime::revive::WordToPointer;
 use self::function::Function;
 use self::global::Global;
 use self::pointer::Pointer;
 use self::r#loop::Loop;
-use self::runtime::RuntimeFunction;
 use self::solidity_data::SolidityData;
 use self::yul_data::YulData;
 
@@ -87,10 +77,6 @@ where
     current_function: Option<Rc<RefCell<Function<'ctx>>>>,
     /// The loop context stack.
     loop_stack: Vec<Loop<'ctx>>,
-    /// The extra LLVM arguments that were used during target initialization.
-    llvm_arguments: &'ctx [String],
-    /// The PVM memory configuration.
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 
     /// The project dependency manager. It can be any entity implementing the trait.
     /// The manager is used to get information about contracts and their dependencies during
@@ -122,6 +108,9 @@ where
     /// The loop stack default capacity.
     const LOOP_STACK_INITIAL_CAPACITY: usize = 16;
 
+    /// The PolkaVM minimum stack size.
+    const POLKAVM_STACK_SIZE: u32 = 0x4000;
+
     /// Link in the stdlib module.
     fn link_stdlib_module(
         llvm: &'ctx inkwell::context::Context,
@@ -221,7 +210,6 @@ where
     }
 
     /// Initializes a new LLVM context.
-    #[allow(clippy::too_many_arguments)]
     pub fn new(
         llvm: &'ctx inkwell::context::Context,
         module: inkwell::module::Module<'ctx>,
@@ -229,25 +217,17 @@ where
         dependency_manager: Option<D>,
         include_metadata_hash: bool,
         debug_config: DebugConfig,
-        llvm_arguments: &'ctx [String],
-        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
     ) -> Self {
         Self::set_data_layout(llvm, &module);
         Self::link_stdlib_module(llvm, &module);
         Self::link_polkavm_imports(llvm, &module);
-        Self::set_polkavm_stack_size(
-            llvm,
-            &module,
-            memory_config
-                .stack_size
-                .unwrap_or(PolkaVMDefaultStackMemorySize),
-        );
+        Self::set_polkavm_stack_size(llvm, &module, Self::POLKAVM_STACK_SIZE);
         Self::set_module_flags(llvm, &module);
 
         let intrinsics = Intrinsics::new(llvm, &module);
         let llvm_runtime = LLVMRuntime::new(llvm, &module, &optimizer);
         let debug_info = debug_config.emit_debug_info.then(|| {
-            let debug_info = DebugInfo::new(&module, &debug_config);
+            let debug_info = DebugInfo::new(&module);
             debug_info.initialize_module(llvm, &module);
             debug_info
         });
@@ -264,8 +244,6 @@ where
             functions: HashMap::with_capacity(Self::FUNCTIONS_HASHMAP_INITIAL_CAPACITY),
             current_function: None,
             loop_stack: Vec::with_capacity(Self::LOOP_STACK_INITIAL_CAPACITY),
-            llvm_arguments,
-            memory_config,
 
             dependency_manager,
             include_metadata_hash,
@@ -463,7 +441,6 @@ where
         r#type: inkwell::types::FunctionType<'ctx>,
         return_values_length: usize,
         linkage: Option<inkwell::module::Linkage>,
-        location: Option<(u32, u32)>,
     ) -> anyhow::Result<Rc<RefCell<Function<'ctx>>>> {
         let value = self.module().add_function(name, r#type, linkage);
 
@@ -479,8 +456,7 @@ where
                 Some(scp) => scp,
             };
             self.push_debug_scope(func_scope.as_debug_info_scope());
-            let (line, column) = location.unwrap_or((0, 0));
-            self.set_debug_location(line, column, Some(func_scope.as_debug_info_scope()))?;
+            self.set_debug_location(0, 0, Some(func_scope.as_debug_info_scope()))?;
         }
 
         let entry_block = self.llvm.append_basic_block(value, "entry");
@@ -535,11 +511,7 @@ where
 
     /// Sets the current active function. If debug-info generation is enabled,
     /// constructs a debug-scope and pushes in on the scope-stack.
-    pub fn set_current_function(
-        &mut self,
-        name: &str,
-        location: Option<(u32, u32)>,
-    ) -> anyhow::Result<()> {
+    pub fn set_current_function(&mut self, name: &str, line: Option<u32>) -> anyhow::Result<()> {
         let function = self.functions.get(name).cloned().ok_or_else(|| {
             anyhow::anyhow!("Failed to activate an undeclared function `{}`", name)
         })?;
@@ -548,8 +520,7 @@ where
         if let Some(scope) = self.current_function().borrow().get_debug_scope() {
             self.push_debug_scope(scope);
         }
-        let (line, column) = location.unwrap_or_default();
-        self.set_debug_location(line, column, None)?;
+        self.set_debug_location(line.unwrap_or_default(), 0, None)?;
 
         Ok(())
     }
@@ -662,8 +633,6 @@ where
                     self.optimizer.settings().to_owned(),
                     self.include_metadata_hash,
                     self.debug_config.clone(),
-                    self.llvm_arguments,
-                    self.memory_config,
                 )
             })
     }
@@ -730,23 +699,17 @@ where
         r#type: T,
         name: &str,
     ) -> Pointer<'ctx> {
-        // TODO: Revisit. While at entry should be preferred in theory:
-        // - It has negligible code size impact on real word contracts.
-        // - Sometimes has negative impact on code size.
-        // - Messes up debug information used to analyze code size issues.
-        self.build_alloca(r#type, name)
+        let current_block = self.basic_block();
+        let entry_block = self.current_function().borrow().entry_block();
 
-        // let current_block = self.basic_block();
-        // let entry_block = self.current_function().borrow().entry_block();
+        match entry_block.get_first_instruction() {
+            Some(instruction) => self.builder().position_before(&instruction),
+            None => self.builder().position_at_end(entry_block),
+        }
 
-        // match entry_block.get_first_instruction() {
-        //     Some(instruction) => self.builder().position_before(&instruction),
-        //     None => self.builder().position_at_end(entry_block),
-        // }
-
-        // let pointer = self.build_alloca(r#type, name);
-        // self.set_basic_block(current_block);
-        // pointer
+        let pointer = self.build_alloca(r#type, name);
+        self.set_basic_block(current_block);
+        pointer
     }
 
     /// Builds an aligned stack allocation at the current position.
@@ -758,7 +721,6 @@ where
         name: &str,
     ) -> Pointer<'ctx> {
         let pointer = self.builder.build_alloca(r#type, name).unwrap();
-
         pointer
             .as_instruction()
             .unwrap()
@@ -776,9 +738,7 @@ where
         address: inkwell::values::IntValue<'ctx>,
     ) -> anyhow::Result<Pointer<'ctx>> {
         let address_type = self.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS);
-        let address_pointer = self
-            .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
-            .into();
+        let address_pointer = self.build_alloca_at_entry(address_type, "address_pointer");
         let address_truncated =
             self.builder()
                 .build_int_truncate(address, address_type, "address_truncated")?;
@@ -808,18 +768,60 @@ where
     ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>> {
         match pointer.address_space {
             AddressSpace::Heap => {
-                let name = <PolkaVMLoadHeapWordFunction as RuntimeFunction<D>>::NAME;
-                let declaration =
-                    <PolkaVMLoadHeapWordFunction as RuntimeFunction<D>>::declaration(self);
-                let arguments = [self
+                let heap_pointer = self.build_heap_gep(
+                    self.builder().build_ptr_to_int(
+                        pointer.value,
+                        self.xlen_type(),
+                        "offset_ptrtoint",
+                    )?,
+                    pointer
+                        .r#type
+                        .size_of()
+                        .expect("should be IntValue")
+                        .const_truncate(self.xlen_type()),
+                )?;
+
+                let value = self
                     .builder()
-                    .build_ptr_to_int(pointer.value, self.xlen_type(), "offset_ptrtoint")?
-                    .as_basic_value_enum()];
-                Ok(self
-                    .build_call(declaration, &arguments, "heap_load")
-                    .unwrap_or_else(|| {
-                        panic!("revive runtime function {name} should return a value")
-                    }))
+                    .build_load(pointer.r#type, heap_pointer.value, name)?;
+                self.basic_block()
+                    .get_last_instruction()
+                    .expect("Always exists")
+                    .set_alignment(revive_common::BYTE_LENGTH_BYTE as u32)
+                    .expect("Alignment is valid");
+
+                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
@@ -845,13 +847,60 @@ where
     {
         match pointer.address_space {
             AddressSpace::Heap => {
-                let declaration =
-                    <PolkaVMStoreHeapWordFunction as RuntimeFunction<D>>::declaration(self);
-                let arguments = [
-                    pointer.to_int(self).as_basic_value_enum(),
-                    value.as_basic_value_enum(),
-                ];
-                self.build_call(declaration, &arguments, "heap_store");
+                let heap_pointer = self.build_heap_gep(
+                    self.builder().build_ptr_to_int(
+                        pointer.value,
+                        self.xlen_type(),
+                        "offset_ptrtoint",
+                    )?,
+                    value
+                        .as_basic_value_enum()
+                        .get_type()
+                        .size_of()
+                        .expect("should be IntValue")
+                        .const_truncate(self.xlen_type()),
+                )?;
+
+                let value = value.as_basic_value_enum();
+                let value = match value.get_type().into_int_type().get_bit_width() as usize {
+                    revive_common::BIT_LENGTH_WORD => self.build_byte_swap(value)?,
+                    revive_common::BIT_LENGTH_BYTE => value,
+                    _ => unreachable!("Only word and byte sized values can be stored on EVM heap"),
+                };
+
+                self.builder
+                    .build_store(heap_pointer.value, value)?
+                    .set_alignment(revive_common::BYTE_LENGTH_BYTE as u32)
+                    .expect("Alignment is valid");
+            }
+            AddressSpace::Storage | AddressSpace::TransientStorage => {
+                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();
@@ -897,6 +946,9 @@ 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)
@@ -1063,16 +1115,38 @@ where
         offset: inkwell::values::IntValue<'ctx>,
         length: inkwell::values::IntValue<'ctx>,
     ) -> anyhow::Result<()> {
-        self.build_call(
-            <Exit as RuntimeFunction<D>>::declaration(self),
-            &[flags.into(), offset.into(), length.into()],
-            "exit",
+        let offset_truncated = self.safe_truncate_int_to_xlen(offset)?;
+        let length_truncated = self.safe_truncate_int_to_xlen(length)?;
+        let offset_into_heap = self.build_heap_gep(offset_truncated, length_truncated)?;
+
+        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>,
@@ -1086,19 +1160,29 @@ where
             "expected XLEN or WORD sized int type for memory offset",
         );
 
-        Ok(self
-            .build_call(
-                <WordToPointer as RuntimeFunction<D>>::declaration(self),
-                &[value.into()],
-                "word_to_pointer",
-            )
-            .unwrap_or_else(|| {
-                panic!(
-                    "revive runtime function {} should return a value",
-                    <WordToPointer as RuntimeFunction<D>>::NAME,
-                )
-            })
-            .into_int_value())
+        let truncated =
+            self.builder()
+                .build_int_truncate(value, self.xlen_type(), "offset_truncated")?;
+        let extended =
+            self.builder()
+                .build_int_z_extend(truncated, self.word_type(), "offset_extended")?;
+        let is_overflow = self.builder().build_int_compare(
+            inkwell::IntPredicate::NE,
+            value,
+            extended,
+            "compare_truncated_extended",
+        )?;
+
+        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`.
@@ -1110,42 +1194,62 @@ where
         offset: inkwell::values::IntValue<'ctx>,
         size: inkwell::values::IntValue<'ctx>,
     ) -> anyhow::Result<inkwell::values::PointerValue<'ctx>> {
-        let call_site_value = self.builder().build_call(
-            <PolkaVMSbrkFunction as RuntimeFunction<D>>::declaration(self).function_value(),
-            &[offset.into(), size.into()],
-            "alloc_start",
-        )?;
-
-        call_site_value.add_attribute(
-            inkwell::attributes::AttributeLoc::Return,
-            self.llvm
-                .create_enum_attribute(Attribute::NonNull as u32, 0),
-        );
-        call_site_value.add_attribute(
-            inkwell::attributes::AttributeLoc::Return,
-            self.llvm
-                .create_enum_attribute(Attribute::NoUndef as u32, 0),
-        );
-
-        Ok(call_site_value
+        Ok(self
+            .builder()
+            .build_call(
+                self.runtime_api_method(revive_runtime_api::polkavm_imports::SBRK),
+                &[offset.into(), size.into()],
+                "call_sbrk",
+            )?
             .try_as_basic_value()
             .left()
-            .unwrap_or_else(|| {
-                panic!(
-                    "revive runtime function {} should return a value",
-                    <PolkaVMSbrkFunction as RuntimeFunction<D>>::NAME,
-                )
-            })
+            .expect("sbrk returns a pointer")
             .into_pointer_value())
     }
 
     /// Build a call to PolkaVM `msize` for querying the linear memory size.
     pub fn build_msize(&self) -> anyhow::Result<inkwell::values::IntValue<'ctx>> {
         Ok(self
-            .get_global_value(crate::polkavm::GLOBAL_HEAP_SIZE)?
+            .builder()
+            .build_call(
+                self.runtime_api_method(revive_runtime_api::polkavm_imports::MEMORY_SIZE),
+                &[],
+                "call_msize",
+            )?
+            .try_as_basic_value()
+            .left()
+            .expect("sbrk returns an int")
             .into_int_value())
     }
 
+    /// Call PolkaVM `sbrk` for extending the heap by `offset` + `size`,
+    /// trapping the contract if the call failed.
+    pub fn build_heap_alloc(
+        &self,
+        offset: inkwell::values::IntValue<'ctx>,
+        size: inkwell::values::IntValue<'ctx>,
+    ) -> anyhow::Result<()> {
+        let end_of_memory = self.build_sbrk(offset, size)?;
+        let return_is_nil = self.builder().build_int_compare(
+            inkwell::IntPredicate::EQ,
+            end_of_memory,
+            self.llvm().ptr_type(Default::default()).const_null(),
+            "compare_end_of_memory_nil",
+        )?;
+
+        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
@@ -1158,8 +1262,18 @@ where
         assert_eq!(offset.get_type(), self.xlen_type());
         assert_eq!(length.get_type(), self.xlen_type());
 
-        let pointer = self.build_sbrk(offset, length)?;
-        Ok(Pointer::new(self.byte_type(), AddressSpace::Stack, pointer))
+        self.build_heap_alloc(offset, length)?;
+
+        let heap_start = self
+            .get_global(crate::polkavm::GLOBAL_HEAP_MEMORY_POINTER)?
+            .value
+            .as_pointer_value();
+        Ok(self.build_gep(
+            Pointer::new(self.byte_type(), AddressSpace::Stack, heap_start),
+            &[offset],
+            self.byte_type(),
+            "heap_offset_via_gep",
+        ))
     }
 
     /// Returns a boolean type constant.
@@ -1330,6 +1444,13 @@ 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
@@ -1458,17 +1579,4 @@ where
             anyhow::bail!("The immutable size data is not available");
         }
     }
-
-    pub fn optimizer_settings(&self) -> &OptimizerSettings {
-        self.optimizer.settings()
-    }
-
-    pub fn heap_size(&self) -> inkwell::values::IntValue<'ctx> {
-        self.xlen_type().const_int(
-            self.memory_config
-                .heap_size
-                .unwrap_or(PolkaVMDefaultHeapMemorySize) as u64,
-            false,
-        )
-    }
 }

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

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

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

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

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

@@ -1,277 +0,0 @@
-//! The revive storage pointer functions.
-
-use inkwell::values::BasicValueEnum;
-
-use crate::polkavm::context::runtime::RuntimeFunction;
-use crate::polkavm::context::Context;
-use crate::polkavm::Dependency;
-use crate::polkavm::WriteLLVM;
-
-/// Load a word size value from a storage pointer.
-pub struct LoadWord;
-
-impl<D> RuntimeFunction<D> for LoadWord
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_load_storage_word";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context
-            .word_type()
-            .fn_type(&[context.llvm().ptr_type(Default::default()).into()], false)
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        Ok(Some(emit_load(
-            context,
-            Self::paramater(context, 0),
-            false,
-        )?))
-    }
-}
-
-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)
-    }
-}
-
-/// Load a word size value from a transient storage pointer.
-pub struct LoadTransientWord;
-
-impl<D> RuntimeFunction<D> for LoadTransientWord
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_load_transient_storage_word";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context
-            .word_type()
-            .fn_type(&[context.llvm().ptr_type(Default::default()).into()], false)
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        Ok(Some(emit_load(context, Self::paramater(context, 0), true)?))
-    }
-}
-
-impl<D> WriteLLVM<D> for LoadTransientWord
-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.llvm().ptr_type(Default::default()).into(),
-                context.llvm().ptr_type(Default::default()).into(),
-            ],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        emit_store(
-            context,
-            Self::paramater(context, 0),
-            Self::paramater(context, 1),
-            false,
-        )?;
-
-        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)
-    }
-}
-
-/// Store a word size value through a transient storage pointer.
-pub struct StoreTransientWord;
-
-impl<D> RuntimeFunction<D> for StoreTransientWord
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_store_transient_storage_word";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.void_type().fn_type(
-            &[
-                context.llvm().ptr_type(Default::default()).into(),
-                context.llvm().ptr_type(Default::default()).into(),
-            ],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        emit_store(
-            context,
-            Self::paramater(context, 0),
-            Self::paramater(context, 1),
-            true,
-        )?;
-
-        Ok(None)
-    }
-}
-
-impl<D> WriteLLVM<D> for StoreTransientWord
-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)
-    }
-}
-
-fn emit_load<'ctx, D: Dependency + Clone>(
-    context: &mut Context<'ctx, D>,
-    key: BasicValueEnum<'ctx>,
-    transient: bool,
-) -> anyhow::Result<BasicValueEnum<'ctx>> {
-    let mut key = context.build_load(
-        super::Pointer::new(
-            context.word_type(),
-            Default::default(),
-            key.into_pointer_value(),
-        ),
-        "key",
-    )?;
-    if !transient {
-        key = context.build_byte_swap(key)?;
-    }
-
-    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)?;
-    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 is_transient = context.xlen_type().const_int(transient as u64, false);
-
-    let arguments = [
-        is_transient.into(),
-        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).
-
-    let value = context.build_load(value_pointer, "storage_value")?;
-    Ok(if transient {
-        value
-    } else {
-        context.build_byte_swap(value)?
-    })
-}
-
-fn emit_store<'ctx, D: Dependency + Clone>(
-    context: &mut Context<'ctx, D>,
-    key: BasicValueEnum<'ctx>,
-    value: BasicValueEnum<'ctx>,
-    transient: bool,
-) -> anyhow::Result<()> {
-    let mut key = context.build_load(
-        super::Pointer::new(
-            context.word_type(),
-            Default::default(),
-            key.into_pointer_value(),
-        ),
-        "key",
-    )?;
-    let mut value = context.build_load(
-        super::Pointer::new(
-            context.word_type(),
-            Default::default(),
-            value.into_pointer_value(),
-        ),
-        "key",
-    )?;
-    if !transient {
-        key = context.build_byte_swap(key)?;
-        value = context.build_byte_swap(value)?;
-    }
-
-    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 is_transient = context.xlen_type().const_int(transient as u64, false);
-
-    let arguments = [
-        is_transient.into(),
-        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(())
-}

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

@@ -1,114 +0,0 @@
-//! The revive compiler runtime function interface definition.
-//!
-//! Common routines should not be inlined but extracted into smaller functions.
-//! This benefits contract code size.
-
-use crate::optimizer::settings::size_level::SizeLevel;
-use crate::polkavm::context::function::declaration::Declaration;
-use crate::polkavm::context::function::Function;
-use crate::polkavm::context::Attribute;
-use crate::polkavm::context::Context;
-use crate::polkavm::Dependency;
-
-/// The revive runtime function interface simplifies declaring runtime functions
-/// and code emitting by providing helpful default implementations.
-pub trait RuntimeFunction<D>
-where
-    D: Dependency + Clone,
-{
-    /// The function name.
-    const NAME: &'static str;
-
-    const ATTRIBUTES: &'static [Attribute] = &[
-        Attribute::NoFree,
-        Attribute::NoRecurse,
-        Attribute::WillReturn,
-    ];
-
-    /// The function type.
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx>;
-
-    /// Declare the function.
-    fn declare(&self, context: &mut Context<D>) -> anyhow::Result<()> {
-        let function = context.add_function(
-            Self::NAME,
-            Self::r#type(context),
-            0,
-            Some(inkwell::module::Linkage::External),
-            None,
-        )?;
-
-        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/context/tests.rs

@@ -9,22 +9,13 @@ use crate::polkavm::DummyDependency;
 pub fn create_context(
     llvm: &inkwell::context::Context,
     optimizer_settings: OptimizerSettings,
-) -> Context<'_, DummyDependency> {
-    crate::initialize_llvm(crate::Target::PVM, "resolc", Default::default());
+) -> Context<DummyDependency> {
+    crate::polkavm::initialize_target();
 
     let module = llvm.create_module("test");
     let optimizer = Optimizer::new(optimizer_settings);
 
-    Context::<DummyDependency>::new(
-        llvm,
-        module,
-        optimizer,
-        None,
-        true,
-        Default::default(),
-        Default::default(),
-        Default::default(),
-    )
+    Context::<DummyDependency>::new(llvm, module, optimizer, None, true, Default::default())
 }
 
 #[test]
@@ -40,7 +31,6 @@ pub fn check_attribute_null_pointer_is_invalid() {
                 .fn_type(&[context.word_type().into()], false),
             1,
             Some(inkwell::module::Linkage::External),
-            None,
         )
         .expect("Failed to add function");
     assert!(!function
@@ -64,7 +54,6 @@ pub fn check_attribute_optimize_for_size_mode_3() {
                 .fn_type(&[context.word_type().into()], false),
             1,
             Some(inkwell::module::Linkage::External),
-            None,
         )
         .expect("Failed to add function");
     assert!(!function
@@ -88,7 +77,6 @@ pub fn check_attribute_optimize_for_size_mode_z() {
                 .fn_type(&[context.word_type().into()], false),
             1,
             Some(inkwell::module::Linkage::External),
-            None,
         )
         .expect("Failed to add function");
     assert!(function
@@ -112,7 +100,6 @@ pub fn check_attribute_min_size_mode_3() {
                 .fn_type(&[context.word_type().into()], false),
             1,
             Some(inkwell::module::Linkage::External),
-            None,
         )
         .expect("Failed to add function");
     assert!(!function
@@ -136,7 +123,6 @@ pub fn check_attribute_min_size_mode_z() {
                 .fn_type(&[context.word_type().into()], false),
             1,
             Some(inkwell::module::Linkage::External),
-            None,
         )
         .expect("Failed to add function");
     assert!(function

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

@@ -2,13 +2,8 @@
 
 use inkwell::values::BasicValue;
 
-use crate::polkavm::context::runtime::RuntimeFunction;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
-use crate::PolkaVMDivisionFunction;
-use crate::PolkaVMRemainderFunction;
-use crate::PolkaVMSignedDivisionFunction;
-use crate::PolkaVMSignedRemainderFunction;
 
 /// Translates the arithmetic addition.
 pub fn addition<'ctx, D>(
@@ -64,11 +59,11 @@ pub fn division<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMDivisionFunction as RuntimeFunction<D>>::NAME;
-    let declaration = <PolkaVMDivisionFunction as RuntimeFunction<D>>::declaration(context);
-    Ok(context
-        .build_call(declaration, &[operand_1.into(), operand_2.into()], "div")
-        .unwrap_or_else(|| panic!("revive runtime function {name} should return a value",)))
+    wrapped_division(context, operand_2, || {
+        Ok(context
+            .builder()
+            .build_int_unsigned_div(operand_1, operand_2, "DIV")?)
+    })
 }
 
 /// Translates the arithmetic remainder.
@@ -80,11 +75,11 @@ pub fn remainder<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMRemainderFunction as RuntimeFunction<D>>::NAME;
-    let declaration = <PolkaVMRemainderFunction as RuntimeFunction<D>>::declaration(context);
-    Ok(context
-        .build_call(declaration, &[operand_1.into(), operand_2.into()], "rem")
-        .unwrap_or_else(|| panic!("revive runtime function {name} should return a value",)))
+    wrapped_division(context, operand_2, || {
+        Ok(context
+            .builder()
+            .build_int_unsigned_rem(operand_1, operand_2, "MOD")?)
+    })
 }
 
 /// Translates the signed arithmetic division.
@@ -99,11 +94,54 @@ pub fn division_signed<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMSignedDivisionFunction as RuntimeFunction<D>>::NAME;
-    let declaration = <PolkaVMSignedDivisionFunction as RuntimeFunction<D>>::declaration(context);
-    Ok(context
-        .build_call(declaration, &[operand_1.into(), operand_2.into()], "sdiv")
-        .unwrap_or_else(|| panic!("revive runtime function {name} should return a value",)))
+    assert_eq!(
+        operand_2.get_type().get_bit_width(),
+        revive_common::BIT_LENGTH_WORD as u32
+    );
+
+    let block_calculate = context.append_basic_block("calculate");
+    let block_overflow = context.append_basic_block("overflow");
+    let block_select = context.append_basic_block("select_result");
+    let block_origin = context.basic_block();
+    context.builder().build_switch(
+        operand_2,
+        block_calculate,
+        &[
+            (context.word_type().const_zero(), block_select),
+            (context.word_type().const_all_ones(), block_overflow),
+        ],
+    )?;
+
+    context.set_basic_block(block_calculate);
+    let quotient = context
+        .builder()
+        .build_int_signed_div(operand_1, operand_2, "SDIV")?;
+    context.build_unconditional_branch(block_select);
+
+    context.set_basic_block(block_overflow);
+    let max_uint = context.builder().build_int_z_extend(
+        context
+            .integer_type(revive_common::BIT_LENGTH_WORD - 1)
+            .const_all_ones(),
+        context.word_type(),
+        "max_uint",
+    )?;
+    let is_operand_1_overflow = context.builder().build_int_compare(
+        inkwell::IntPredicate::EQ,
+        operand_1,
+        context.builder().build_int_neg(max_uint, "min_uint")?,
+        "is_operand_1_overflow",
+    )?;
+    context.build_conditional_branch(is_operand_1_overflow, block_select, block_calculate)?;
+
+    context.set_basic_block(block_select);
+    let result = context.builder().build_phi(context.word_type(), "result")?;
+    result.add_incoming(&[
+        (&operand_1, block_overflow),
+        (&context.word_const(0), block_origin),
+        (&quotient.as_basic_value_enum(), block_calculate),
+    ]);
+    Ok(result.as_basic_value())
 }
 
 /// Translates the signed arithmetic remainder.
@@ -115,9 +153,53 @@ pub fn remainder_signed<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMSignedRemainderFunction as RuntimeFunction<D>>::NAME;
-    let declaration = <PolkaVMSignedRemainderFunction as RuntimeFunction<D>>::declaration(context);
-    Ok(context
-        .build_call(declaration, &[operand_1.into(), operand_2.into()], "srem")
-        .unwrap_or_else(|| panic!("revive runtime function {name} should return a value",)))
+    wrapped_division(context, operand_2, || {
+        Ok(context
+            .builder()
+            .build_int_signed_rem(operand_1, operand_2, "SMOD")?)
+    })
+}
+
+/// 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/bitwise.rs

@@ -63,6 +63,7 @@ where
     let non_overflow_block = context.append_basic_block("shift_left_non_overflow");
     let join_block = context.append_basic_block("shift_left_join");
 
+    let result_pointer = context.build_alloca(context.word_type(), "shift_left_result_pointer");
     let condition_is_overflow = context.builder().build_int_compare(
         inkwell::IntPredicate::UGT,
         shift,
@@ -72,6 +73,7 @@ where
     context.build_conditional_branch(condition_is_overflow, overflow_block, non_overflow_block)?;
 
     context.set_basic_block(overflow_block);
+    context.build_store(result_pointer, context.word_const(0))?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(non_overflow_block);
@@ -79,17 +81,11 @@ where
         context
             .builder()
             .build_left_shift(value, shift, "shift_left_non_overflow_result")?;
+    context.build_store(result_pointer, value)?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(join_block);
-    let result = context
-        .builder()
-        .build_phi(context.word_type(), "shift_left_value")?;
-    result.add_incoming(&[
-        (&value, non_overflow_block),
-        (&context.word_const(0), overflow_block),
-    ]);
-    Ok(result.as_basic_value())
+    context.build_load(result_pointer, "shift_left_result")
 }
 
 /// Translates the bitwise shift right.
@@ -105,6 +101,7 @@ where
     let non_overflow_block = context.append_basic_block("shift_right_non_overflow");
     let join_block = context.append_basic_block("shift_right_join");
 
+    let result_pointer = context.build_alloca(context.word_type(), "shift_right_result_pointer");
     let condition_is_overflow = context.builder().build_int_compare(
         inkwell::IntPredicate::UGT,
         shift,
@@ -114,6 +111,7 @@ where
     context.build_conditional_branch(condition_is_overflow, overflow_block, non_overflow_block)?;
 
     context.set_basic_block(overflow_block);
+    context.build_store(result_pointer, context.word_const(0))?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(non_overflow_block);
@@ -123,17 +121,11 @@ where
         false,
         "shift_right_non_overflow_result",
     )?;
+    context.build_store(result_pointer, value)?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(join_block);
-    let result = context
-        .builder()
-        .build_phi(context.word_type(), "shift_right_value")?;
-    result.add_incoming(&[
-        (&value, non_overflow_block),
-        (&context.word_const(0), overflow_block),
-    ]);
-    Ok(result.as_basic_value())
+    context.build_load(result_pointer, "shift_right_result")
 }
 
 /// Translates the arithmetic bitwise shift right.
@@ -153,6 +145,8 @@ where
     let non_overflow_block = context.append_basic_block("shift_right_arithmetic_non_overflow");
     let join_block = context.append_basic_block("shift_right_arithmetic_join");
 
+    let result_pointer =
+        context.build_alloca(context.word_type(), "shift_right_arithmetic_result_pointer");
     let condition_is_overflow = context.builder().build_int_compare(
         inkwell::IntPredicate::UGT,
         shift,
@@ -180,9 +174,11 @@ where
     )?;
 
     context.set_basic_block(overflow_positive_block);
+    context.build_store(result_pointer, context.word_const(0))?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(overflow_negative_block);
+    context.build_store(result_pointer, context.word_type().const_all_ones())?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(non_overflow_block);
@@ -192,21 +188,11 @@ where
         true,
         "shift_right_arithmetic_non_overflow_result",
     )?;
+    context.build_store(result_pointer, value)?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(join_block);
-    let result = context
-        .builder()
-        .build_phi(context.word_type(), "shift_arithmetic_right_value")?;
-    result.add_incoming(&[
-        (&value, non_overflow_block),
-        (
-            &context.word_type().const_all_ones(),
-            overflow_negative_block,
-        ),
-        (&context.word_const(0), overflow_positive_block),
-    ]);
-    Ok(result.as_basic_value())
+    context.build_load(result_pointer, "shift_right_arithmetic_result")
 }
 
 /// Translates the `byte` instruction, extracting the byte of `operand_2`

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

@@ -2,7 +2,6 @@
 
 use inkwell::values::BasicValue;
 
-use crate::polkavm::context::pointer::Pointer;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
 
@@ -50,9 +49,7 @@ where
     D: Dependency + Clone,
 {
     let address_type = context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS);
-    let address_pointer: Pointer<'_> = context
-        .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
-        .into();
+    let address_pointer = context.build_alloca_at_entry(address_type, "origin_address");
     context.build_store(address_pointer, address_type.const_zero())?;
     context.build_runtime_call(
         revive_runtime_api::polkavm_imports::ORIGIN,
@@ -100,13 +97,13 @@ where
     D: Dependency + Clone,
 {
     let output_pointer = context.build_alloca_at_entry(context.word_type(), "blockhash_out_ptr");
-    let index_pointer = context.build_alloca_at_entry(context.word_type(), "blockhash_index_ptr");
-    context.build_store(index_pointer, index)?;
+    let index_ptr = context.build_alloca_at_entry(context.word_type(), "blockhash_index_ptr");
+    context.build_store(index_ptr, index)?;
 
     context.build_runtime_call(
         revive_runtime_api::polkavm_imports::BLOCK_HASH,
         &[
-            index_pointer.to_int(context).into(),
+            index_ptr.to_int(context).into(),
             output_pointer.to_int(context).into(),
         ],
     );
@@ -130,9 +127,10 @@ pub fn coinbase<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let pointer: Pointer<'_> = context
-        .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
-        .into();
+    let pointer = context.build_alloca_at_entry(
+        context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS),
+        "coinbase_output",
+    );
     context.build_runtime_call(
         revive_runtime_api::polkavm_imports::BLOCK_AUTHOR,
         &[pointer.to_int(context).into()],
@@ -157,9 +155,10 @@ pub fn address<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let pointer: Pointer<'_> = context
-        .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
-        .into();
+    let pointer = context.build_alloca_at_entry(
+        context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS),
+        "address_output",
+    );
     context.build_runtime_call(
         revive_runtime_api::polkavm_imports::ADDRESS,
         &[pointer.to_int(context).into()],
@@ -174,9 +173,10 @@ pub fn caller<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let pointer: Pointer<'_> = context
-        .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
-        .into();
+    let pointer = context.build_alloca_at_entry(
+        context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS),
+        "address_output",
+    );
     context.build_runtime_call(
         revive_runtime_api::polkavm_imports::CALLER,
         &[pointer.to_int(context).into()],

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

@@ -32,7 +32,6 @@ where
     let salt_pointer = match salt {
         Some(salt) => {
             let salt_pointer = context.build_alloca_at_entry(context.word_type(), "salt_pointer");
-            let salt = context.build_byte_swap(salt.into())?;
             context.build_store(salt_pointer, salt)?;
             salt_pointer
         }
@@ -119,8 +118,10 @@ where
                 _ => error,
             })?;
     if contract_path.as_str() == parent {
-        return Ok(Argument::value(context.word_const(0).as_basic_value_enum())
-            .with_constant(num::BigUint::zero()));
+        return Ok(Argument::new_with_constant(
+            context.word_const(0).as_basic_value_enum(),
+            num::BigUint::zero(),
+        ));
     } else if identifier.ends_with("_deployed") && code_type == CodeType::Runtime {
         anyhow::bail!("type({}).runtimeCode is not supported", identifier);
     }
@@ -129,7 +130,7 @@ where
     let hash_value = context
         .word_const_str_hex(hash_string.as_str())
         .as_basic_value_enum();
-    Ok(Argument::value(hash_value).with_original(hash_string))
+    Ok(Argument::new_with_original(hash_value, hash_string))
 }
 
 /// Translates the deploy call header size instruction. the header consists of
@@ -158,8 +159,10 @@ where
                 _ => error,
             })?;
     if contract_path.as_str() == parent {
-        return Ok(Argument::value(context.word_const(0).as_basic_value_enum())
-            .with_constant(num::BigUint::zero()));
+        return Ok(Argument::new_with_constant(
+            context.word_const(0).as_basic_value_enum(),
+            num::BigUint::zero(),
+        ));
     } else if identifier.ends_with("_deployed") && code_type == CodeType::Runtime {
         anyhow::bail!("type({}).runtimeCode is not supported", identifier);
     }
@@ -168,5 +171,5 @@ where
     let size_value = context
         .word_const(crate::polkavm::DEPLOYER_CALL_HEADER_SIZE as u64)
         .as_basic_value_enum();
-    Ok(Argument::value(size_value).with_constant(size_bigint))
+    Ok(Argument::new_with_constant(size_value, size_bigint))
 }

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

@@ -28,7 +28,7 @@ pub fn value<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let output_pointer = context.build_alloca_at_entry(context.value_type(), "value_transferred");
+    let output_pointer = context.build_alloca(context.value_type(), "value_transferred");
     context.build_store(output_pointer, context.word_const(0))?;
     context.build_runtime_call(
         revive_runtime_api::polkavm_imports::VALUE_TRANSFERRED,
@@ -46,7 +46,8 @@ where
     D: Dependency + Clone,
 {
     let address_pointer = context.build_address_argument_store(address)?;
-    let balance_pointer = context.build_alloca_at_entry(context.word_type(), "balance_pointer");
+
+    let balance_pointer = context.build_alloca(context.word_type(), "balance_pointer");
     let balance = context.builder().build_ptr_to_int(
         balance_pointer.value,
         context.xlen_type(),
@@ -68,7 +69,7 @@ pub fn self_balance<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let balance_pointer = context.build_alloca_at_entry(context.word_type(), "balance_pointer");
+    let balance_pointer = context.build_alloca(context.word_type(), "balance_pointer");
     let balance = context.builder().build_ptr_to_int(
         balance_pointer.value,
         context.xlen_type(),

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

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

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

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

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

@@ -85,14 +85,5 @@ where
         offset,
         "mstore8_destination",
     );
-    let pointer = context.build_sbrk(
-        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(())
+    context.build_store(pointer, value)
 }

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

@@ -1,9 +1,9 @@
 //! Translates the transaction return operations.
 
+use crate::polkavm::context::address_space::AddressSpace;
 use crate::polkavm::context::code_type::CodeType;
-use crate::polkavm::context::runtime::RuntimeFunction;
+use crate::polkavm::context::pointer::Pointer;
 use crate::polkavm::context::Context;
-use crate::polkavm::evm::immutable::Store;
 use crate::polkavm::Dependency;
 
 /// Translates the `return` instruction.
@@ -18,11 +18,55 @@ where
     match context.code_type() {
         None => anyhow::bail!("Return is not available if the contract part is undefined"),
         Some(CodeType::Deploy) => {
-            context.build_call(
-                <Store as RuntimeFunction<D>>::declaration(context),
-                Default::default(),
-                "store_immutable_data",
+            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);
         }
         Some(CodeType::Runtime) => {}
     }
@@ -56,7 +100,11 @@ pub fn stop<D>(context: &mut Context<D>) -> anyhow::Result<()>
 where
     D: Dependency + Clone,
 {
-    r#return(context, context.word_const(0), context.word_const(0))
+    r#return(
+        context,
+        context.integer_const(crate::polkavm::XLEN, 0),
+        context.integer_const(crate::polkavm::XLEN, 0),
+    )
 }
 
 /// Translates the `invalid` instruction.

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

@@ -1,80 +1,65 @@
 //! Translates the storage operations.
 
-use crate::polkavm::context::runtime::RuntimeFunction;
+use crate::polkavm::context::address_space::AddressSpace;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
-use crate::PolkaVMArgument;
-use crate::PolkaVMLoadStorageWordFunction;
-use crate::PolkaVMLoadTransientStorageWordFunction;
-use crate::PolkaVMStoreStorageWordFunction;
-use crate::PolkaVMStoreTransientStorageWordFunction;
 
 /// Translates the storage load.
 pub fn load<'ctx, D>(
     context: &mut Context<'ctx, D>,
-    position: &PolkaVMArgument<'ctx>,
+    position: inkwell::values::IntValue<'ctx>,
 ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>>
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::NAME;
-    let declaration = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    let arguments = [position.as_pointer(context)?.value.into()];
-    Ok(context
-        .build_call(declaration, &arguments, "storage_load")
-        .unwrap_or_else(|| panic!("runtime function {name} should return a value")))
+    let mut slot_ptr = context.build_alloca_at_entry(context.word_type(), "slot_pointer");
+    slot_ptr.address_space = AddressSpace::Storage;
+    context.builder().build_store(slot_ptr.value, position)?;
+    context.build_load(slot_ptr, "storage_load_value")
 }
 
 /// Translates the storage store.
 pub fn store<'ctx, D>(
     context: &mut Context<'ctx, D>,
-    position: &PolkaVMArgument<'ctx>,
-    value: &PolkaVMArgument<'ctx>,
+    position: inkwell::values::IntValue<'ctx>,
+    value: inkwell::values::IntValue<'ctx>,
 ) -> anyhow::Result<()>
 where
     D: Dependency + Clone,
 {
-    let declaration = <PolkaVMStoreStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    let arguments = [
-        position.as_pointer(context)?.value.into(),
-        value.as_pointer(context)?.value.into(),
-    ];
-    context.build_call(declaration, &arguments, "storage_store");
+    let mut slot_ptr = context.build_alloca_at_entry(context.word_type(), "slot_pointer");
+    slot_ptr.address_space = AddressSpace::Storage;
+    context.builder().build_store(slot_ptr.value, position)?;
+    context.build_store(slot_ptr, value)?;
     Ok(())
 }
 
 /// Translates the transient storage load.
 pub fn transient_load<'ctx, D>(
     context: &mut Context<'ctx, D>,
-    position: &PolkaVMArgument<'ctx>,
+    position: inkwell::values::IntValue<'ctx>,
 ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>>
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMLoadTransientStorageWordFunction as RuntimeFunction<D>>::NAME;
-    let arguments = [position.as_pointer(context)?.value.into()];
-    let declaration =
-        <PolkaVMLoadTransientStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    Ok(context
-        .build_call(declaration, &arguments, "transient_storage_load")
-        .unwrap_or_else(|| panic!("runtime function {name} should return a value")))
+    let mut slot_ptr = context.build_alloca_at_entry(context.word_type(), "slot_pointer");
+    slot_ptr.address_space = AddressSpace::TransientStorage;
+    context.builder().build_store(slot_ptr.value, position)?;
+    context.build_load(slot_ptr, "transient_storage_load_value")
 }
 
 /// Translates the transient storage store.
 pub fn transient_store<'ctx, D>(
     context: &mut Context<'ctx, D>,
-    position: &PolkaVMArgument<'ctx>,
-    value: &PolkaVMArgument<'ctx>,
+    position: inkwell::values::IntValue<'ctx>,
+    value: inkwell::values::IntValue<'ctx>,
 ) -> anyhow::Result<()>
 where
     D: Dependency + Clone,
 {
-    let declaration =
-        <PolkaVMStoreTransientStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    let arguments = [
-        position.as_pointer(context)?.value.into(),
-        value.as_pointer(context)?.value.into(),
-    ];
-    context.build_call(declaration, &arguments, "transient_storage_store");
+    let mut slot_ptr = context.build_alloca_at_entry(context.word_type(), "slot_pointer");
+    slot_ptr.address_space = AddressSpace::TransientStorage;
+    context.builder().build_store(slot_ptr.value, position)?;
+    context.build_store(slot_ptr, value)?;
     Ok(())
 }