Merge pull request #68 from upstat-io/dev

feat: LLVM 21 upgrade, Unicode escapes, cross-platform AOT, complete COW plan

Author: elucidsoft

.cargo/config.toml

@@ -1,8 +1,8 @@
 # Cargo configuration for Ori
 
 [env]
-# LLVM 17 location for llvm-sys crate
-LLVM_SYS_170_PREFIX = "/usr/lib/llvm-17"
+# LLVM 21 location for llvm-sys crate
+LLVM_SYS_211_PREFIX = "/usr/lib/llvm-21"
 
 [alias]
 # Ori language tests
@@ -20,4 +20,4 @@ c = "check --workspace"
 b = "build --workspace"
 cl = "clippy --workspace --all-targets -- -D warnings"
 
-# LLVM 17 is a default feature of oric. All commands include LLVM.
+# LLVM 21 is a default feature of oric. All commands include LLVM.

.github/workflows/ci.yml

@@ -47,12 +47,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install LLVM 17
+      - name: Install LLVM 21
         run: |
           curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg
-          echo "deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-17 main" | sudo tee /etc/apt/sources.list.d/llvm.list
+          echo "deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-21 main" | sudo tee /etc/apt/sources.list.d/llvm.list
           sudo apt-get update
-          sudo apt-get install -y --no-install-recommends llvm-17 llvm-17-dev libpolly-17-dev clang-17 lld-17
+          sudo apt-get install -y --no-install-recommends llvm-21 llvm-21-dev libpolly-21-dev clang-21 lld-21
         env:
           DEBIAN_FRONTEND: noninteractive
 
@@ -64,7 +64,7 @@ jobs:
           key: clippy
       - run: cargo clippy --workspace --all-targets -- -D warnings
         env:
-          LLVM_SYS_170_PREFIX: /usr/lib/llvm-17
+          LLVM_SYS_211_PREFIX: /usr/lib/llvm-21
 
   # Main test suite
   test:
@@ -75,12 +75,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install LLVM 17
+      - name: Install LLVM 21
         run: |
           curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg
-          echo "deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-17 main" | sudo tee /etc/apt/sources.list.d/llvm.list
+          echo "deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-21 main" | sudo tee /etc/apt/sources.list.d/llvm.list
           sudo apt-get update
-          sudo apt-get install -y --no-install-recommends llvm-17 llvm-17-dev libpolly-17-dev clang-17 lld-17
+          sudo apt-get install -y --no-install-recommends llvm-21 llvm-21-dev libpolly-21-dev clang-21 lld-21
         env:
           DEBIAN_FRONTEND: noninteractive
 
@@ -92,7 +92,7 @@ jobs:
       - name: Build
         run: cargo build --workspace
         env:
-          LLVM_SYS_170_PREFIX: /usr/lib/llvm-17
+          LLVM_SYS_211_PREFIX: /usr/lib/llvm-21
 
       - name: Rust unit tests
         id: rust-tests
@@ -106,7 +106,7 @@ jobs:
           echo "RUST_TESTS=$RUST_TESTS" >> $GITHUB_ENV
           echo "RUST_FAILED=$RUST_FAILED" >> $GITHUB_ENV
         env:
-          LLVM_SYS_170_PREFIX: /usr/lib/llvm-17
+          LLVM_SYS_211_PREFIX: /usr/lib/llvm-21
 
       - name: Ori language tests
         id: ori-tests
@@ -120,7 +120,7 @@ jobs:
           echo "ORI_TESTS=$ORI_TESTS" >> $GITHUB_ENV
           echo "ORI_FAILED=$ORI_FAILED" >> $GITHUB_ENV
         env:
-          LLVM_SYS_170_PREFIX: /usr/lib/llvm-17
+          LLVM_SYS_211_PREFIX: /usr/lib/llvm-21
 
       - name: Ori runtime tests
         id: rt-tests
@@ -191,29 +191,29 @@ jobs:
     name: ${{ matrix.os }}
     needs: [format, clippy]  # Don't waste CI time if basics fail
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 7
+    timeout-minutes: 12
     strategy:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest]
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install LLVM 17 (macOS)
+      - name: Install LLVM 21 (macOS)
         if: runner.os == 'macOS'
         run: |
