From 91655428f905b35c4a14d38562113eb768252fdf Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Fri, 16 Dec 2022 10:04:40 +0000
Subject: [PATCH] Ensure Cranelift errors are reported deterministically

This may also have been the root cause of #1310.
---
 src/driver/aot.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/driver/aot.rs b/src/driver/aot.rs
index 27cce7c15e1f..d4494a9e45de 100644
--- a/src/driver/aot.rs
+++ b/src/driver/aot.rs
@@ -108,6 +108,8 @@ impl OngoingCodegen {
 
         self.concurrency_limiter.finished();
 
+        sess.abort_if_errors();
+
         (
             CodegenResults {
                 modules,
@@ -411,8 +413,6 @@ pub(crate) fn run_aot(
             .collect::<Vec<_>>()
     });
 
-    tcx.sess.abort_if_errors();
-
     let mut allocator_module = make_module(tcx.sess, &backend_config, "allocator_shim".to_string());
     let mut allocator_unwind_context = UnwindContext::new(allocator_module.isa(), true);
     let created_alloc_shim =