Print normalized ty #116374

ouz-a · 2023-10-03T08:20:20Z

Inside mir_assign_valid_types we are comparing normalized type of mir_place but in debug message we are not printing the normalized value, this changes that.

rustbot · 2023-10-03T08:20:28Z

r? @oli-obk

(rustbot has picked a reviewer for you, use r? to override)

rustbot · 2023-10-03T08:20:32Z

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

RalfJung · 2023-10-03T08:51:03Z

compiler/rustc_const_eval/src/interpret/operand.rs

+            ) {
+                span_bug!(
+                    self.cur_span(),
+                    "eval_place of a MIR place with type {:?} produced an interpreter operand with type {}",


Suggested change

"eval_place of a MIR place with type {:?} produced an interpreter operand with type {}",

"eval_place of a MIR place with type {} produced an interpreter operand with type {}",

let's switch to prettier type rendering while we are at it

This comment is still open (and now also applies in place.rs)

Oh you switched to :? for both types. No that's wrong, the debug view for types is super verbose. We want something readable here.

oh sorry I mixed them up 😅 meant to do pretty printing

compiler/rustc_const_eval/src/interpret/operand.rs

RalfJung · 2023-10-03T08:53:21Z

r? @RalfJung

RalfJung · 2023-10-03T09:35:27Z

LGTM, thanks!
@bors r+ rollup

bors · 2023-10-03T09:35:29Z

📌 Commit 42c39b3 has been approved by RalfJung

It is now in the queue for this repository.

…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#115863 (Add check_unused_messages in tidy) - rust-lang#116210 (Ensure that `~const` trait bounds on associated functions are in const traits or impls) - rust-lang#116358 (Rename both of the `Match` relations) - rust-lang#116371 (Remove unused features from `rustc_llvm`.) - rust-lang#116374 (Print normalized ty) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#116374 - ouz-a:correct_message, r=RalfJung Print normalized ty Inside `mir_assign_valid_types` we are comparing normalized type of `mir_place` but in debug message we are not printing the normalized value, this changes that.

rustbot assigned oli-obk Oct 3, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 3, 2023

RalfJung reviewed Oct 3, 2023

View reviewed changes

compiler/rustc_const_eval/src/interpret/operand.rs Show resolved Hide resolved

rustbot assigned RalfJung and unassigned oli-obk Oct 3, 2023

ouz-a force-pushed the correct_message branch from a8027c8 to 56edfaf Compare October 3, 2023 09:00

print normalized ty

42c39b3

ouz-a force-pushed the correct_message branch from 56edfaf to 42c39b3 Compare October 3, 2023 09:17

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 3, 2023

matthiaskrgr mentioned this pull request Oct 3, 2023

Rollup of 5 pull requests #116376

Merged

bors merged commit 7ba6498 into rust-lang:master Oct 3, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 3, 2023

pvdrz mentioned this pull request Oct 4, 2023

Fix divergence from upstream master ferrocene/ferrocene#23

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Print normalized ty #116374

Print normalized ty #116374

ouz-a commented Oct 3, 2023

rustbot commented Oct 3, 2023

rustbot commented Oct 3, 2023

RalfJung Oct 3, 2023

RalfJung Oct 3, 2023

RalfJung Oct 3, 2023

ouz-a Oct 3, 2023

RalfJung commented Oct 3, 2023

RalfJung commented Oct 3, 2023

bors commented Oct 3, 2023

	"eval_place of a MIR place with type {:?} produced an interpreter operand with type {}",
	"eval_place of a MIR place with type {} produced an interpreter operand with type {}",

Print normalized ty #116374

Print normalized ty #116374

Conversation

ouz-a commented Oct 3, 2023

rustbot commented Oct 3, 2023

rustbot commented Oct 3, 2023

RalfJung Oct 3, 2023

Choose a reason for hiding this comment

RalfJung Oct 3, 2023

Choose a reason for hiding this comment

RalfJung Oct 3, 2023

Choose a reason for hiding this comment

ouz-a Oct 3, 2023

Choose a reason for hiding this comment

RalfJung commented Oct 3, 2023

RalfJung commented Oct 3, 2023

bors commented Oct 3, 2023