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.

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

Upgrade toolchain to 2023-02-05 #2347

Merged
merged 4 commits into from
Apr 14, 2023
Merged

Upgrade toolchain to 2023-02-05 #2347

merged 4 commits into from
Apr 14, 2023

Conversation

tautschnig
Copy link
Member

@tautschnig tautschnig commented Apr 4, 2023 •
edited
Loading

Description of changes:

Implement AggregateKind::{Adt,Closure,Generator} which are being used when moving toolchains from nightly 2023-02-04 to 2023-02-05 (or any later date).

Resolved issues:

Attempting to upgrade the toolchain to 2023-02-05.

Related RFC:

n/a

Call-outs:

n/a

Testing:

  • How is this change tested? All CI checks pass, which includes two additional tests.

  • Is this a refactor change? No.

Checklist

  • Each commit message has a non-empty body, explaining why the change was made
  • Methods or procedures are documented
  • Regression or unit tests are included, or existing tests cover the modified code
  • My PR is restricted to a single feature or bugfix

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

@tautschnig tautschnig force-pushed the toolchain-2023-02-05-manual branch 2 times, most recently from f545852 to ad0d9cb Compare April 5, 2023 16:11
@tautschnig tautschnig force-pushed the toolchain-2023-02-05-manual branch 10 times, most recently from 00b08f8 to a43c5a8 Compare April 13, 2023 00:00
celinval
celinval reviewed Apr 13, 2023
View reviewed changes
Copy link
Contributor

@celinval celinval left a comment

Choose a reason for hiding this comment

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

Thanks for doing this @tautschnig!

kani-compiler/src/codegen_cprover_gotoc/codegen/rvalue.rs Outdated Show resolved Hide resolved
kani-compiler/src/codegen_cprover_gotoc/codegen/rvalue.rs Outdated Show resolved Hide resolved
kani-compiler/src/codegen_cprover_gotoc/codegen/rvalue.rs Outdated Show resolved Hide resolved
kani-compiler/src/codegen_cprover_gotoc/codegen/rvalue.rs Outdated Show resolved Hide resolved
kani-compiler/src/codegen_cprover_gotoc/codegen/rvalue.rs Outdated Show resolved Hide resolved
kani-compiler/src/codegen_cprover_gotoc/codegen/rvalue.rs Show resolved Hide resolved
This was referenced Apr 13, 2023
Merged
Closed
@tautschnig tautschnig mentioned this pull request Apr 13, 2023
Merged
3 tasks
celinval
celinval reviewed Apr 13, 2023
View reviewed changes
Copy link
Contributor

@celinval celinval left a comment

Choose a reason for hiding this comment

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

I think we can still simplify the enum case. Here is an example using a temporary variable:

https://github.com/celinval/kani-dev/blob/843f17fcd60b0f360cf035966aa47efbd5d6fa16/kani-compiler/src/codegen_cprover_gotoc/codegen/rvalue.rs#L283-L351

kani-compiler/src/codegen_cprover_gotoc/codegen/statement.rs Outdated Show resolved Hide resolved
@tautschnig tautschnig force-pushed the toolchain-2023-02-05-manual branch 3 times, most recently from 24ca8d2 to b655505 Compare April 14, 2023 10:36
@tautschnig tautschnig marked this pull request as ready for review April 14, 2023 10:48
@tautschnig tautschnig requested a review from a team as a code owner April 14, 2023 10:48
@tautschnig tautschnig mentioned this pull request Apr 14, 2023
Closed
4 tasks
@tautschnig tautschnig changed the title Toolchain 2023-02-05 with AggregateKind::Adt implementation Upgrade toolchain to 2023-02-05 Apr 14, 2023
@celinval celinval linked an issue Apr 14, 2023 that may be closed by this pull request
Update rust toolchain version for Kani 0.24 #2283
Closed
@celinval celinval removed a link to an issue Apr 14, 2023
Update rust toolchain version for Kani 0.24 #2283
Closed
celinval
celinval reviewed Apr 14, 2023
View reviewed changes
Copy link
Contributor

@celinval celinval left a comment

Choose a reason for hiding this comment

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

It looks good! Thanks @tautschnig. I just have a few minor comments.

kani-compiler/src/codegen_cprover_gotoc/codegen/rvalue.rs Outdated Show resolved Hide resolved
kani-compiler/src/codegen_cprover_gotoc/codegen/rvalue.rs Outdated Show resolved Hide resolved
kani-compiler/src/codegen_cprover_gotoc/codegen/rvalue.rs Outdated Show resolved Hide resolved
kani-compiler/src/codegen_cprover_gotoc/codegen/rvalue.rs Outdated Show resolved Hide resolved
kani-compiler/src/codegen_cprover_gotoc/codegen/rvalue.rs Show resolved Hide resolved
@tautschnig
Factor out niche value computation
2b636d6 
There will be future re-use of this code, so move it to a public
function.
@celinval @tautschnig
Adjust enum aggregation
80afe84 
Simplify the code by reusing some of the existing logic
celinval
celinval approved these changes Apr 14, 2023
View reviewed changes
Copy link
Contributor

@celinval celinval left a comment

Choose a reason for hiding this comment

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

Awesome!! Thanks again for the great work.

@tautschnig tautschnig enabled auto-merge (squash) April 14, 2023 22:31
@tautschnig tautschnig merged commit 22b14f4 into model-checking:main Apr 14, 2023
@tautschnig tautschnig deleted the toolchain-2023-02-05-manual branch April 14, 2023 22:43
@tautschnig tautschnig mentioned this pull request Apr 14, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@celinval celinval celinval approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tautschnig @celinval