Support pretty printing of invalid constants #94020
Merged
+117
−29
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
rustbot
added
the
T-compiler
|
Some changes occured to the CTFE / Miri engine cc @rust-lang/miri |
|
r? @oli-obk (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ rollup |
|
📌 Commit a8bc3b3c353b479f8063f41bb620e3611a3e2fa3 has been approved by |
bors
added
S-waiting-on-bors
|
📌 Commit ae5c039c11ca544f331202d847fc55ab4a587a02 has been approved by |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 15, 2022
…askrgr Rollup of 5 pull requests Successful merges: - rust-lang#93899 (Describe VecDeque with more consistent names) - rust-lang#93949 (Add basic platform support to library/{panic_}unwind for m68k) - rust-lang#93999 (suggest using raw strings when invalid escapes appear in literals) - rust-lang#94001 (llvm: migrate to new parameter-bearing uwtable attr) - rust-lang#94014 (Move transmute_undefined_repr back to nursery) Failed merges: - rust-lang#94020 (Support pretty printing of invalid constants) r? `@ghost` `@rustbot` modify labels: rollup
RalfJung
reviewed
Feb 15, 2022
| discriminant(_2) = 0; // scope 0 at $DIR/invalid_constant.rs:16:7: 16:11 | ||
| - _3 = discriminant(_2); // scope 1 at $DIR/invalid_constant.rs:16:5: 16:12 | ||
| - switchInt(move _3) -> [0_isize: bb3, otherwise: bb2]; // scope 1 at $DIR/invalid_constant.rs:16:5: 16:12 | ||
| + _3 = const 0_isize; // scope 1 at $DIR/invalid_constant.rs:16:5: 16:12 |
There was a problem hiding this comment.
That's just the optimization changing the mir. This is a diff of a diff
RalfJung
reviewed
Feb 15, 2022
| bb2: { | ||
| - _4 = ((_2 as Some).0: std::option::Option<()>); // scope 1 at $DIR/invalid_constant.rs:16:5: 16:12 | ||
| - _1 = _4; // scope 2 at $DIR/invalid_constant.rs:16:5: 16:12 | ||
| + _4 = const ConstValue(Scalar(0x02): Option::<()>); // scope 1 at $DIR/invalid_constant.rs:16:5: 16:12 |
There was a problem hiding this comment.
const ConstValue seems somewhat redundant, if we always have that const prefix maybe we should make this just const Scalar(0x02): Option::<()>? Or maybe also somehow indicate that this value is invalid and a "fallback" printing was used?
There was a problem hiding this comment.
Dropped ConstValue part, matching the following fall back format instead of the preceding verbose one.
|
@bors r- the output could be adjusted a bit |
bors
added
S-waiting-on-author
Make it possible to pretty print invalid constants by introducing a fallible variant of `destructure_const` and falling back to debug formatting when it fails.
|
@bors r+ |
|
📌 Commit 92d20c4 has been approved by |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Feb 16, 2022
Support pretty printing of invalid constants Make it possible to pretty print invalid constants by introducing a fallible variant of `destructure_const` and falling back to debug formatting when it fails. Closes rust-lang#93688.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 16, 2022
…askrgr Rollup of 10 pull requests Successful merges: - rust-lang#92366 (Resolve concern of `derive_default_enum`) - rust-lang#93382 (Add a bit more padding in search box) - rust-lang#93962 (Make [u8]::cmp implementation branchless) - rust-lang#94015 (rustdoc --check option documentation) - rust-lang#94017 (Clarify confusing UB statement in MIR) - rust-lang#94020 (Support pretty printing of invalid constants) - rust-lang#94027 (Update browser UI test version) - rust-lang#94037 (Fix inconsistent symbol mangling with -Zverbose) - rust-lang#94045 (Update books) - rust-lang#94054 (:arrow_up: rust-analyzer) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
Make it possible to pretty print invalid constants by introducing a
fallible variant of
destructure_constand falling back to debugformatting when it fails.
Closes #93688.