mirror of
https://github.com/rust-lang/rust.git
synced 2026-06-02 06:28:20 +03:00
Nicholas Nethercote
90ea993083
The existing names have bugged me for a while. Changes: - `CycleError` -> `Cycle`. Because we normally use "error" for a `Diag` with `Level::Error`, and this type is just a precursor to that. Also, many existing locals of this type are already named `cycle`. - `CycleError::cycle` -> `Cycle::frames`. Because it is a sequence of frames, and we want to avoid `Cycle::cycle` (and `cycle.cycle`). - `cycle_error` -> `find_and_handle_cycle`. Because that's what it does. The existing name is just a non-descript noun phrase. - `mk_cycle` -> `handle_cycle`. Because it doesn't make the cycle; the cycle is already made. It handles the cycle, which involves (a) creating the error, and (b) handling the error. - `report_cycle` -> `create_cycle_error`. Because that's what it does: creates the cycle error (i.e. the `Diag`). - `value_from_cycle_error` -> `handle_cycle_error_fn`. Because most cases don't produce a value, they just emit an error and quit. And the `_fn` suffix is for consistency with other vtable fns. - `from_cycle_error` -> `handle_cycle_error`. A similar story for this module.
69 lines
2.2 KiB
Rust
69 lines
2.2 KiB
Rust
//! Support for serializing the dep-graph and reloading it.
|
|
|
|
// tidy-alphabetical-start
|
|
#![allow(internal_features)]
|
|
#![feature(core_intrinsics)]
|
|
#![feature(min_specialization)]
|
|
#![feature(rustc_attrs)]
|
|
#![feature(try_blocks)]
|
|
// tidy-alphabetical-end
|
|
|
|
use rustc_data_structures::sync::AtomicU64;
|
|
use rustc_middle::dep_graph;
|
|
use rustc_middle::queries::{ExternProviders, Providers};
|
|
use rustc_middle::query::on_disk_cache::OnDiskCache;
|
|
use rustc_middle::query::{QueryCache, QuerySystem, QueryVTable};
|
|
use rustc_middle::ty::TyCtxt;
|
|
|
|
pub use crate::dep_kind_vtables::make_dep_kind_vtables;
|
|
pub use crate::execution::{CollectActiveJobsKind, collect_active_query_jobs};
|
|
pub use crate::job::{QueryJobMap, break_query_cycles, print_query_stack};
|
|
|
|
mod dep_kind_vtables;
|
|
mod error;
|
|
mod execution;
|
|
mod handle_cycle_error;
|
|
mod job;
|
|
mod plumbing;
|
|
mod profiling_support;
|
|
mod query_impl;
|
|
|
|
/// Trait that knows how to look up the [`QueryVTable`] for a particular query.
|
|
///
|
|
/// This trait allows some per-query code to be defined in generic functions
|
|
/// with a trait bound, instead of having to be defined inline within a macro
|
|
/// expansion.
|
|
///
|
|
/// There is one macro-generated implementation of this trait for each query,
|
|
/// on the type `rustc_query_impl::query_impl::$name::VTableGetter`.
|
|
trait GetQueryVTable<'tcx> {
|
|
type Cache: QueryCache + 'tcx;
|
|
|
|
fn query_vtable(tcx: TyCtxt<'tcx>) -> &'tcx QueryVTable<'tcx, Self::Cache>;
|
|
}
|
|
|
|
pub fn query_system<'tcx>(
|
|
local_providers: Providers,
|
|
extern_providers: ExternProviders,
|
|
on_disk_cache: Option<OnDiskCache>,
|
|
incremental: bool,
|
|
) -> QuerySystem<'tcx> {
|
|
let mut query_vtables = query_impl::make_query_vtables(incremental);
|
|
handle_cycle_error::specialize_query_vtables(&mut query_vtables);
|
|
QuerySystem {
|
|
arenas: Default::default(),
|
|
query_vtables,
|
|
on_disk_cache,
|
|
local_providers,
|
|
extern_providers,
|
|
jobs: AtomicU64::new(1),
|
|
}
|
|
}
|
|
|
|
pub fn provide(providers: &mut rustc_middle::util::Providers) {
|
|
providers.hooks.alloc_self_profile_query_strings =
|
|
profiling_support::alloc_self_profile_query_strings;
|
|
providers.hooks.verify_query_key_hashes = plumbing::verify_query_key_hashes;
|
|
providers.hooks.encode_query_values = plumbing::encode_query_values;
|
|
}
|