Auto merge of #1894 - RalfJung:miri, r=RalfJung

bors · bors · commit 7decf8c72026 · 2021-09-27T20:00:54.000Z
rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-4e880f8cbc191374ce7db335962489f41d6d4e3e
+2b6ed3b675475abc01ce7e68bb75b457f0c85684
diff --git 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")

Original file line number	Diff line number	Diff line change
`@@ -597,7 +597,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx`
`597`	`597`	`this.yield_active_thread();`
`598`	`598`	`}`
`599`	`599`	`"llvm.aarch64.isb" if this.tcx.sess.target.arch == "aarch64" => {`
`600`		`- let &[ref arg] = this.check_shim(abi, Abi::C { unwind: false }, link_name, args)?;`
	`600`	`+ let &[ref arg] = this.check_shim(abi, Abi::Unadjusted, link_name, args)?;`
`601`	`601`	`let arg = this.read_scalar(arg)?.to_i32()?;`
`602`	`602`	`match arg {`
`603`	`603`	`15 => { // SY ("full system scope")`