-          brew install llvm@17
-          echo "LLVM_SYS_170_PREFIX=$(brew --prefix llvm@17)" >> $GITHUB_ENV
+          brew install llvm@21
+          echo "LLVM_SYS_211_PREFIX=$(brew --prefix llvm@21)" >> $GITHUB_ENV
 
-      - name: Install LLVM 17 (Windows)
+      - name: Install LLVM 21 (Windows)
         if: runner.os == 'Windows'
         run: |
-          $LLVM_URL = "https://github.com/upstat-io/llvm-package-windows/releases/download/v17.0.6/LLVM-17.0.6-win64.7z"
+          $LLVM_URL = "https://github.com/upstat-io/llvm-package-windows/releases/download/v21.1.8/LLVM-21.1.8-win64.7z"
           Write-Host "Downloading LLVM from $LLVM_URL"
           curl.exe -fLO $LLVM_URL
           Write-Host "Extracting LLVM to C:\LLVM..."
-          7z x LLVM-17.0.6-win64.7z -oC:\LLVM
-          echo "LLVM_SYS_170_PREFIX=C:\LLVM" >> $env:GITHUB_ENV
+          7z x LLVM-21.1.8-win64.7z -oC:\LLVM
+          echo "LLVM_SYS_211_PREFIX=C:\LLVM" >> $env:GITHUB_ENV
           echo "C:\LLVM\bin" >> $env:GITHUB_PATH
 
       - name: Set up MSVC environment (Windows)
@@ -234,6 +234,39 @@ jobs:
       - name: Ori language tests
         run: cargo run -p oric --bin ori -- test tests/
 
+      - name: AOT smoke test (compile + link + run)
+        continue-on-error: true  # macOS ARM64: compiler stack overflow in LLVM codegen (tracked)
+        shell: bash
+        run: |
+          SMOKE_DIR="${RUNNER_TEMP}/aot_smoke"
+          mkdir -p "$SMOKE_DIR"
+
+          # Write a minimal Ori program that exercises string + print (touches ori_rt)
+          cat > "$SMOKE_DIR/smoke.ori" << 'ORIEOF'
+          @main () -> void = print(msg: "hello from AOT");
+          ORIEOF
+
+          EXE_SUFFIX=""
+          if [[ "$RUNNER_OS" == "Windows" ]]; then
+            EXE_SUFFIX=".exe"
+          fi
+
+          BUILD_ARGS=(build "$SMOKE_DIR/smoke.ori" -o "$SMOKE_DIR/smoke${EXE_SUFFIX}")
+
+          # macOS: put Homebrew LLVM on PATH so lld is available
+          if [[ "$RUNNER_OS" == "macOS" ]]; then
+            LLVM_BIN="$(brew --prefix llvm@21)/bin"
+            if [[ -d "$LLVM_BIN" ]]; then
+              export PATH="$LLVM_BIN:$PATH"
+              if command -v lld >/dev/null 2>&1; then
+                BUILD_ARGS+=(--linker=lld)
+              fi
+            fi
+          fi
+
+          cargo run -p oric --bin ori -- "${BUILD_ARGS[@]}"
+          "$SMOKE_DIR/smoke${EXE_SUFFIX}"
+
   # Single status check for branch protection
   ci-success:
     name: CI Success

.github/workflows/release.yml

@@ -12,7 +12,7 @@ concurrency:
 
 env:
   CARGO_TERM_COLOR: always
-  LLVM_VERSION: "17"
+  LLVM_VERSION: "21"
 
 jobs:
   validate:
@@ -149,7 +149,7 @@ jobs:
       - name: Install LLVM
         run: |
           brew install llvm@${{ env.LLVM_VERSION }}
-          echo "LLVM_SYS_170_PREFIX=$(brew --prefix llvm@${{ env.LLVM_VERSION }})" >> $GITHUB_ENV
+          echo "LLVM_SYS_211_PREFIX=$(brew --prefix llvm@${{ env.LLVM_VERSION }})" >> $GITHUB_ENV
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
@@ -184,7 +184,7 @@ jobs:
     timeout-minutes: 60
 
     env:
-      LLVM_SYS_170_PREFIX: C:\LLVM
+      LLVM_SYS_211_PREFIX: C:\LLVM
 
     steps:
       - uses: actions/checkout@v4
