pretty/mir: const value enums with no variants #73442
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
|
r? @eddyb (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
r? @oli-obk |
The changes from indexing to |
oli-obk
reviewed
Jun 18, 2020
oli-obk
reviewed
Jun 18, 2020
oli-obk
reviewed
Jun 18, 2020
oli-obk
reviewed
Jun 18, 2020
davidtwco
force-pushed
the
issue-72181-pretty-print-const-val-enum-no-variants
branch
2 times, most recently
from
db77648 to
8ca3c74
Compare
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
I'm not able to reproduce this locally after rebasing on master, any ideas @oli-obk? |
oli-obk
reviewed
Jun 18, 2020
oli-obk
reviewed
Jun 18, 2020
oli-obk
reviewed
Jun 18, 2020
oli-obk
reviewed
Jun 18, 2020
davidtwco
force-pushed
the
issue-72181-pretty-print-const-val-enum-no-variants
branch
from
8ca3c74 to
750efc6
Compare
|
@bors r+ |
|
📌 Commit 750efc6e1d60df527f541f01b561747813c4585b has been approved by |
bors
added
S-waiting-on-bors
This comment has been minimized.
This comment has been minimized.
This commit modifies the pretty printer and const eval in the MIR so that `destructure_const` (used in `pretty_print_const_value`) can handle enums with no variants (or types containing enums with no variants). Signed-off-by: David Wood <david@davidtw.co>
davidtwco
force-pushed
the
issue-72181-pretty-print-const-val-enum-no-variants
branch
from
750efc6 to
6fa7dc6
Compare
|
r=me with CI passing |
|
@bors r=oli-obk |
|
📌 Commit 6fa7dc6 has been approved by |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 20, 2020
…arth Rollup of 16 pull requests Successful merges: - rust-lang#71420 (Specialization is unsound) - rust-lang#71899 (Refactor `try_find` a little) - rust-lang#72689 (add str to common types) - rust-lang#72791 (update coerce docs and unify relevant tests) - rust-lang#72934 (forbid mutable references in all constant contexts except for const-fns) - rust-lang#73027 (Make `need_type_info_err` more conservative) - rust-lang#73347 (Diagnose use of incompatible sanitizers) - rust-lang#73359 (shim.rs: avoid creating `Call` terminators calling `Self`) - rust-lang#73399 (Clean up E0668 explanation) - rust-lang#73436 (Clean up E0670 explanation) - rust-lang#73440 (Add src/librustdoc as an alias for src/tools/rustdoc) - rust-lang#73442 (pretty/mir: const value enums with no variants) - rust-lang#73452 (Unify region variables when projecting associated types) - rust-lang#73458 (Use alloc::Layout in DroplessArena API) - rust-lang#73484 (Update the doc for std::prelude to the correct behavior) - rust-lang#73506 (Bump Rustfmt and RLS) Failed merges: r? @ghost
davidtwco
deleted the
issue-72181-pretty-print-const-val-enum-no-variants
branch
eddyb
reviewed
Jun 25, 2020
Comment on lines
+1180
to
+1182
| ty::Adt(def, substs) if def.variants.is_empty() => { | ||
| p!(print_value_path(def.did, substs)); | ||
| } |
There was a problem hiding this comment.
I don't think this should ever be reached? This sort of thing should be an evaluation error, surely?
There was a problem hiding this comment.
I don’t know about an evaluation error, but this definitely gets reached.
There was a problem hiding this comment.
we use the pretty printer from within the miri engine and the const evaluator does not validate that every local is always valid, only miri does this.
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.
Fixes #72181.
This PR modifies the pretty printer and const eval in the MIR so that
destructure_const(used inpretty_print_const_value) can handle enums with no variants (or types containing enums with no variants).I'm not convinced that this is the correct approach, folks more familiar with
destructure_constwould be able to say - happy to adjust the PR. Looking throughdestructure_constand the functions that it invokes, it didn't seem like it was written to handle zero-variant-enums - I assume that case is handled earlier in some way sodestructure_constdoesn't need to under normal circumstances. It didn't seem like it would be straightforward to makedestructure_consthandle this case in a first-class-feeling way (e.g. adding aVariants::Nonevariant), so this PR makes some minimal changes to avoid ICEs.