Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Back-port Bump platform tools version (from solana-labs/solana #35330) #362

Merged
merged 2 commits into from
Mar 22, 2024

Conversation

LucasSte
Copy link

@LucasSte LucasSte commented Mar 21, 2024

Problem

Platform tools v1.39 shipped with Solana v1.18 contains a bug in the discriminator size and in the stack allocation.

The new version contains a fix for the incorrect enum size introduced in Rust 1.72: anza-xyz/rust#90. This could cause programs to stop working, if developers build them with new tools.

In addition, v1.39 introduced changes in the SROA (Scalar Replacement of Aggregates) pass, which caused multiple functions to utilize more stack space than before: #252. v1.41 fixes this as well.

Summary of Changes

This is a back port of solana-labs#35330 to v1.18.

Copy link

@willhickey willhickey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved for v1.18, pending review from someone familiar with this part of the code and CI passing

We're manually syncing all changes back to solana-labs/solana so we can create parallel releases. Can the two anza-xyz/platform-tools references here be left as solana-labs/platform-tools in the solana-labs/solana version of this change?

It looks like both copies of the platform-tools repo have a198faafa9c75f13935322f0293f24a2c3ea4b90 as 1.41.

@LucasSte
Copy link
Author

Approved for v1.18, pending review from someone familiar with this part of the code and CI passing

@willhickey cargo-audit in the CI is pointing a vulnerability in crate mio. I tested the command locally without my changes and the error persists. Should we update this in v1.18 as well?

We're manually syncing all changes back to solana-labs/solana so we can create parallel releases. Can the two anza-xyz/platform-tools references here be left as solana-labs/platform-tools in the solana-labs/solana version of this change?

It looks like both copies of the platform-tools repo have a198faafa9c75f13935322f0293f24a2c3ea4b90 as 1.41.

The platform-tools repository has moved to Anza. If the change in references does not brake the links, renaming should be fine.

@LucasSte
Copy link
Author

Approved for v1.18, pending review from someone familiar with this part of the code and CI passing

@willhickey cargo-audit in the CI is pointing a vulnerability in crate mio. I tested the command locally without my changes and the error persists. Should we update this in v1.18 as well?

It looks like merging with the latest v1.18 version has fixed the issue.

@LucasSte LucasSte marked this pull request as ready for review March 22, 2024 14:03
@LucasSte LucasSte merged commit f0cd4e5 into anza-xyz:v1.18 Mar 22, 2024
37 checks passed
@LucasSte LucasSte deleted the back-port branch March 22, 2024 14:28
@CriesofCarrots
Copy link

@LucasSte , in future, please rebase and force push instead of the merge commit

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants