Auto merge of #113382 - lqd:test-mcp510, r=<try>

[perf] test MCP510

r? `@ghost`

compiler/rustc_query_impl/src/plumbing.rs

@@ -704,20 +704,11 @@ macro_rules! define_queries {
                     let name = stringify!($name);
                     $crate::plumbing::create_query_frame(tcx, rustc_middle::query::descs::$name, key, kind, name)
                 };
-                let res = tcx.query_system.states.$name.try_collect_active_jobs(
+                tcx.query_system.states.$name.try_collect_active_jobs(
                     tcx,
                     make_query,
                     qmap,
-                );
-                // this can be called during unwinding, and the function has a `try_`-prefix, so
-                // don't `unwrap()` here, just manually check for `None` and do best-effort error
-                // reporting.
-                if res.is_none() {
-                    tracing::warn!(
-                        "Failed to collect active jobs for query with name `{}`!",
-                        stringify!($name)
-                    );
-                }
+                ).unwrap();
             }
 
             pub(crate) fn alloc_self_profile_query_strings<'tcx>(

compiler/rustc_query_system/src/query/plumbing.rs

@@ -181,15 +181,8 @@ where
         cache.complete(key, result, dep_node_index);
 
         let job = {
-            let val = {
-                // don't keep the lock during the `unwrap()` of the retrieved value, or we taint the
-                // underlying shard.
-                // since unwinding also wants to look at this map, this can also prevent a double
-                // panic.
-                let mut lock = state.active.lock_shard_by_value(&key);
-                lock.remove(&key)
-            };
-            val.unwrap().expect_job()
+            let mut lock = state.active.lock_shard_by_value(&key);
+            lock.remove(&key).unwrap().expect_job()
         };
 
         job.signal_complete();