diff options
| author | cynecx <me@cynecx.net> | 2021-08-28 19:02:00 +0200 |
|---|---|---|
| committer | cynecx <me@cynecx.net> | 2021-12-03 23:51:49 +0100 |
| commit | 491dd1f387e4f0b167e35560a97efc9949304640 (patch) | |
| tree | c2a6ecc0913a65cc7c06b9ef8850c88c6ffd6398 /compiler/rustc_codegen_llvm/src | |
| parent | 940b2eabad13d7781316d077ea4b64d559242f50 (diff) | |
| download | rust-491dd1f387e4f0b167e35560a97efc9949304640.tar.gz rust-491dd1f387e4f0b167e35560a97efc9949304640.zip | |
Adjust llvm wrapper for unwinding support for inlineasm
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/asm.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm/ffi.rs | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_llvm/src/asm.rs b/compiler/rustc_codegen_llvm/src/asm.rs index 02096f4abfa..aa979c6d77c 100644 --- a/compiler/rustc_codegen_llvm/src/asm.rs +++ b/compiler/rustc_codegen_llvm/src/asm.rs @@ -450,6 +450,7 @@ pub(crate) fn inline_asm_call( ) -> Option<&'ll Value> { let volatile = if volatile { llvm::True } else { llvm::False }; let alignstack = if alignstack { llvm::True } else { llvm::False }; + let can_throw = llvm::False; let argtys = inputs .iter() @@ -475,6 +476,7 @@ pub(crate) fn inline_asm_call( volatile, alignstack, llvm::AsmDialect::from_generic(dia), + can_throw, ); let call = bx.call(fty, v, inputs, None); diff --git a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs index 2ef4c871825..d9a6723fe27 100644 --- a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs +++ b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs @@ -1847,6 +1847,7 @@ extern "C" { SideEffects: Bool, AlignStack: Bool, Dialect: AsmDialect, + CanThrow: Bool, ) -> &Value; pub fn LLVMRustInlineAsmVerify( Ty: &Type, |
