From: Mark Thom Date: Thu, 25 Apr 2024 03:21:25 +0000 (-0600) Subject: fix wasm tests in unsafe_improvements branch X-Git-Tag: v0.10.0~135^2~2 X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=be23c74b17481a5f19c3564e67dcea1b8da0ae79;p=scryer-prolog.git fix wasm tests in unsafe_improvements branch --- diff --git a/src/arena.rs b/src/arena.rs index d24acfe9..bd4d294c 100644 --- a/src/arena.rs +++ b/src/arena.rs @@ -595,7 +595,7 @@ impl ArenaAllocated for IndexPtr { #[inline] fn ptr_to_allocated(slab: &mut AllocSlab) -> Self::PtrToAllocated { - TypedArenaPtr::new(unsafe { mem::transmute(slab.header) }) + TypedArenaPtr::new(ptr::addr_of_mut!(slab.header) as *mut _) } #[inline] @@ -608,7 +608,7 @@ impl ArenaAllocated for IndexPtr { let mut slab = Box::new(AllocSlab { next: arena.base.take(), #[cfg(target_pointer_width = "32")] - padding: 0, + _padding: 0, header: unsafe { mem::transmute(value) }, }); @@ -666,7 +666,7 @@ unsafe fn drop_slab_in_place(value: &mut AllocSlab) { macro_rules! drop_typed_slab_in_place { ($payload: ty, $value: expr) => { let slab: &mut TypedAllocSlab<$payload> = mem::transmute($value); - ptr::drop_in_place(ptr::addr_of_mut!(slab.payload)); + ptr::drop_in_place(&mut slab.payload); }; }