From 6efffd723bc87f3a577f4f52fcffb6335406e9cb Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Thu, 15 Feb 2024 16:22:22 +1100
Subject: [PATCH] Remove `SharedEmitterMessage::AbortIfErrors`.

It's always paired wth `SharedEmitterMessage::Diagnostic`, so the two
can be merged.
---
 compiler/rustc_codegen_ssa/src/back/write.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/compiler/rustc_codegen_ssa/src/back/write.rs b/compiler/rustc_codegen_ssa/src/back/write.rs
index 54831265691..c2fc32130ea 100644
--- a/compiler/rustc_codegen_ssa/src/back/write.rs
+++ b/compiler/rustc_codegen_ssa/src/back/write.rs
@@ -1784,7 +1784,6 @@ fn spawn_work<'a, B: ExtraBackendMethods>(
 enum SharedEmitterMessage {
     Diagnostic(Diagnostic),
     InlineAsmError(u32, String, Level, Option<(String, Vec<InnerSpan>)>),
-    AbortIfErrors,
     Fatal(String),
 }
 
@@ -1853,7 +1852,6 @@ impl Emitter for SharedEmitter {
                 args,
             })),
         );
-        drop(self.sender.send(SharedEmitterMessage::AbortIfErrors));
     }
 
     fn source_map(&self) -> Option<&Lrc<SourceMap>> {
@@ -1895,6 +1893,7 @@ impl SharedEmitterMain {
                         .collect();
                     d.args = diag.args;
                     dcx.emit_diagnostic(d);
+                    sess.dcx().abort_if_errors();
                 }
                 Ok(SharedEmitterMessage::InlineAsmError(cookie, msg, level, source)) => {
                     assert!(matches!(level, Level::Error | Level::Warning | Level::Note));
@@ -1927,9 +1926,6 @@ impl SharedEmitterMain {
 
                     err.emit();
                 }
-                Ok(SharedEmitterMessage::AbortIfErrors) => {
-                    sess.dcx().abort_if_errors();
-                }
                 Ok(SharedEmitterMessage::Fatal(msg)) => {
                     sess.dcx().fatal(msg);
                 }