Update code base to use LLVM 21 #434

kvpanch · 2025-12-15T23:36:20Z

No description provided.

kvpanch · 2025-12-15T23:36:43Z

Still draft as I need to fix polkavm's dwarf handling.

elle-j

Great 🙂 The cross compilation section in the compiler book needs an update too (still referencing LLVM_SYS_181_PREFIX), as well as an entry to the CHANGELOG.md (perhaps we should add an "Internal" section to the CHANGELOG 🤔).

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

elle-j · 2026-01-29T08:57:07Z

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

                "-DCOMPILER_RT_BUILD_MEMPROF='Off'",
                "-DCOMPILER_RT_BUILD_ORC='Off'",
                "-DCOMPILER_RT_DEFAULT_TARGET_ARCH='aarch64'",
-                "-DCOMPILER_RT_DEFAULT_TARGET_ONLY='On'",


Why does this need to be removed? Doesn't this ensure it only tries to build for aarch64?

Unfortunately, I have no good answer to that question. That define caused compiler-rt to look for some asan headers that in the wrong location.
I was trying to understand logic in cmake files of compiler-rt, but just gave up.
jfyi: In official docs on how to build compiler-rt, this flag is not used.

Ah ok, strange. Is the size of the build artifact affected? Maybe the change is negligible.

I can't follow, this flag tells the build system to only built the runtime for the default target (for the host compiler). How would it change the size of our contract builds?

I have no good answer to that question

Fair. They set this flag in the era compiler llvm builder and I didn't bother to investigate it first hand. It must've something to do with how cross builds work. I'll briefly look into it too.

elle-j · 2026-01-29T08:58:02Z

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

                "-DCOMPILER_RT_BUILD_MEMPROF='Off'",
                "-DCOMPILER_RT_BUILD_ORC='Off'",
                "-DCOMPILER_RT_DEFAULT_TARGET_ARCH='x86_64'",
-                "-DCOMPILER_RT_DEFAULT_TARGET_ONLY='On'",


Same as previous comment.

Co-authored-by: LJ <81748770+elle-j@users.noreply.github.com>

xermicus · 2026-01-30T09:50:37Z

perhaps we should add an "Internal" section to the CHANGELOG

Good point of pointing out that it should be added to the changelog. But WDYM with "internal" section, he can just add it on top, where all new (unreleased) changes go?

xermicus

Nice, thanks! LGTM. But could you please first try all release workflows (LLVM and then resolc) in a fork (e.g. here)?

xermicus · 2026-01-30T10:14:00Z

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

                    inkwell::attributes::AttributeLoc::Param(index as u32),
                    self.llvm
-                        .create_enum_attribute(Attribute::NoCapture as u32, 0),
+                        .create_enum_attribute(Attribute::Captures as u32, 0), // captures(none)


This caught my eye. Since NoCapture no longer exist. I guess the comment intents to say that it is still like no capture?

nocapture now is represented as captures(none) in textual LLVM IR

elle-j · 2026-01-30T10:37:56Z

But WDYM with "internal" section, he can just add it on top, where all new (unreleased) changes go?

Yes still part of the Unreleased section, was thinking more of a subsection within that called e.g. Internal, for changes that may not necessarily affect the usage of resolc. E.g.:

## Unreleased
...

### Changed
...

### Fixed
...

### Internal
...

xermicus · 2026-01-30T10:41:12Z

This change should be mentioned under Changed.

xermicus

I think we should also update rust musl cross.

Update the rust-musl-cross image to the latest tag on CI and Dockerfile
Use Rust 1.92
Update to download solc 0.33 in the Dockerfile

The cumulative LLVM21 musl build fixes: - Update rust-musl-cross and Rust versions - Bring back `DCOMPILER_RT_DEFAULT_TARGET_ONLY` to prevent multilib related issues in the cross build - Use lld in the musl target stage - ~~Do not build the LTO tool shared object (this caused linker errors for some reason)~~ scrapped - that seemed sus to me and I tested in a clean full-stage build. Maybe was an issue with the build cache. --------- Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>

