bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Don't call tcx.fn_sig on closures

Browse source 
Fixes #68542
This commit is contained in:
Aaron Hill 2020-01-27 00:49:56 -05:00
parent c3681d62ee
commit 9ad1a8c97f
No known key found for this signature in database
GPG key ID: B4087E510E98B164
3 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_mir/const_eval/fn_queries.rs
View file

@ -86,6 +86,10 @@ pub fn provide(providers: &mut Providers<'_>) {
/// Const evaluability whitelist is here to check evaluability at the
/// top level beforehand.
fn is_const_intrinsic(tcx: TyCtxt<'_>, def_id: DefId) -> Option<bool> {
if tcx.is_closure(def_id) {
return None;
}
match tcx.fn_sig(def_id).abi() {
Abi::RustIntrinsic | Abi::PlatformIntrinsic => {
Some(tcx.lookup_const_stability(def_id).is_some())

10
src/test/ui/consts/issue-68542-closure-in-array-len.rs Normal file
View file

@ -0,0 +1,10 @@
// Regression test for issue #68542
// Tests that we don't ICE when a closure appears
// in the length part of an array.
struct Bug {
a: [(); (|| { 0 })()] //~ ERROR calls in constants are limited to
//~^ ERROR evaluation of constant value failed
}
fn main() {}

16
src/test/ui/consts/issue-68542-closure-in-array-len.stderr Normal file
View file

@ -0,0 +1,16 @@
error[E0015]: calls in constants are limited to constant functions, tuple structs and tuple variants
--> $DIR/issue-68542-closure-in-array-len.rs:6:13
|
LL | a: [(); (|| { 0 })()]
| ^^^^^^^^^^^^
error[E0080]: evaluation of constant value failed
--> $DIR/issue-68542-closure-in-array-len.rs:6:13
|
LL | a: [(); (|| { 0 })()]
| ^^^^^^^^^^^^ calling non-const function `Bug::a::{{constant}}#0::{{closure}}#0`
error: aborting due to 2 previous errors
Some errors have detailed explanations: E0015, E0080.
For more information about an error, try `rustc --explain E0015`.