File tree Expand file tree Collapse file tree 2 files changed +5
-6
lines changed Expand file tree Collapse file tree 2 files changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -764,7 +764,7 @@ pub fn create_global_ctxt<'tcx>(
764
764
outputs : OutputFilenames ,
765
765
crate_name : & str ,
766
766
global_ctxt : & ' tcx Once < GlobalCtxt < ' tcx > > ,
767
- arenas : & ' tcx Once < AllArenas > ,
767
+ all_arenas : & ' tcx AllArenas ,
768
768
local_arena : & ' tcx WorkerLocal < Arena < ' tcx > > ,
769
769
) -> QueryContext < ' tcx > {
770
770
let sess = & compiler. session ( ) ;
@@ -793,13 +793,12 @@ pub fn create_global_ctxt<'tcx>(
793
793
callback ( sess, & mut local_providers, & mut extern_providers) ;
794
794
}
795
795
796
- let arenas = arenas. init_locking ( || AllArenas :: new ( ) ) ;
797
796
let gcx = global_ctxt. init_locking ( || TyCtxt :: create_global_ctxt (
798
797
sess,
799
798
lint_store,
800
799
local_providers,
801
800
extern_providers,
802
- & arenas ,
801
+ & all_arenas ,
803
802
local_arena,
804
803
resolver_outputs,
805
804
hir_map,
Original file line number Diff line number Diff line change @@ -72,9 +72,9 @@ impl<T> Default for Query<T> {
72
72
pub struct Queries < ' tcx > {
73
73
compiler : & ' tcx Compiler ,
74
74
gcx : Once < GlobalCtxt < ' tcx > > ,
75
- arenas : Once < AllArenas > ,
76
75
forest : Once < hir:: map:: Forest > ,
77
76
77
+ all_arenas : AllArenas ,
78
78
local_arena : WorkerLocal < Arena < ' tcx > > ,
79
79
80
80
dep_graph_future : Query < Option < DepGraphFuture > > ,
@@ -94,8 +94,8 @@ impl<'tcx> Queries<'tcx> {
94
94
Queries {
95
95
compiler,
96
96
gcx : Once :: new ( ) ,
97
- arenas : Once :: new ( ) ,
98
97
forest : Once :: new ( ) ,
98
+ all_arenas : AllArenas :: new ( ) ,
99
99
local_arena : WorkerLocal :: new ( |_| Arena :: default ( ) ) ,
100
100
dep_graph_future : Default :: default ( ) ,
101
101
parse : Default :: default ( ) ,
@@ -268,7 +268,7 @@ impl<'tcx> Queries<'tcx> {
268
268
outputs,
269
269
& crate_name,
270
270
& self . gcx ,
271
- & self . arenas ,
271
+ & self . all_arenas ,
272
272
& self . local_arena ,
273
273
) )
274
274
} )
You can’t perform that action at this time.
0 commit comments