bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Handle statics.

Browse source
This commit is contained in:
Scott Olson 2016-05-09 20:03:13 -06:00
parent b859444562
commit ddfbb655e1
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/interpreter.rs
View file

@ -846,6 +846,8 @@ impl<'a, 'b, 'mir, 'tcx> FnEvalContext<'a, 'b, 'mir, 'tcx> {
Value { ref value } => Ok(self.const_to_ptr(value)?),
Item { .. } => unimplemented!(),
Promoted { index } => {
// TODO(tsion): Mark constants and statics as read-only and cache their
// values.
let current_mir = self.mir();
let mir = &current_mir.promoted[index];
self.call_nested(mir).map(Option::unwrap)
@ -864,7 +866,11 @@ impl<'a, 'b, 'mir, 'tcx> FnEvalContext<'a, 'b, 'mir, 'tcx> {
Var(i) => self.frame().locals[self.frame().var_offset + i as usize],
Temp(i) => self.frame().locals[self.frame().temp_offset + i as usize],
Static(_def_id) => unimplemented!(),
Static(def_id) => {
// TODO(tsion): Mark constants and statics as read-only and cache their values.
let mir = self.load_mir(def_id);
self.call_nested(&mir)?.unwrap()
}
Projection(ref proj) => {
let base = self.eval_lvalue(&proj.base)?;