From 5f825ae895adbd2cfeff2fb0fc1a2e411bcac91a Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 27 Sep 2021 15:59:18 -0400 Subject: [PATCH] rustup --- rust-version | 2 +- src/shims/foreign_items.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rust-version b/rust-version index 26d88f5b07b5..65591aa7ebd9 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -4e880f8cbc191374ce7db335962489f41d6d4e3e +2b6ed3b675475abc01ce7e68bb75b457f0c85684 diff --git a/src/shims/foreign_items.rs b/src/shims/foreign_items.rs index 35c151b72f60..6dfdc316ac47 100644 --- a/src/shims/foreign_items.rs +++ b/src/shims/foreign_items.rs @@ -597,7 +597,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx this.yield_active_thread(); } "llvm.aarch64.isb" if this.tcx.sess.target.arch == "aarch64" => { - let &[ref arg] = this.check_shim(abi, Abi::C { unwind: false }, link_name, args)?; + let &[ref arg] = this.check_shim(abi, Abi::Unadjusted, link_name, args)?; let arg = this.read_scalar(arg)?.to_i32()?; match arg { 15 => { // SY ("full system scope")