diff options
| author | bors <bors@rust-lang.org> | 2022-09-30 10:39:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-30 10:39:09 +0000 |
| commit | f914b82a754c6d85c0a909ab152f5b611defef73 (patch) | |
| tree | 4aadd6df5dcdf3bea8a2cbd16bf91fb0e2753c92 /compiler/rustc_codegen_gcc/src/asm.rs | |
| parent | 4a0ee3cdc66573c8b46471462db7088a89d25183 (diff) | |
| parent | 588a25a6f8bfeec3a6bb8d8f498b0ed0794f7096 (diff) | |
| download | rust-f914b82a754c6d85c0a909ab152f5b611defef73.tar.gz rust-f914b82a754c6d85c0a909ab152f5b611defef73.zip | |
Auto merge of #102509 - matthiaskrgr:rollup-gtenet8, r=matthiaskrgr
Rollup of 5 pull requests
Successful merges:
- #101075 (Migrate rustc_codegen_gcc to SessionDiagnostics )
- #102350 (Improve errors for incomplete functions in struct definitions)
- #102481 (rustdoc: remove unneeded CSS `.rust-example-rendered { position }`)
- #102491 (rustdoc: remove no-op source sidebar `opacity`)
- #102499 (Adjust the s390x data layout for LLVM 16)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_gcc/src/asm.rs')
| -rw-r--r-- | compiler/rustc_codegen_gcc/src/asm.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_gcc/src/asm.rs b/compiler/rustc_codegen_gcc/src/asm.rs index 52fd66af065..007b001f213 100644 --- a/compiler/rustc_codegen_gcc/src/asm.rs +++ b/compiler/rustc_codegen_gcc/src/asm.rs @@ -12,6 +12,7 @@ use std::borrow::Cow; use crate::builder::Builder; use crate::context::CodegenCx; +use crate::errors::UnwindingInlineAsm; use crate::type_of::LayoutGccExt; use crate::callee::get_fn; @@ -109,7 +110,7 @@ impl<'a, 'gcc, 'tcx> AsmBuilderMethods<'tcx> for Builder<'a, 'gcc, 'tcx> { fn codegen_inline_asm(&mut self, template: &[InlineAsmTemplatePiece], rust_operands: &[InlineAsmOperandRef<'tcx, Self>], options: InlineAsmOptions, span: &[Span], _instance: Instance<'_>, _dest_catch_funclet: Option<(Self::BasicBlock, Self::BasicBlock, Option<&Self::Funclet>)>) { if options.contains(InlineAsmOptions::MAY_UNWIND) { self.sess() - .struct_span_err(span[0], "GCC backend does not support unwinding from inline asm") + .create_err(UnwindingInlineAsm { span: span[0] }) .emit(); return; } |
