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

Fix bad printing of const-eval queries #75710

Merged
merged 2 commits into from
Aug 20, 2020
Merged

Fix bad printing of const-eval queries #75710

merged 2 commits into from
Aug 20, 2020

Conversation

ThibsG
Copy link
Contributor

@ThibsG ThibsG commented Aug 19, 2020

Fixes: #75447

r? @RalfJung

cc @oli-obk

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 19, 2020
@RalfJung
Copy link
Member

r? @oli-obk

@rust-highfive rust-highfive assigned oli-obk and unassigned RalfJung Aug 19, 2020
RalfJung
RalfJung reviewed Aug 19, 2020
View reviewed changes
src/test/ui/consts/const-eval/const-eval-query-stack.stderr
#3 [normalize_generic_arg_after_erasing_regions] normalizing `main::promoted[1]`
#4 [optimized_mir] optimizing MIR for `main`
#5 [collect_and_partition_mono_items] collect_and_partition_mono_items
end of query stack
Copy link
Member

Choose a reason for hiding this comment

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

Nice job on this testcase. :)

src/librustc_middle/mir/interpret/mod.rs Show resolved Hide resolved
@oli-obk
Copy link
Contributor

oli-obk commented Aug 20, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 20, 2020

📌 Commit ccb0493 has been approved by oli-obk

@bors 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 Aug 20, 2020
@oli-obk
Copy link
Contributor

oli-obk commented Aug 20, 2020

@bors r- CI is failing

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 20, 2020
@oli-obk
Copy link
Contributor

oli-obk commented Aug 20, 2020 

 diff of stderr:

8	   |
9	   = note: `#[deny(const_err)]` on by default
10	
-	query stack during panic:
-	#0 [const_eval_raw] const-evaluating `main::promoted[1]`
-	#1 [const_eval_validated] const-evaluating + checking `main::promoted[1]`
-	#2 [const_eval_validated] const-evaluating + checking `main::promoted[1]`
-	#3 [normalize_generic_arg_after_erasing_regions] normalizing `main::promoted[1]`
-	#4 [optimized_mir] optimizing MIR for `main`
-	#5 [collect_and_partition_mono_items] collect_and_partition_mono_items
-	end of query stack
+	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

you need to set the RUST_BACKTRACE env var for this test.

@oli-obk
Copy link
Contributor

oli-obk commented Aug 20, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 20, 2020

📌 Commit 9f57ea5506bf5df97150b72fc839c97a42801a79 has been approved by oli-obk

@bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 20, 2020
@RalfJung
Copy link
Member

CI is still failing.
@bors r-

---- [ui] ui/consts/const-eval/const-eval-query-stack.rs stdout ----
diff of stderr:

8	   |
9	   = note: `#[deny(const_err)]` on by default
10	
-	query stack during panic:
-	#0 [const_eval_raw] const-evaluating `main::promoted[1]`
-	#1 [const_eval_validated] const-evaluating + checking `main::promoted[1]`
-	#2 [const_eval_validated] const-evaluating + checking `main::promoted[1]`
-	#3 [normalize_generic_arg_after_erasing_regions] normalizing `main::promoted[1]`
-	#4 [optimized_mir] optimizing MIR for `main`
-	#5 [collect_and_partition_mono_items] collect_and_partition_mono_items
-	end of query stack
+	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
19

Are you sure that env var applies when compiling the program? "exec" makes it sound like it is about running the program.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 20, 2020
@ThibsG
Copy link
Contributor Author

ThibsG commented Aug 20, 2020

Are you sure that env var applies when compiling the program? "exec" makes it sound like it is about running the program.

Using rustc-env instead may fix this.

@oli-obk
Copy link
Contributor

oli-obk commented Aug 20, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 20, 2020

📌 Commit bd71675 has been approved by oli-obk

@bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 20, 2020
@cuviper cuviper mentioned this pull request Aug 20, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 20, 2020
@bors
Auto merge of rust-lang#75747 - cuviper:rollup-icke90l, r=cuviper
3323691 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#75672 (Move to intra-doc links for task.rs and vec.rs)
 - rust-lang#75702 (Clean up E0759 explanation)
 - rust-lang#75703 (Enable stack-overflow detection on musl for non-main threads)
 - rust-lang#75710 (Fix bad printing of const-eval queries)
 - rust-lang#75716 (Upgrade Emscripten on CI to 1.39.20 )
 - rust-lang#75731 (Suppress ty::Float in MIR comments of ty::Const)
 - rust-lang#75733 (Remove duplicated alloc vec bench push_all_move)
 - rust-lang#75743 (Rename rustc_lexer::TokenKind::Not to Bang)

Failed merges:

r? @ghost
@bors bors merged commit 6a3425e into rust-lang:master Aug 20, 2020
@ThibsG ThibsG deleted the FixBadPrinting75447 branch August 21, 2020 05:58
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RalfJung RalfJung RalfJung left review comments

@oli-obk oli-obk oli-obk left review comments

Assignees

@oli-obk oli-obk

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.47.0
Development

Successfully merging this pull request may close these issues.

Bad printing of const-eval queries
6 participants
@ThibsG @RalfJung @oli-obk @bors @cuviper @rust-highfive