nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-21 11:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement cross-crate fn calls by loading Mir from crate metadata.

Browse Source
This commit is contained in:
Scott Olson 2015-12-17 14:03:01 -06:00
parent 97a68ad0f9
commit df96c61591
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/interpreter.rs
View File

@ -1,4 +1,5 @@
use rustc::middle::{const_eval, def_id, ty};
use rustc::middle::cstore::CrateStore;
use rustc::mir::repr::{self as mir, Mir};
use rustc_mir::mir_map::MirMap;
use syntax::ast::Attribute;
@ -168,8 +169,16 @@ impl<'a, 'tcx> Interpreter<'a, 'tcx> {
let func_val = self.eval_operand(func);
if let Value::Func(def_id) = func_val {
let node_id = self.tcx.map.as_local_node_id(def_id).unwrap();
let mir = &self.mir_map[&node_id];
let mir_data;
let mir = match self.tcx.map.as_local_node_id(def_id) {
Some(node_id) => self.mir_map.get(&node_id).unwrap(),
None => {
let cstore = &self.tcx.sess.cstore;
mir_data = cstore.maybe_get_item_mir(self.tcx, def_id).unwrap();
&mir_data
}
};
let arg_vals: Vec<Value> =
args.iter().map(|arg| self.eval_operand(arg)).collect();

6
test/basic.rs
View File

@ -130,4 +130,10 @@ fn match_opt_some() -> i32 {
// }
// }
/// Test calling a very simple function from the standard library.
#[miri_run(expected = "Int(1)")]
fn cross_crate_fn_call() -> i32 {
if 1i32.is_positive() { 1 } else { 0 }
}
fn main() {}