mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

c_int != usize

Browse Source
This commit is contained in:
Oliver Schneider 2017-08-08 17:02:01 +02:00
parent 9e787fbd82
commit bba753deac
No known key found for this signature in database
GPG Key ID: A69F8D225B3AD7D9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
miri/fn_call.rs
View File

@ -317,7 +317,8 @@ impl<'a, 'tcx> EvalContextExt<'tcx> for EvalContext<'a, 'tcx, super::Evaluator>
}
"sysconf" => {
let name = self.value_to_primval(args[0], usize)?.to_u64()?;
let c_int = self.operand_ty(&arg_operands[0]);
let name = self.value_to_primval(args[0], c_int)?.to_u64()?;
trace!("sysconf() called with name {}", name);
// cache the sysconf integers via miri's global cache
let paths = &[
@ -330,7 +331,7 @@ impl<'a, 'tcx> EvalContextExt<'tcx> for EvalContext<'a, 'tcx, super::Evaluator>
let cid = GlobalId { instance, promoted: None };
// compute global if not cached
let val = match self.globals.get(&cid).cloned() {
Some(ptr) => self.value_to_primval(Value::ByRef(ptr), usize)?.to_u64()?,
Some(ptr) => self.value_to_primval(Value::ByRef(ptr), c_int)?.to_u64()?,
None => eval_body_as_primval(self.tcx, instance)?.0.to_u64()?,
};
if val == name {