Merge branch 'master' into sync_branch_name

This commit is contained in:
Guillaume Gomez 2024-03-10 17:18:06 +01:00
commit 5a89328710
2 changed files with 2 additions and 2 deletions

View File

@ -115,7 +115,7 @@ impl<'a, 'gcc, 'tcx> AsmBuilderMethods<'tcx> for Builder<'a, 'gcc, 'tcx> {
span: &[Span], span: &[Span],
instance: Instance<'_>, instance: Instance<'_>,
dest: Option<Self::BasicBlock>, 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) { if options.contains(InlineAsmOptions::MAY_UNWIND) {
self.sess().dcx().create_err(UnwindingInlineAsm { span: span[0] }).emit(); self.sess().dcx().create_err(UnwindingInlineAsm { span: span[0] }).emit();