bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Separate resolver creation from expansion.

Browse source
This commit is contained in:
Camille GILLOT 2021-05-24 18:45:21 +02:00
parent 5f98e5ee56
commit 18c10fb1a6
2 changed files with 38 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

17
compiler/rustc_interface/src/queries.rs
View file

@ -177,16 +177,17 @@ impl<'tcx> Queries<'tcx> {
let crate_name = self.crate_name()?.peek().clone();
let (krate, lint_store) = self.register_plugins()?.take();
let _timer = self.session().timer("configure_and_expand");
passes::configure_and_expand(
self.session().clone(),
lint_store.clone(),
let sess = self.session();
let mut resolver = passes::create_resolver(
sess.clone(),
self.codegen_backend().metadata_loader(),
krate,
&krate,
&crate_name,
)
.map(|(krate, resolver)| {
(krate, Steal::new(Rc::new(RefCell::new(resolver))), lint_store)
})
);
let krate = resolver.access(|resolver| {
passes::configure_and_expand(&sess, &lint_store, krate, &crate_name, resolver)
})?;
Ok((krate, Steal::new(Rc::new(RefCell::new(resolver))), lint_store))
})
}