From caf29b27277fd4fca4b372938e2fecf12dd12c78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20K=C3=A5re=20Alsaker?= <john.kare.alsaker@gmail.com>
Date: Tue, 14 Feb 2023 15:05:10 +0100
Subject: [PATCH] Remove parallel compiler fix

---
 compiler/rustc_query_system/src/query/plumbing.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/compiler/rustc_query_system/src/query/plumbing.rs b/compiler/rustc_query_system/src/query/plumbing.rs
index 38f507409c6..57217fb681a 100644
--- a/compiler/rustc_query_system/src/query/plumbing.rs
+++ b/compiler/rustc_query_system/src/query/plumbing.rs
@@ -257,10 +257,6 @@ where
         // Forget ourself so our destructor won't poison the query
         mem::forget(self);
 
-        // Mark as complete before we remove the job from the active state
-        // so no other thread can re-execute this query.
-        cache.complete(key.clone(), result, dep_node_index);
-
         let job = {
             #[cfg(parallel_compiler)]
             let mut lock = state.active.get_shard_by_value(&key).lock();
@@ -271,6 +267,7 @@ where
                 QueryResult::Poisoned => panic!(),
             }
         };
+        cache.complete(key, result, dep_node_index);
 
         job.signal_complete();
     }