-
Notifications
You must be signed in to change notification settings - Fork 13.3k
Revert #119627 "Remove all ConstPropNonsense" #120347
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.
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
Conversation
(rustbot has picked a reviewer for you, use r? to override) |
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt Some changes occurred to the CTFE / Miri engine cc @rust-lang/miri Some changes occurred to the CTFE / Miri engine cc @rust-lang/miri Some changes occurred in src/tools/clippy cc @rust-lang/clippy |
It would be nice to also add a test to make sure this does not regress again :) |
Can do! |
I'd prefer to just add a line to avoid this ICE instead of reverting the entire PR. I can do that tomorrow. If you want to do it now, it should be as simple as getting a backtrace and checking the call site to the entry point to the interpreter. I did a similar thing here: https://github.com/rust-lang/rust/pull/119627/files#r1452800719 |
I can put up that PR @oli-obk |
Less invasive fix in #120350 |
Sorry got pulled away by meetings. @compiler-errors let's land your change. I'm closing this PR for now, I can reopen if we need. |
Reopening since it looks like the other PR hit a snag. I'll add the regression tests requested. |
r? oli-obk I assume that you'll have the same difficulty in creating a faithful regression test as #120350 does? In any case, I want to leave this up to oli to decide whether to do a full revert. |
Could you please put the title of the reverted PR into the title of this one? Just "revert <number>" is not a very helpful summary.
|
This reverts commit 68411c9, reversing changes made to 7ffc697. This commit was checked in as PR rust-lang#119627.
33c816b
to
8b2cc26
Compare
Updated the PR and commit title. The previous title was the default generated by As @compiler-errors suggested, I'm going to leave this as a clean revert due to the difficulty of adding a regression test. If we had that figured out then we would just check in the fix PR. I'll leave it up to the reviewer whether a revert is sufficient. @rustbot ready |
Please change this to only revert 1f398ab (as per the discussion in the other PR, we'll follow up with just removing the assertion) r=me with that |
Ah #120367 removes the assertion, let's go with that |
This reverts commit 68411c9, reversing changes made to 7ffc697.
Original PR: #119627
Fixes: #120337
cc @oli-obk, @matthiaskrgr (maybe you want to review this?)