Auto merge of #68693 - Zoxc:query-no-arc, r=<try>

[WIP] Construct query job latches on-demand r? @michaelwoerister
rust-lang · Jan 31, 2020 · 7ccaf1c · 7ccaf1c
2 parents 266ecd6 + 8ecd740
commit 7ccaf1c
Show file tree

Hide file tree

Showing 4 changed files with 255 additions and 148 deletions.
diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs
@@ -1608,7 +1608,7 @@ pub mod tls {
 
     use crate::dep_graph::TaskDeps;
     use crate::ty::query;
-    use rustc_data_structures::sync::{self, Lock, Lrc};
+    use rustc_data_structures::sync::{self, Lock};
     use rustc_data_structures::thin_vec::ThinVec;
     use rustc_data_structures::OnDrop;
     use rustc_errors::Diagnostic;
@@ -1633,7 +1633,7 @@ pub mod tls {
 
         /// The current query job, if any. This is updated by `JobOwner::start` in
         /// `ty::query::plumbing` when executing a query.
-        pub query: Option<Lrc<query::QueryJob<'tcx>>>,
+        pub query: Option<query::QueryToken>,
 
         /// Where to store diagnostics for the current query job, if any.
         /// This is updated by `JobOwner::start` in `ty::query::plumbing` when executing a query.