mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use DefId's in const eval for cross-crate const fn's

Browse source
This commit is contained in:
Tim Neumann 2016-11-03 11:51:11 +01:00
parent ac919fcd9d
commit dc138b3156
3 changed files with 41 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/librustc_const_eval/eval.rs
View file

@ -27,7 +27,7 @@ use rustc::ty::util::IntTypeExt;
use rustc::ty::subst::Substs;
use rustc::traits::Reveal;
use rustc::util::common::ErrorReported;
use rustc::util::nodemap::NodeMap;
use rustc::util::nodemap::DefIdMap;
use rustc::lint;
use graphviz::IntoCow;
@ -413,7 +413,7 @@ pub fn eval_const_expr_checked<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
eval_const_expr_partial(tcx, e, ExprTypeChecked, None)
}
pub type FnArgMap<'a> = Option<&'a NodeMap<ConstVal>>;
pub type FnArgMap<'a> = Option<&'a DefIdMap<ConstVal>>;
#[derive(Clone, Debug)]
pub struct ConstEvalErr {
@ -835,9 +835,8 @@ pub fn eval_const_expr_partial<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
ConstVal::Struct(e.id)
}
Def::Local(def_id) => {
let id = tcx.map.as_local_node_id(def_id).unwrap();
debug!("Def::Local({:?}): {:?}", id, fn_args);
if let Some(val) = fn_args.and_then(|args| args.get(&id)) {
debug!("Def::Local({:?}): {:?}", def_id, fn_args);
if let Some(val) = fn_args.and_then(|args| args.get(&def_id)) {
val.clone()
} else {
signal!(e, NonConstPath);
@ -863,7 +862,7 @@ pub fn eval_const_expr_partial<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
let result = result.as_ref().expect("const fn has no result expression");
assert_eq!(decl.inputs.len(), args.len());
let mut call_args = NodeMap();
let mut call_args = DefIdMap();
for (arg, arg_expr) in decl.inputs.iter().zip(args.iter()) {
let arg_hint = ty_hint.erase_hint();
let arg_val = eval_const_expr_partial(
@ -873,7 +872,7 @@ pub fn eval_const_expr_partial<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
fn_args
)?;
debug!("const call arg: {:?}", arg);
let old = call_args.insert(arg.pat.id, arg_val);
let old = call_args.insert(tcx.expect_def(arg.pat.id).def_id(), arg_val);
assert!(old.is_none());
}
debug!("const call({:?})", call_args);

18
src/test/run-pass/auxiliary/issue-36954.rs Normal file
View file

@ -0,0 +1,18 @@
// Copyright 2016 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)]
#![crate_type = "lib"]
const fn foo(i: i32) -> i32 {
i
}
pub const FOO: i32 = foo(1);

17
src/test/run-pass/issue-36954.rs Normal file
View file

@ -0,0 +1,17 @@
// Copyright 2016 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.
// aux-build:issue-36954.rs
extern crate issue_36954 as lib;
fn main() {
let _ = lib::FOO;
}