mirror of
https://github.com/rust-lang/rust.git
synced 2024-10-30 22:12:15 +00:00
fix ice in fn call const evaluation
This commit is contained in:
parent
3330f54198
commit
b9eaceebb2
@ -1032,8 +1032,6 @@ pub fn eval_const_expr_partial<'tcx>(tcx: &ty::ctxt<'tcx>,
|
||||
};
|
||||
let (
|
||||
decl,
|
||||
unsafety,
|
||||
abi,
|
||||
block,
|
||||
constness,
|
||||
) = match try!(eval_const_expr_partial(tcx, callee, sub_ty_hint, fn_args)) {
|
||||
@ -1042,12 +1040,12 @@ pub fn eval_const_expr_partial<'tcx>(tcx: &ty::ctxt<'tcx>,
|
||||
Some(ast_map::NodeItem(it)) => match it.node {
|
||||
hir::ItemFn(
|
||||
ref decl,
|
||||
unsafety,
|
||||
hir::Unsafety::Normal,
|
||||
constness,
|
||||
abi,
|
||||
abi::Abi::Rust,
|
||||
_, // ducktype generics? types are funky in const_eval
|
||||
ref block,
|
||||
) => (decl, unsafety, abi, block, constness),
|
||||
) => (decl, block, constness),
|
||||
_ => signal!(e, NonConstPath),
|
||||
},
|
||||
_ => signal!(e, NonConstPath),
|
||||
@ -1057,18 +1055,19 @@ pub fn eval_const_expr_partial<'tcx>(tcx: &ty::ctxt<'tcx>,
|
||||
},
|
||||
_ => signal!(e, NonConstPath),
|
||||
};
|
||||
if let ExprTypeChecked = ty_hint {
|
||||
// no need to check for constness... either check_const
|
||||
// already forbids this or we const eval over whatever
|
||||
// we want
|
||||
} else {
|
||||
// we don't know much about the function, so we force it to be a const fn
|
||||
// so compilation will fail later in case the const fn's body is not const
|
||||
assert_eq!(constness, hir::Constness::Const)
|
||||
match (ty_hint, constness) {
|
||||
(ExprTypeChecked, _) => {
|
||||
// no need to check for constness... either check_const
|
||||
// already forbids this or we const eval over whatever
|
||||
// we want
|
||||
},
|
||||
(_, hir::Constness::Const) => {
|
||||
// we don't know much about the function, so we force it to be a const fn
|
||||
// so compilation will fail later in case the const fn's body is not const
|
||||
},
|
||||
_ => signal!(e, NonConstPath),
|
||||
}
|
||||
assert_eq!(decl.inputs.len(), args.len());
|
||||
assert_eq!(unsafety, hir::Unsafety::Normal);
|
||||
assert_eq!(abi, abi::Abi::Rust);
|
||||
|
||||
let mut call_args = NodeMap();
|
||||
for (arg, arg_expr) in decl.inputs.iter().zip(args.iter()) {
|
||||
|
24
src/test/compile-fail/const-call.rs
Normal file
24
src/test/compile-fail/const-call.rs
Normal file
@ -0,0 +1,24 @@
|
||||
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
#![feature(const_fn)]
|
||||
|
||||
const unsafe fn g(x: usize) -> usize {
|
||||
x
|
||||
}
|
||||
|
||||
fn f(x: usize) -> usize {
|
||||
x
|
||||
}
|
||||
|
||||
fn main() {
|
||||
let _ = [0; f(2)]; //~ ERROR: non-constant path in constant expression [E0307]
|
||||
let _ = [0; g(2)]; //~ ERROR: non-constant path in constant expression [E0307]
|
||||
}
|
Loading…
Reference in New Issue
Block a user