Upgrade toolchain to nightly-2022-09-13 #1737
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes model-checking#1615 Relevant changes to rustc: - rust-lang/rust#101483: Change to intrinsics. - rust-lang/rust#94075: Change to niche opt. - rust-lang/rust#101101: Method rename. Co-authored-by: Adrian Palacios <[email protected]>
zhassan-aws
reviewed
Oct 3, 2022
| @@ -544,6 +544,13 @@ impl Expr { | |||
| Self::double_constant(c) | |||
| } | |||
|
|
|||
| /// `if (c) { t } else { e }` | |||
| pub fn if_then_else_expr(c: Expr, t: Expr, e: Expr) -> Self { | |||
There was a problem hiding this comment.
Isn't this the same as the ternary method?
There was a problem hiding this comment.
Good call! Let me replace that.
There was a problem hiding this comment.
Mea culpa, I wasn't able to find it.
| @@ -1012,6 +1004,26 @@ impl<'tcx> GotocCtx<'tcx> { | |||
| Stmt::block(vec![src_align_check, dst_align_check, overflow_check, copy_expr], loc) | |||
| } | |||
|
|
|||
| // In some contexts (e.g., compilation-time evaluation), | |||
There was a problem hiding this comment.
Kudos to @adpaco-aws. :)
| ref dst, | ||
| ref count, | ||
| }) => { | ||
| mir::StatementKind::Intrinsic(box NonDivergingIntrinsic::CopyNonOverlapping( |
There was a problem hiding this comment.
Is the mir:: prefix needed?
There was a problem hiding this comment.
Probably not. Let me remove that.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes:
Relevant changes to rustc:
<*const T>::guaranteed_*methods now return an option for the unknown case rust-lang/rust#101483: Change to intrinsics.Resolved issues:
Fixes #1615
Related RFC:
Optional #ISSUE-NUMBER.
Call-outs:
I created a special case for the niche optimization to keep using
structinstead ofunionfor cases where the enumeration only has one non-ZST variant. Without this, thekanitest suite takes more than 30min to finish. My guess is that it impacts a lot ofOption<>and common enums out there.Testing:
How is this change tested? New tests
Is this a refactor change? No
Checklist
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.