From 7fc07caf6798dcb29f91a6a57fd63e3d3ffa34ee Mon Sep 17 00:00:00 2001
From: Ellis Hoag <ellis.sparky.hoag@gmail.com>
Date: Fri, 26 Aug 2022 20:44:44 -0700
Subject: [PATCH] Add UnwindingInlineAsm

---
 src/asm.rs    | 3 ++-
 src/errors.rs | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/asm.rs b/src/asm.rs
index 52fd66af0659..007b001f213f 100644
--- a/src/asm.rs
+++ b/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;
         }
diff --git a/src/errors.rs b/src/errors.rs
index 456a60c6f90b..e0c7dca8e324 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -13,3 +13,10 @@ pub(crate) struct LinkageConstOrMutType {
     #[primary_span]
     pub span: Span
 }
+
+#[derive(SessionDiagnostic)]
+#[diag(codegen_gcc::unwinding_inline_asm)]
+pub(crate) struct UnwindingInlineAsm {
+    #[primary_span]
+    pub span: Span
+}