use std::cell::RefCell;
use std::cmp::max;
-use std::collections::{hash_map::Entry, HashMap};
+use std::collections::hash_map::Entry;
+use log::trace;
use rand::Rng;
-use rustc::ty::layout::HasDataLayout;
-use rustc_mir::interpret::{AllocCheck, AllocId, InterpResult, Memory, Machine, Pointer, PointerArithmetic};
-use rustc_target::abi::Size;
+use rustc_data_structures::fx::FxHashMap;
+use rustc_target::abi::{Size, HasDataLayout};
-use crate::{Evaluator, Tag, STACK_ADDR};
+use crate::*;
pub type MemoryExtra = RefCell<GlobalState>;
/// `AllocExtra` because function pointers also have a base address, and
/// they do not have an `AllocExtra`.
/// This is the inverse of `int_to_ptr_map`.
- pub base_addr: HashMap<AllocId, u64>,
+ pub base_addr: FxHashMap<AllocId, u64>,
/// This is used as a memory address when a new pointer is casted to an integer. It
/// is always larger than any address that was previously made part of a block.
pub next_base_addr: u64,
fn default() -> Self {
GlobalState {
int_to_ptr_map: Vec::default(),
- base_addr: HashMap::default(),
+ base_addr: FxHashMap::default(),
next_base_addr: STACK_ADDR,
}
}
impl<'mir, 'tcx> GlobalState {
pub fn int_to_ptr(
int: u64,
- memory: &Memory<'mir, 'tcx, Evaluator<'tcx>>,
+ memory: &Memory<'mir, 'tcx, Evaluator<'mir, 'tcx>>,
) -> InterpResult<'tcx, Pointer<Tag>> {
- if int == 0 {
- throw_unsup!(InvalidNullPointerUsage);
- }
-
let global_state = memory.extra.intptrcast.borrow();
let pos = global_state.int_to_ptr_map.binary_search_by_key(&int, |(addr, _)| *addr);
+ // The int must be in-bounds after being cast to a pointer, so we error
+ // with `CheckInAllocMsg::InboundsTest`.
Ok(match pos {
Ok(pos) => {
let (_, alloc_id) = global_state.int_to_ptr_map[pos];
// zero. The pointer is untagged because it was created from a cast
Pointer::new_with_tag(alloc_id, Size::from_bytes(0), Tag::Untagged)
}
- Err(0) => throw_unsup!(DanglingPointerDeref),
+ Err(0) => throw_ub!(DanglingIntPointer(int, CheckInAllocMsg::InboundsTest)),
Err(pos) => {
// This is the largest of the adresses smaller than `int`,
// i.e. the greatest lower bound (glb)
// This pointer is untagged because it was created from a cast
Pointer::new_with_tag(alloc_id, Size::from_bytes(offset), Tag::Untagged)
} else {
- throw_unsup!(DanglingPointerDeref)
+ throw_ub!(DanglingIntPointer(int, CheckInAllocMsg::InboundsTest))
}
}
})
pub fn ptr_to_int(
ptr: Pointer<Tag>,
- memory: &Memory<'mir, 'tcx, Evaluator<'tcx>>,
+ memory: &Memory<'mir, 'tcx, Evaluator<'mir, 'tcx>>,
) -> InterpResult<'tcx, u64> {
let mut global_state = memory.extra.intptrcast.borrow_mut();
let global_state = &mut *global_state;
- let id = Evaluator::canonical_alloc_id(memory, ptr.alloc_id);
+ let id = ptr.alloc_id;
// There is nothing wrong with a raw pointer being cast to an integer only after
// it became dangling. Hence `MaybeDead`.