bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #139234 - compiler-errors:query-tweak, r=oli-obk

Browse source 
Misc query tweaks

Remove some redundant work around `cache_on_disk` and `ensure_ok`, since `Result<(), ErrorGuaranteed>` queries don't need to cache or recompute their "value" if they are only used for their result.
This commit is contained in:
bors 2025-04-03 00:13:54 +00:00
commit 3658060890
5 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_const_eval/src/check_consts/check.rs
View file

@ -335,7 +335,7 @@ impl<'mir, 'tcx> Checker<'mir, 'tcx> {
self.tcx.dcx().span_bug(span, "tls access is checked in `Rvalue::ThreadLocalRef`");
}
if let Some(def_id) = def_id.as_local()
&& let Err(guar) = self.tcx.at(span).check_well_formed(hir::OwnerId { def_id })
&& let Err(guar) = self.tcx.ensure_ok().check_well_formed(hir::OwnerId { def_id })
{
self.error_emitted = Some(guar);
}

2
compiler/rustc_interface/src/passes.rs
View file

@ -976,7 +976,7 @@ fn run_required_analyses(tcx: TyCtxt<'_>) {
tcx.par_hir_body_owners(|def_id| {
if tcx.is_coroutine(def_id.to_def_id()) {
tcx.ensure_ok().mir_coroutine_witnesses(def_id);
tcx.ensure_ok().check_coroutine_obligations(
let _ = tcx.ensure_ok().check_coroutine_obligations(
tcx.typeck_root_def_id(def_id.to_def_id()).expect_local(),
);
// Eagerly check the unsubstituted layout for cycles.

9
compiler/rustc_middle/src/query/mod.rs
View file

@ -612,6 +612,7 @@ rustc_queries! {
query check_coroutine_obligations(key: LocalDefId) -> Result<(), ErrorGuaranteed> {
desc { |tcx| "verify auto trait bounds for coroutine interior type `{}`", tcx.def_path_str(key) }
return_result_from_ensure_ok
}
/// MIR after our optimization passes have run. This is MIR that is ready
@ -1033,13 +1034,12 @@ rustc_queries! {
/// Unsafety-check this `LocalDefId`.
query check_unsafety(key: LocalDefId) {
desc { |tcx| "unsafety-checking `{}`", tcx.def_path_str(key) }
cache_on_disk_if { true }
}
/// Checks well-formedness of tail calls (`become f()`).
query check_tail_calls(key: LocalDefId) -> Result<(), rustc_errors::ErrorGuaranteed> {
desc { |tcx| "tail-call-checking `{}`", tcx.def_path_str(key) }
cache_on_disk_if { true }
return_result_from_ensure_ok
}
/// Returns the types assumed to be well formed while "inside" of the given item.
@ -1308,7 +1308,7 @@ rustc_queries! {
query check_match(key: LocalDefId) -> Result<(), rustc_errors::ErrorGuaranteed> {
desc { |tcx| "match-checking `{}`", tcx.def_path_str(key) }
cache_on_disk_if { true }
return_result_from_ensure_ok
}
/// Performs part of the privacy check and computes effective visibilities.
@ -1607,7 +1607,6 @@ rustc_queries! {
/// `Err(AlwaysRequiresDrop)` is returned.
query adt_significant_drop_tys(def_id: DefId) -> Result<&'tcx ty::List<Ty<'tcx>>, AlwaysRequiresDrop> {
desc { |tcx| "computing when `{}` has a significant destructor", tcx.def_path_str(def_id) }
cache_on_disk_if { false }
}
/// Returns a list of types which (a) have a potentially significant destructor
@ -1629,7 +1628,6 @@ rustc_queries! {
/// Otherwise, there is a risk of query cycles.
query list_significant_drop_tys(ty: ty::PseudoCanonicalInput<'tcx, Ty<'tcx>>) -> &'tcx ty::List<Ty<'tcx>> {
desc { |tcx| "computing when `{}` has a significant destructor", ty.value }
cache_on_disk_if { false }
}
/// Computes the layout of a type. Note that this implicitly
@ -2517,7 +2515,6 @@ rustc_queries! {
/// monomorphized.
query check_mono_item(key: ty::Instance<'tcx>) {
desc { "monomorphization-time checking" }
cache_on_disk_if { true }
}
/// Builds the set of functions that should be skipped for the move-size check.

4
compiler/rustc_mir_build/src/builder/mod.rs
View file

@ -48,11 +48,11 @@ pub(crate) fn closure_saved_names_of_captured_variables<'tcx>(
/// this directly; instead use the cached version via `mir_built`.
pub fn build_mir<'tcx>(tcx: TyCtxt<'tcx>, def: LocalDefId) -> Body<'tcx> {
tcx.ensure_done().thir_abstract_const(def);
if let Err(e) = tcx.check_match(def) {
if let Err(e) = tcx.ensure_ok().check_match(def) {
return construct_error(tcx, def, e);
}
if let Err(err) = tcx.check_tail_calls(def) {
if let Err(err) = tcx.ensure_ok().check_tail_calls(def) {
return construct_error(tcx, def, err);
}

2
compiler/rustc_mir_transform/src/lib.rs
View file

@ -529,7 +529,7 @@ fn mir_drops_elaborated_and_const_checked(tcx: TyCtxt<'_>, def: LocalDefId) -> &
| DefKind::Static { .. }
| DefKind::Const
| DefKind::AssocConst => {
if let Err(guar) = tcx.check_well_formed(root.expect_local()) {
if let Err(guar) = tcx.ensure_ok().check_well_formed(root.expect_local()) {
body.tainted_by_errors = Some(guar);
}
}