Merge branch 'master' into sync_branch_name

2024-03-10 17:18:06 +01:00 · 2024-03-10 17:18:06 +01:00 · 5a89328710
commit 5a89328710
parent ed5c3bc397 b385428e3d
2 changed files with 2 additions and 2 deletions
--- a/src/asm.rs
+++ b/src/asm.rs
@ -115,7 +115,7 @@ fn codegen_inline_asm(
        span: &[Span],
        instance: Instance<'_>,
        dest: Option<Self::BasicBlock>,
-        _catch_funclet: Option<(Self::BasicBlock, Option<&Self::Funclet>)>,
+        _dest_catch_funclet: Option<(Self::BasicBlock, Option<&Self::Funclet>)>,
    ) {
        if options.contains(InlineAsmOptions::MAY_UNWIND) {
            self.sess().dcx().create_err(UnwindingInlineAsm { span: span[0] }).emit();