kvpanch · 2026-02-02T12:02:54Z

rust-musl-cross

do you mean as a part of this PR or follow up ?

xermicus · 2026-02-02T13:38:26Z

rust-musl-cross

do you mean as a part of this PR or follow up ?

Done with #466

kvpanch · 2026-02-02T13:42:54Z

Updated changelog

CHANGELOG.md

Co-authored-by: xermicus <cyrill@parity.io>

This reverts commit f24e2d8. Revert "llvm 21 musl cross compilation build fixes (#466)" This reverts commit ef54749.

This reverts commit 8fb3c58.

Update code base to use LLVM 21

c952471

kvpanch requested review from elle-j and xermicus December 15, 2025 23:36

kvpanch added 4 commits December 16, 2025 07:13

Merge branch 'main' into kvpanch/llvm_21

4ab11a0

Merge branch 'main' into kvpanch/llvm_21

c9b76b8

Use inwell 0.8.0

8e88171

Update llvm module

93adf75

kvpanch mentioned this pull request Jan 15, 2026

Support AdvancePc and ConstantAddPc paritytech/polkavm#350

Merged

kvpanch added 2 commits January 28, 2026 10:04

Merge branch 'main' into kvpanch/llvm_21

c8c0efc

Updated PVM dependency to include debuginfo fix

9493274

kvpanch marked this pull request as ready for review January 28, 2026 19:10

elle-j reviewed Jan 29, 2026

View reviewed changes

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

dd465b6

Co-authored-by: LJ <81748770+elle-j@users.noreply.github.com>

elle-j approved these changes Jan 30, 2026

View reviewed changes

xermicus reviewed Jan 30, 2026

View reviewed changes

xermicus and others added 4 commits January 30, 2026 11:51

Merge branch 'main' into kvpanch/llvm_21

e686a50

Merge branch 'main' into kvpanch/llvm_21

727a252

Update changelog

9a401d0

xermicus approved these changes Feb 2, 2026

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

kvpanch and others added 2 commits February 2, 2026 09:53

Update CHANGELOG.md

cb0c280

Co-authored-by: xermicus <cyrill@parity.io>

Update EMSDK in actions

97eea79

kvpanch added 5 commits February 2, 2026 13:35

Changed EMSDK version back to 4.0.9

92e9874

Revert EMSDK to 4.0.9

e6a8000

Revert "npm package: fix --bin (#467)"

8fb3c58

This reverts commit f24e2d8. Revert "llvm 21 musl cross compilation build fixes (#466)" This reverts commit ef54749.

Reapply "npm package: fix --bin (#467)"

6d7e391

This reverts commit 8fb3c58.

Bump EMSDK to 4.0.23 and update github action script to install xz

4b60362

Update code base to use LLVM 21 #434

Are you sure you want to change the base?

Update code base to use LLVM 21 #434

Uh oh!

Conversation

kvpanch commented Dec 15, 2025

Uh oh!

kvpanch commented Dec 15, 2025

Uh oh!

elle-j left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

elle-j Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

kvpanch Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

elle-j Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

xermicus Jan 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

elle-j Jan 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

xermicus commented Jan 30, 2026

Uh oh!

xermicus left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

xermicus Jan 30, 2026

Choose a reason for hiding this comment

Uh oh!

kvpanch Jan 30, 2026

Choose a reason for hiding this comment

Uh oh!

elle-j commented Jan 30, 2026

Uh oh!

xermicus commented Jan 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xermicus left a comment

Choose a reason for hiding this comment

Uh oh!

kvpanch commented Feb 2, 2026

Uh oh!

xermicus commented Feb 2, 2026

Uh oh!

kvpanch commented Feb 2, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

elle-j left a comment •

edited

Loading

xermicus Jan 30, 2026 •

edited

Loading

elle-j Jan 29, 2026 •

edited

Loading

xermicus left a comment •

edited

Loading

xermicus commented Jan 30, 2026 •

edited

Loading