From 3d01ba11c0741a76a562c4b49246deea090d7c03 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 18 Jan 2021 12:55:30 +0100 Subject: [PATCH] rustup; remove some intrinsics that are gone or moved to rustc --- rust-version | 2 +- src/shims/intrinsics.rs | 33 --------------------------------- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/rust-version b/rust-version index 0ff7406c56..6da6e70019 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -4e208f6a3afb42528878b0f3464e337c4bf3bbc8 +0677d9729318441a1cdb0c74812ec4140fa4d35f diff --git a/src/shims/intrinsics.rs b/src/shims/intrinsics.rs index 47a642564e..840dd9f143 100644 --- a/src/shims/intrinsics.rs +++ b/src/shims/intrinsics.rs @@ -51,39 +51,6 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx } // Raw memory accesses - #[rustfmt::skip] - | "copy" - | "copy_nonoverlapping" - => { - let &[src, dest, count] = check_arg_count(args)?; - let elem_ty = instance.substs.type_at(0); - let elem_layout = this.layout_of(elem_ty)?; - let count = this.read_scalar(count)?.to_machine_usize(this)?; - let elem_align = elem_layout.align.abi; - - let size = elem_layout.size.checked_mul(count, this) - .ok_or_else(|| err_ub_format!("overflow computing total size of `{}`", intrinsic_name))?; - let src = this.read_scalar(src)?.check_init()?; - let src = this.memory.check_ptr_access(src, size, elem_align)?; - let dest = this.read_scalar(dest)?.check_init()?; - let dest = this.memory.check_ptr_access(dest, size, elem_align)?; - - if let (Some(src), Some(dest)) = (src, dest) { - this.memory.copy( - src, - dest, - size, - intrinsic_name.ends_with("_nonoverlapping"), - )?; - } - } - - "move_val_init" => { - let &[place, dest] = check_arg_count(args)?; - let place = this.deref_operand(place)?; - this.copy_op(dest, place.into())?; - } - "volatile_load" => { let &[place] = check_arg_count(args)?; let place = this.deref_operand(place)?;