Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-06-03 01:16:14 +03:00
Code Issues 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
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miri/fn_call.rs
+3 -2
View File
@@ -317,7 +317,8 @@ fn call_c_abi(
}
"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 @@ fn call_c_abi(
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 {