bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Move GlobalCtxt::finish to TyCtxt

Browse source 
This allows us to call GlobalCtxt::finish exactly once.
This commit is contained in:
bjorn3 2024-11-03 20:14:51 +00:00
parent 87802536f4
commit 954cd79ced
2 changed files with 54 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

26
compiler/rustc_middle/src/ty/context.rs
View file

@ -1374,19 +1374,6 @@ impl<'tcx> GlobalCtxt<'tcx> {
tls::enter_context(&icx, || f(icx.tcx))
}
pub fn finish(&'tcx self) {
// We assume that no queries are run past here. If there are new queries
// after this point, they'll show up as "<unknown>" in self-profiling data.
self.enter(|tcx| tcx.alloc_self_profile_query_strings());
self.enter(|tcx| tcx.save_dep_graph());
self.enter(|tcx| tcx.query_key_hash_verify_all());
if let Err((path, error)) = self.dep_graph.finish_encoding() {
self.sess.dcx().emit_fatal(crate::error::FailedWritingFile { path: &path, error });
}
}
}
/// This is used to get a reference to a `GlobalCtxt` if one is available.
@ -2120,6 +2107,19 @@ impl<'tcx> TyCtxt<'tcx> {
pub fn local_opaque_ty_origin(self, def_id: LocalDefId) -> hir::OpaqueTyOrigin<LocalDefId> {
self.hir().expect_opaque_ty(def_id).origin
}
pub fn finish(self) {
// We assume that no queries are run past here. If there are new queries
// after this point, they'll show up as "<unknown>" in self-profiling data.
self.alloc_self_profile_query_strings();
self.save_dep_graph();
self.query_key_hash_verify_all();
if let Err((path, error)) = self.dep_graph.finish_encoding() {
self.sess.dcx().emit_fatal(crate::error::FailedWritingFile { path: &path, error });
}
}
}
macro_rules! nop_lift {