mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address comments

Browse Source
This commit is contained in:
John Kåre Alsaker 2018-04-27 12:08:54 +02:00
parent 9a59789663
commit f678bf0aba
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/librustc/ty/maps/config.rs
View File

@ -35,10 +35,13 @@ pub trait QueryConfig<'tcx> {
type Value: Clone + for<'a> HashStable<StableHashingContext<'a>>;
fn query(key: Self::Key) -> Query<'tcx>;
// Don't use this method to access query results, instead use the methods on TyCtxt
fn query_map<'a>(tcx: TyCtxt<'a, 'tcx, '_>) -> &'a Lock<QueryMap<'tcx, Self>>;
fn to_dep_node(tcx: TyCtxt<'_, 'tcx, '_>, key: &Self::Key) -> DepNode;
// Don't use this method to compute query results, instead use the methods on TyCtxt
fn compute(tcx: TyCtxt<'_, 'tcx, '_>, key: Self::Key) -> Self::Value;
fn handle_cycle_error(tcx: TyCtxt<'_, 'tcx, '_>) -> Self::Value;

12
src/librustc/ty/maps/plumbing.rs
View File

@ -186,18 +186,18 @@ impl<'a, 'tcx, Q: QueryDescription<'tcx>> JobOwner<'a, 'tcx, Q> {
// The TyCtxt stored in TLS has the same global interner lifetime
// as `tcx`, so we use `with_related_context` to relate the 'gcx lifetimes
// when accessing the ImplicitCtxt
let r = tls::with_related_context(tcx, move |icx| {
let r = tls::with_related_context(tcx, move |current_icx| {
// Update the ImplicitCtxt to point to our new query job
let icx = tls::ImplicitCtxt {
let new_icx = tls::ImplicitCtxt {
tcx,
query: Some(self.job.clone()),
layout_depth: icx.layout_depth,
task: icx.task,
layout_depth: current_icx.layout_depth,
task: current_icx.task,
};
// Use the ImplicitCtxt while we execute the query
tls::enter_context(&icx, |icx| {
compute(icx.tcx)
tls::enter_context(&new_icx, |_| {
compute(tcx)
})
});