Auto merge of #86138 - FabianWolff:issue-85871, r=nikomatsakis
Check whether the closure's owner is an ADT in thir-unsafeck This pull request fixes #85871. The code in `rustc_mir_build/src/check_unsafety.rs` incorrectly assumes that a closure's owner always has a body, but only functions, closures, and constants have bodies, whereas a closure can also appear inside a struct or enum: ```rust struct S { arr: [(); match || 1 { _ => 42 }] } enum E { A([(); { || 1; 42 }]) } ``` This pull request fixes the resulting ICE by checking whether the closure's owner is an ADT and only deferring to `thir_check_unsafety(owner)` if it isn't.
This commit is contained in:
commit
f1e691da2e
2 changed files with 28 additions and 3 deletions
20
src/test/ui/thir-unsafeck-issue-85871.rs
Normal file
20
src/test/ui/thir-unsafeck-issue-85871.rs
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
// Tests that no ICE occurs when a closure appears inside a node
|
||||
// that does not have a body when compiling with
|
||||
// compile-flags: -Zthir-unsafeck=yes
|
||||
// check-pass
|
||||
|
||||
#![allow(dead_code)]
|
||||
|
||||
struct Bug {
|
||||
inner: [(); match || 1 {
|
||||
_n => 42, // we may not call the closure here (E0015)
|
||||
}],
|
||||
}
|
||||
|
||||
enum E {
|
||||
V([(); { let _ = || 1; 42 }]),
|
||||
}
|
||||
|
||||
type Ty = [(); { let _ = || 1; 42 }];
|
||||
|
||||
fn main() {}
|
||||
Loading…
Add table
Add a link
Reference in a new issue