@@ -210,17 +210,17 @@ jobs:
       - name: Download LLVM
         run: |
           # Download our pre-built LLVM with all targets
-          $LLVM_URL = "https://github.com/upstat-io/llvm-package-windows/releases/download/v17.0.6/LLVM-17.0.6-win64.7z"
+          $LLVM_URL = "https://github.com/upstat-io/llvm-package-windows/releases/download/v21.1.8/LLVM-21.1.8-win64.7z"
           Write-Host "Downloading LLVM from $LLVM_URL"
           curl.exe -fLO $LLVM_URL
           Write-Host "Extracting LLVM to C:\LLVM..."
-          7z x LLVM-17.0.6-win64.7z -oC:\LLVM
+          7z x LLVM-21.1.8-win64.7z -oC:\LLVM
 
       - name: Verify LLVM
         run: |
-          Write-Host "LLVM_SYS_170_PREFIX = $env:LLVM_SYS_170_PREFIX"
-          & "$env:LLVM_SYS_170_PREFIX\bin\llvm-config.exe" --version
-          & "$env:LLVM_SYS_170_PREFIX\bin\llvm-config.exe" --targets-built
+          Write-Host "LLVM_SYS_211_PREFIX = $env:LLVM_SYS_211_PREFIX"
+          & "$env:LLVM_SYS_211_PREFIX\bin\llvm-config.exe" --version
+          & "$env:LLVM_SYS_211_PREFIX\bin\llvm-config.exe" --targets-built
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable

.gitignore

@@ -42,6 +42,8 @@ Thumbs.db
 # Rust specific
 **/*.rs.bk
 *.pdb
+librust_out.a
+rust_out.lib
 
 # Local configuration
 .cargo/

Cargo.lock

@@ -18,7 +18,7 @@ members = [
     "compiler/ori_llvm",
     "compiler/ori_rt",
 ]
-# All crates including ori_llvm are in default-members; LLVM 17 is required for oric builds.
+# All crates including ori_llvm are in default-members; LLVM 21 is required for oric builds.
 default-members = [
     "compiler/ori_ir",
     "compiler/ori_diagnostic",

Cargo.toml

@@ -377,6 +377,7 @@ pub(super) fn update_ownership_inner(
                     my_sig,
                     local_sigs,
                     external_sigs,
+                    builtins,
                     &aliases,
                 );
             }
@@ -417,17 +418,20 @@ pub(super) fn update_ownership_inner(
 /// expects an argument as Owned but the corresponding parameter in our
 /// function is currently Borrowed, we must promote it to Owned to preserve
 /// the tail call optimization.
+#[expect(
+    clippy::too_many_arguments,
+    reason = "mirrors promote_callee_args context — both need caller + callee scope + builtins"
+)]
 fn check_tail_call(
     block: &crate::ir::ArcBlock,
     returned_value: ArcVarId,
     func: &ArcFunction,
     my_sig: &mut AnnotatedSig,
     local_sigs: &FxHashMap<Name, AnnotatedSig>,
     external_sigs: &FxHashMap<Name, AnnotatedSig>,
+    builtins: &BuiltinOwnershipSets,
     aliases: &FxHashMap<ArcVarId, ArcVarId>,
 ) -> bool {
-    let mut changed = false;
-
     let tail_apply = block
         .body
         .iter()
@@ -438,18 +442,19 @@ fn check_tail_call(
         func: callee, args, ..
     }) = tail_apply
     {
-        let callee_sig = local_sigs.get(callee).or_else(|| external_sigs.get(callee));
-        if let Some(callee_sig) = callee_sig {
-            for (i, &arg) in args.iter().enumerate() {
-                if i < callee_sig.params.len() && callee_sig.params[i].ownership == Ownership::Owned
-                {
-                    changed |= try_mark_param_owned(arg, func, my_sig, aliases);
-                }
-            }
-        }
+        promote_callee_args(
+            *callee,
+            args,
+            func,
+            my_sig,
+            local_sigs,
+            external_sigs,
+            builtins,
+            aliases,
+        )
+    } else {
+        false
     }
-
-    changed
 }
 
 #[cfg(test)]