Skip to content

fix ICE in ConstProp#98980

Merged
bors merged 4 commits into
rust-lang:masterfrom
RalfJung:const-prop-ice
Jul 9, 2022
Merged

fix ICE in ConstProp#98980
bors merged 4 commits into
rust-lang:masterfrom
RalfJung:const-prop-ice

Conversation

@RalfJung

@RalfJung RalfJung commented Jul 6, 2022

Copy link
Copy Markdown
Member

Fixes #96169

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 6, 2022
@rustbot

rustbot commented Jul 6, 2022

Copy link
Copy Markdown
Collaborator

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

@rust-highfive

rust-highfive commented Jul 6, 2022

Copy link
Copy Markdown
Contributor

r? @estebank

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 6, 2022
@RalfJung

RalfJung commented Jul 6, 2022

Copy link
Copy Markdown
Member Author

I'm going to perf this to make sure the track_caller are not biting us.
@bors try @rust-timer queue

@rust-timer

rust-timer commented Jul 6, 2022

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 6, 2022
@bors

bors commented Jul 6, 2022

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 6c85a0dcc44dcabbbe05460f81a8025c0b2dcae5 with merge 0063a509fa6760dc55a40e101c02c17c02d0d6e7...

@estebank

estebank commented Jul 6, 2022

Copy link
Copy Markdown
Contributor

Code changes look good to me, r=me gated on perf but maybe @oli-obk wants to take a quick look.

@bors

bors commented Jul 6, 2022

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 6, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung

RalfJung commented Jul 6, 2022

Copy link
Copy Markdown
Member Author

@rust-timer build 0063a509fa6760dc55a40e101c02c17c02d0d6e7

@rust-timer

rust-timer commented Jul 6, 2022

Copy link
Copy Markdown
Collaborator

Queued 0063a509fa6760dc55a40e101c02c17c02d0d6e7 with parent 0aef720, future comparison URL.

@RalfJung RalfJung added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 6, 2022
@Mark-Simulacrum

Mark-Simulacrum commented Jul 7, 2022

Copy link
Copy Markdown
Member

@bors try @rust-timer queue

@rust-timer

rust-timer commented Jul 7, 2022

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@bors

bors commented Jul 7, 2022

Copy link
Copy Markdown
Collaborator

⌛ Trying commit a73e255 with merge 3b94fd79ee8c548177b87b65d0d8250e94d37954...

@RalfJung

RalfJung commented Jul 7, 2022

Copy link
Copy Markdown
Member Author

Looks like somehow the try build failed. I thought test failures wouldn't be an issue, seemingly rustdoc failures are an issue.

@bors try @rust-timer queue

@rust-timer

rust-timer commented Jul 7, 2022

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@bors

bors commented Jul 7, 2022

Copy link
Copy Markdown
Collaborator

⌛ Trying commit a73e255 with merge 791f4e36908eeae3c638bdc7ebab4d92ee3effb1...

@RalfJung

RalfJung commented Jul 7, 2022

Copy link
Copy Markdown
Member Author

oops looks like we raced

bjorn3
bjorn3 reviewed Jul 7, 2022
View reviewed changes
Comment thread compiler/rustc_const_eval/src/interpret/machine.rs Outdated
@bors

bors commented Jul 7, 2022

Copy link
Copy Markdown
Collaborator

☀️ Try build successful - checks-actions
Build commit: 791f4e36908eeae3c638bdc7ebab4d92ee3effb1 (791f4e36908eeae3c638bdc7ebab4d92ee3effb1)

@rust-timer

rust-timer commented Jul 7, 2022

Copy link
Copy Markdown
Collaborator

Queued 791f4e36908eeae3c638bdc7ebab4d92ee3effb1 with parent c461f7a, future comparison URL.

@rust-timer

rust-timer commented Jul 8, 2022

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (791f4e36908eeae3c638bdc7ebab4d92ee3effb1): comparison url.

Instruction count

  • Primary benchmarks: 😿 relevant regressions found
  • Secondary benchmarks: 😿 relevant regressions found
mean1 max count2
Regressions 😿
(primary)		 0.8% 0.9% 6
Regressions 😿
(secondary)		 1.7% 2.4% 9
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 N/A N/A 0
All 😿🎉 (primary) 0.8% 0.9% 6

Max RSS (memory usage)

Results
  • Primary benchmarks: 😿 relevant regression found
  • Secondary benchmarks: no relevant changes found
mean1 max count2
Regressions 😿
(primary)		 4.3% 4.3% 1
Regressions 😿
(secondary)		 N/A N/A 0
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 N/A N/A 0
All 😿🎉 (primary) 4.3% 4.3% 1

Cycles

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 😿 relevant regressions found
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 3.4% 5.1% 8
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 N/A N/A 0
All 😿🎉 (primary) N/A N/A 0

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf +perf-regression

Footnotes

  1. the arithmetic mean of the percent change ↩ ↩2 ↩3

  2. number of relevant changes ↩ ↩2 ↩3

@rustbot rustbot added perf-regression Performance regression. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Jul 8, 2022
@RalfJung

RalfJung commented Jul 8, 2022

Copy link
Copy Markdown
Member Author

Wow, track_caller is really not cheap. I'll only add it for debug builds then.

@RalfJung

RalfJung commented Jul 8, 2022

Copy link
Copy Markdown
Member Author

@bors r=oli-obk

@bors

bors commented Jul 8, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit cf9186e has been approved by oli-obk

It is now in the queue for this repository.

@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 Jul 8, 2022
@RalfJung RalfJung removed the perf-regression Performance regression. label Jul 8, 2022
@RalfJung

RalfJung commented Jul 8, 2022

Copy link
Copy Markdown
Member Author

This should be fine to roll up now.
@bors rollup-

Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Jul 9, 2022
@Dylan-DPC
Rollup merge of rust-lang#98980 - RalfJung:const-prop-ice, r=oli-obk
fa8f6b6 
fix ICE in ConstProp

Fixes rust-lang#96169
This was referenced Jul 9, 2022
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 9, 2022
@bors
Auto merge of rust-lang#99078 - Dylan-DPC:rollup-gnw6cli, r=Dylan-DPC
c4693bc 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#98350 (Implement support for DWARF version 5.)
 - rust-lang#98915 (Clarify deriving code)
 - rust-lang#98980 (fix ICE in ConstProp)
 - rust-lang#99008 (Adding suggestion for E0530)
 - rust-lang#99043 (Collapse some weirdly-wrapping derives)
 - rust-lang#99048 (Remove a string comparison about types)
 - rust-lang#99070 (Update integer_atomics tracking issue)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a6c6166 into rust-lang:master Jul 9, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 9, 2022
@RalfJung RalfJung deleted the const-prop-ice branch July 9, 2022 13:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bjorn3 bjorn3 bjorn3 left review comments

@oli-obk oli-obk oli-obk approved these changes

Assignees

@estebank estebank

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.64.0

Development

Successfully merging this pull request may close these issues.

ICE: "Got a scalar pair where a scalar was expected" -Zmir-opt-level=4 --emit=mir

10 participants

@RalfJung @rustbot @rust-highfive @rust-timer @bors @estebank @rust-log-analyzer @Mark-Simulacrum @oli-obk @bjorn3