Skip to content

Upgrade toolchain to 2025-02-11 #3887

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 10 commits into from
Feb 21, 2025
Merged

Upgrade toolchain to 2025-02-11 #3887

merged 10 commits into from
Feb 21, 2025

Conversation

thanhnguyen-aws
Copy link
Contributor

@thanhnguyen-aws thanhnguyen-aws commented Feb 12, 2025 •
edited
Loading

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-EndToEndBenchCI 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
View reviewed changes
@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 •
edited
Loading

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

kani/kani-compiler/src/codegen_cprover_gotoc/codegen/function.rs

Lines 274 to 281 in 475ea5e

/// 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 suggested changes Feb 14, 2025
View reviewed changes
@carolynzech carolynzech changed the title update-toolchain Upgrade toolchain to 2025-02-11 Feb 14, 2025
@carolynzech carolynzech removed their request for review February 18, 2025 21:33
zhassan-aws
zhassan-aws approved these changes Feb 20, 2025
View reviewed changes
@zhassan-aws
Copy link
Contributor

@carolynzech you requested changes on this PR (which is blocking the merge), so I re-requested your review.

carolynzech
carolynzech reviewed Feb 20, 2025
View reviewed changes
@zhassan-aws zhassan-aws added this pull request to the merge queue Feb 21, 2025
Merged via the queue into model-checking:main with commit 51de000 Feb 21, 2025
28 checks passed
@qinheping qinheping mentioned this pull request Mar 5, 2025
Merged
github-merge-queue bot pushed a commit that referenced this pull request Mar 6, 2025
@qinheping @carolynzech
Bump Kani version to 0.60.0 (#3923)
67cd1e6 
## What's Changed
* Automatic cargo update to 2025-02-10 by @github-actions in
#3880
* Bump tests/perf/s2n-quic from `82dd0b5` to `a5d8422` by @dependabot in
#3882
* Fast fail feature - Stops verification process as soon as one failure
is observed - Use case : CI speed up by @rajath-mk in
#3879
* Autoharness Subcommand by @carolynzech in
#3874
* Upgrade toolchain to 2/10 by @carolynzech in
#3883
* Add loop-contracts doc to SUMMARY by @qinheping in
#3886
* Support concrete playback for arrays of length 65 or greater by
@carolynzech in #3888
* Automatic cargo update to 2025-02-17 by @github-actions in
#3889
* Bump tests/perf/s2n-quic from `a5d8422` to `00e3371` by @dependabot in
#3894
* Adjust PropertyClass of assertions to identify UB by @tautschnig in
#3860
* Fix: regression test from #3888 has version control change by
@carolynzech in #3892
* Upgrade toolchain to 2025-02-11 by @thanhnguyen-aws in
#3887
* Remove isize overflow check for zst offsets by @carolynzech in
#3897
* Automatic toolchain upgrade to nightly-2025-02-12 by @github-actions
in #3898
* Upgrade the toolchain to 2025-02-21 by @zhassan-aws in
#3899
* Automatic cargo update to 2025-02-24 by @github-actions in
#3901
* Bump ncipollo/release-action from 1.15.0 to 1.16.0 by @dependabot in
#3902
* Bump tests/perf/s2n-quic from `00e3371` to `cfb314b` by @dependabot in
#3903
* Convert raw URL to link by @flba-eb in
#3907
* Automatic cargo update to 2025-03-03 by @github-actions in
#3913
* Install toolchain with rustup >= 1.28.0 by @tautschnig in
#3917
* Bump tests/perf/s2n-quic from `cfb314b` to `d88faa4` by @dependabot in
#3916
* Remove Ubuntu 20.04 CI usage by @tautschnig in
#3918
* Move standard-library metrics script to verify-rust-std repo by
@tautschnig in #3914
* scanner: Fix loop stats in overall function stats summary by
@tautschnig in #3915
* Update toolchain to 2025-03-02 by @remi-delmas-3000 in
#3911

## New Contributors
* @flba-eb made their first contribution in
#3907

**Full Changelog**:
kani-0.59.0...kani-0.60.0

---------

Co-authored-by: Carolyn Zech <cmzech@amazon.com>
zhassan-aws added a commit to zhassan-aws/kani that referenced this pull request Mar 24, 2025
@zhassan-aws
Revert "Upgrade toolchain to 2025-02-11 (model-checking#3887)"
3e7eafb 
This reverts commit 51de000.
@zhassan-aws zhassan-aws mentioned this pull request Mar 25, 2025
Closed
@thanhnguyen-aws thanhnguyen-aws deleted the update-toolchain-02-11 branch June 18, 2025 15:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zhassan-aws zhassan-aws zhassan-aws approved these changes

@tautschnig tautschnig tautschnig left review comments

+1 more reviewer

@carolynzech carolynzech carolynzech approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees

@zhassan-aws zhassan-aws

Labels
Z-EndToEndBenchCI Tag a PR to run benchmark CI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Toolchain upgrade to nightly-2025-02-11 failed
4 participants
@thanhnguyen-aws @zhassan-aws @carolynzech @tautschnig