diff options
| author | bors <bors@rust-lang.org> | 2024-03-24 09:04:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-24 09:04:01 +0000 |
| commit | 4a52e9cc2acf102da113d1b6c712afc5fcf4db13 (patch) | |
| tree | 9a03d8ea719bb6191d8b1efd0f2f067ae99e2d46 /compiler/rustc_codegen_llvm/src/asm.rs | |
| parent | 548e14b43963882fb758deb89e8258d9b8c2fc2a (diff) | |
| parent | c94d229337d89d828a061af5e58730667f6a3813 (diff) | |
| download | rust-4a52e9cc2acf102da113d1b6c712afc5fcf4db13.tar.gz rust-4a52e9cc2acf102da113d1b6c712afc5fcf4db13.zip | |
Auto merge of #122980 - workingjubilee:rollup-r5i1rke, r=workingjubilee
Rollup of 7 pull requests Successful merges: - #120419 (Expand sys/os for UEFI) - #121940 (Mention Register Size in `#[warn(asm_sub_register)]`) - #122762 (fix typo of endianness) - #122797 (Fix compile of wasm64-unknown-unknown target) - #122875 (CFI: Support self_cell-like recursion) - #122879 (CFI: Strip auto traits off Virtual calls) - #122969 (Simplify an iterator search in borrowck diag) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/asm.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/asm.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_llvm/src/asm.rs b/compiler/rustc_codegen_llvm/src/asm.rs index 74539d4d495..500904ce188 100644 --- a/compiler/rustc_codegen_llvm/src/asm.rs +++ b/compiler/rustc_codegen_llvm/src/asm.rs @@ -466,11 +466,11 @@ pub(crate) fn inline_asm_call<'ll>( let call = if !labels.is_empty() { assert!(catch_funclet.is_none()); - bx.callbr(fty, None, None, v, inputs, dest.unwrap(), labels, None) + bx.callbr(fty, None, None, v, inputs, dest.unwrap(), labels, None, None) } else if let Some((catch, funclet)) = catch_funclet { - bx.invoke(fty, None, None, v, inputs, dest.unwrap(), catch, funclet) + bx.invoke(fty, None, None, v, inputs, dest.unwrap(), catch, funclet, None) } else { - bx.call(fty, None, None, v, inputs, None) + bx.call(fty, None, None, v, inputs, None, None) }; // Store mark in a metadata node so we can map LLVM errors |