From 49fb43f293fa933871f52be7189905adbe9ff53c Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Tue, 6 Jun 2017 10:29:53 -0400 Subject: [PATCH] use type_align() and type_size() instaed of size_and_align_of_dst() --- src/terminator/intrinsic.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/terminator/intrinsic.rs b/src/terminator/intrinsic.rs index 193b7c3cde1..696381b1c0c 100644 --- a/src/terminator/intrinsic.rs +++ b/src/terminator/intrinsic.rs @@ -385,8 +385,9 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> { "transmute" => { let src_ty = substs.type_at(0); let dest_ty = substs.type_at(1); - let (_, src_align) = self.size_and_align_of_dst(src_ty, arg_vals[0])?; - let (size, dest_align) = self.size_and_align_of_dst(dest_ty, arg_vals[0])?; + let src_align = self.type_align(src_ty)?; + let dest_align = self.type_align(dest_ty)?; + let size = self.type_size(dest_ty)?.expect("transmute() type must be sized"); if dest_align < src_align { let ptr = self.force_allocation(dest)?.to_ptr(); self.memory.mark_packed(ptr, size);