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

Upgrade toolchain to 2025-02-11 #3887

Open
wants to merge 8 commits into
base: main
Choose a base branch
from

Conversation

thanhnguyen-aws
Copy link
Contributor

@thanhnguyen-aws thanhnguyen-aws commented Feb 12, 2025

Update Rust to nightly-2025-02-11

Upstream PR: rust-lang/rust@ee7dc06#diff-51b3860a8aed92b0e981635d4118d369c49850f5b7acf780d31f5ddd5d5d0bc2

Resolves #3884

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.

@thanhnguyen-aws thanhnguyen-aws requested a review from a team as a code owner February 12, 2025 19:08
@github-actions github-actions bot added the Z-BenchCI Tag a PR to run benchmark CI label Feb 12, 2025
@zhassan-aws
Copy link
Contributor

Can you add a link to the upstream PR that required the change to the Kani code?

tautschnig
tautschnig previously approved these changes Feb 13, 2025
@tautschnig tautschnig dismissed their stale review February 13, 2025 14:14

Changes seemed sane, but tests are still failing.

@carolynzech
Copy link
Contributor

carolynzech commented Feb 13, 2025

I did some debugging. The problem is that our parsing logic no longer works. Specifically, the comment above parse_coverage_opaque says this:

/// Parse a `CoverageOpaque` item and return the corresponding `CovTerm`:
/// <https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/mir/coverage/enum.CovTerm.html>
///
/// At present, a `CovTerm` can be one of the following:
/// - `CounterIncrement(<num>)`: A physical counter.
/// - `ExpressionUsed(<num>)`: An expression-based counter.
/// - `Zero`: A counter with a constant zero value.
fn parse_coverage_opaque(coverage_opaque: &Opaque) -> CovTerm {

but the documentation for CovTerm doesn't refer to any of these variants. I think this doc comment was always a typo--CovTerm hasn't been changed in a year and a half, but the linked upstream PR does change the variants of CoverageKind here. I added some debug! statements and determined that coverage_opaque for the failing test contains CoverageKind::VirtualCounter. So I think this parse_coverage_opaque function tries to parse CoverageKinds, but needs to be updated to reflect the new variants of that enum).

@thanhnguyen-aws I pushed a copy of this branch with some debug statements added to this branch so you can pick up debugging from there. (Make sure to remove these statements in your final PR).

@carolynzech carolynzech changed the title update-toolchain Upgrade toolchain to 2025-02-11 Feb 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Z-BenchCI Tag a PR to run benchmark CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Toolchain upgrade to nightly-2025-02-11 failed
4 participants