Skip to content

Commit 77a4c85

Browse files
committed
Simplify handling of AllArenas.
1 parent e5ed101 commit 77a4c85

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/librustc_interface/passes.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ pub fn create_global_ctxt<'tcx>(
764764
outputs: OutputFilenames,
765765
crate_name: &str,
766766
global_ctxt: &'tcx Once<GlobalCtxt<'tcx>>,
767-
arenas: &'tcx Once<AllArenas>,
767+
all_arenas: &'tcx AllArenas,
768768
local_arena: &'tcx WorkerLocal<Arena<'tcx>>,
769769
) -> QueryContext<'tcx> {
770770
let sess = &compiler.session();
@@ -793,13 +793,12 @@ pub fn create_global_ctxt<'tcx>(
793793
callback(sess, &mut local_providers, &mut extern_providers);
794794
}
795795

796-
let arenas = arenas.init_locking(|| AllArenas::new());
797796
let gcx = global_ctxt.init_locking(|| TyCtxt::create_global_ctxt(
798797
sess,
799798
lint_store,
800799
local_providers,
801800
extern_providers,
802-
&arenas,
801+
&all_arenas,
803802
local_arena,
804803
resolver_outputs,
805804
hir_map,

src/librustc_interface/queries.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ impl<T> Default for Query<T> {
7272
pub struct Queries<'tcx> {
7373
compiler: &'tcx Compiler,
7474
gcx: Once<GlobalCtxt<'tcx>>,
75-
arenas: Once<AllArenas>,
7675
forest: Once<hir::map::Forest>,
7776

77+
all_arenas: AllArenas,
7878
local_arena: WorkerLocal<Arena<'tcx>>,
7979

8080
dep_graph_future: Query<Option<DepGraphFuture>>,
@@ -94,8 +94,8 @@ impl<'tcx> Queries<'tcx> {
9494
Queries {
9595
compiler,
9696
gcx: Once::new(),
97-
arenas: Once::new(),
9897
forest: Once::new(),
98+
all_arenas: AllArenas::new(),
9999
local_arena: WorkerLocal::new(|_| Arena::default()),
100100
dep_graph_future: Default::default(),
101101
parse: Default::default(),
@@ -268,7 +268,7 @@ impl<'tcx> Queries<'tcx> {
268268
outputs,
269269
&crate_name,
270270
&self.gcx,
271-
&self.arenas,
271+
&self.all_arenas,
272272
&self.local_arena,
273273
))
274274
})

0 commit comments

Comments
 (0)