Auto merge of #1872 - RalfJung:rustup, r=RalfJung

rustup
This commit is contained in:
bors 2021-08-16 15:35:14 +00:00
commit 19691b2de8
3 changed files with 5 additions and 5 deletions

View File

@ -1 +1 @@
fa2692990c05652c7823c8d2afae501a00a69050
73d96b090bb68065cd3a469b27cbd568e39bf0e7

View File

@ -1,4 +1,4 @@
#![feature(llvm_asm)]
#![feature(asm)]
use std::env;
@ -7,9 +7,9 @@ compile_error!("`miri` cfg should not be set in build script");
fn not_in_miri() -> i32 {
// Inline assembly definitely does not work in Miri.
let dummy = 42;
let mut dummy = 42;
unsafe {
llvm_asm!("" : : "r"(&dummy));
asm!("/* {} */", in(reg) &mut dummy);
}
return dummy;
}

View File

@ -5,5 +5,5 @@ fn main() {
extern "C" {
fn FOO();
}
unsafe { FOO() } //~ ERROR unsupported operation: can't call foreign function: FOO
unsafe { FOO() } //~ ERROR attempt to call an exported symbol that is not defined as a function
}