diff options
| author | bors <bors@rust-lang.org> | 2024-09-24 14:52:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-24 14:52:06 +0000 |
| commit | 67bb749c2e1cf503fee64842963dd3e72a417a3f (patch) | |
| tree | 933f2a5bc70444e64791bcbb082cf45eb25f253a /compiler/rustc_attr/src/builtin.rs | |
| parent | 4cbfcf1b7f16245176488e581f57b39a7e32bc31 (diff) | |
| parent | ad7eb48ca9a3257e2ed10f5e9cf63cadbd34bc4f (diff) | |
| download | rust-67bb749c2e1cf503fee64842963dd3e72a417a3f.tar.gz rust-67bb749c2e1cf503fee64842963dd3e72a417a3f.zip | |
Auto merge of #130775 - jieyouxu:revert-129047, r=nagisa
Revert "Apply EarlyOtherwiseBranch to scalar value #129047"
This reverts PR #129047, commit a772336fb3fbd1fe4493077fcfe04e0221296a99, reversing changes made to 702987f75b74f789ba227ee04a3d7bb1680c2309.
cc `@DianQK` and `@cjgillot` as the PR author and reviewer of #129047 respectively.
It seems [Apply EarlyOtherwiseBranch to scalar value #129047](https://github.com/rust-lang/rust/pull/129047) may have lead to several nightly regressions:
- https://github.com/rust-lang/rust/issues/130769
- https://github.com/rust-lang/rust/issues/130774
- https://github.com/rust-lang/rust/issues/130771
Example test that would ICE with changes in #129047 (this test is included in this PR):
```rs
//@ compile-flags: -C opt-level=3
//@ check-pass
use std::task::Poll;
pub fn poll(val: Poll<Result<Option<Vec<u8>>, u8>>) {
match val {
Poll::Ready(Ok(Some(_trailers))) => {}
Poll::Ready(Err(_err)) => {}
Poll::Ready(Ok(None)) => {}
Poll::Pending => {}
}
}
```
Since this is a mir-opt ICE that seems to quite easy to trigger with real-world crates being affected, let's revert for now and reland the mir-opt after these are fixed.
Diffstat (limited to 'compiler/rustc_attr/src/builtin.rs')
0 files changed, 0 insertions, 0 deletions