]> git.lizzy.rs Git - rust.git/commitdiff
Categorize queries for later self-profiling
authorWesley Wiser <wwiser@gmail.com>
Sat, 19 May 2018 17:50:58 +0000 (13:50 -0400)
committerWesley Wiser <wwiser@gmail.com>
Wed, 18 Jul 2018 02:32:32 +0000 (22:32 -0400)
Change the define_queries! macro per feedback on #51657.

Big thanks to @mark-i-m for the help getting the macro changes correct!

src/librustc/ty/query/mod.rs
src/librustc/ty/query/plumbing.rs

index 3581dd87f6f8d80d615b6ac47194faf1dcf98ea0..2fb289d023606ab821615981d27d6cddfcd92233 100644 (file)
 // Queries marked with `fatal_cycle` do not need the latter implementation,
 // as they will raise an fatal error on query cycles instead.
 define_queries! { <'tcx>
-    /// Records the type of every item.
-    [] fn type_of: TypeOfItem(DefId) -> Ty<'tcx>,
-
-    /// Maps from the def-id of an item (trait/struct/enum/fn) to its
-    /// associated generics.
-    [] fn generics_of: GenericsOfItem(DefId) -> &'tcx ty::Generics,
-
-    /// Maps from the def-id of an item (trait/struct/enum/fn) to the
-    /// predicates (where clauses) that must be proven true in order
-    /// to reference it. This is almost always the "predicates query"
-    /// that you want.
-    ///
-    /// `predicates_of` builds on `predicates_defined_on` -- in fact,
-    /// it is almost always the same as that query, except for the
-    /// case of traits. For traits, `predicates_of` contains
-    /// an additional `Self: Trait<...>` predicate that users don't
-    /// actually write. This reflects the fact that to invoke the
-    /// trait (e.g., via `Default::default`) you must supply types
-    /// that actually implement the trait. (However, this extra
-    /// predicate gets in the way of some checks, which are intended
-    /// to operate over only the actual where-clauses written by the
-    /// user.)
-    [] fn predicates_of: PredicatesOfItem(DefId) -> ty::GenericPredicates<'tcx>,
-
-    /// Maps from the def-id of an item (trait/struct/enum/fn) to the
-    /// predicates (where clauses) directly defined on it. This is
-    /// equal to the `explicit_predicates_of` predicates plus the
-    /// `inferred_outlives_of` predicates.
-    [] fn predicates_defined_on: PredicatesDefinedOnItem(DefId) -> ty::GenericPredicates<'tcx>,
-
-    /// Returns the predicates written explicit by the user.
-    [] fn explicit_predicates_of: ExplicitPredicatesOfItem(DefId) -> ty::GenericPredicates<'tcx>,
-
-    /// Returns the inferred outlives predicates (e.g., for `struct
-    /// Foo<'a, T> { x: &'a T }`, this would return `T: 'a`).
-    [] fn inferred_outlives_of: InferredOutlivesOf(DefId) -> Lrc<Vec<ty::Predicate<'tcx>>>,
-
-    /// Maps from the def-id of a trait to the list of
-    /// super-predicates. This is a subset of the full list of
-    /// predicates. We store these in a separate map because we must
-    /// evaluate them even during type conversion, often before the
-    /// full predicates are available (note that supertraits have
-    /// additional acyclicity requirements).
-    [] fn super_predicates_of: SuperPredicatesOfItem(DefId) -> ty::GenericPredicates<'tcx>,
-
-    /// To avoid cycles within the predicates of a single item we compute
-    /// per-type-parameter predicates for resolving `T::AssocTy`.
-    [] fn type_param_predicates: type_param_predicates((DefId, DefId))
-        -> ty::GenericPredicates<'tcx>,
-
-    [] fn trait_def: TraitDefOfItem(DefId) -> &'tcx ty::TraitDef,
-    [] fn adt_def: AdtDefOfItem(DefId) -> &'tcx ty::AdtDef,
-    [] fn adt_destructor: AdtDestructor(DefId) -> Option<ty::Destructor>,
-    [] fn adt_sized_constraint: SizedConstraint(DefId) -> &'tcx [Ty<'tcx>],
-    [] fn adt_dtorck_constraint: DtorckConstraint(
-        DefId
-    ) -> Result<DtorckConstraint<'tcx>, NoSolution>,
-
-    /// True if this is a const fn
-    [] fn is_const_fn: IsConstFn(DefId) -> bool,
-
-    /// True if this is a foreign item (i.e., linked via `extern { ... }`).
-    [] fn is_foreign_item: IsForeignItem(DefId) -> bool,
-
-    /// Get a map with the variance of every item; use `item_variance`
-    /// instead.
-    [] fn crate_variances: crate_variances(CrateNum) -> Lrc<ty::CrateVariancesMap>,
-
-    /// Maps from def-id of a type or region parameter to its
-    /// (inferred) variance.
-    [] fn variances_of: ItemVariances(DefId) -> Lrc<Vec<ty::Variance>>,
-
-    /// Maps from def-id of a type to its (inferred) outlives.
-    [] fn inferred_outlives_crate: InferredOutlivesCrate(CrateNum)
-        -> Lrc<ty::CratePredicatesMap<'tcx>>,
-
-    /// Maps from an impl/trait def-id to a list of the def-ids of its items
-    [] fn associated_item_def_ids: AssociatedItemDefIds(DefId) -> Lrc<Vec<DefId>>,
-
-    /// Maps from a trait item to the trait item "descriptor"
-    [] fn associated_item: AssociatedItems(DefId) -> ty::AssociatedItem,
-
-    [] fn impl_trait_ref: ImplTraitRef(DefId) -> Option<ty::TraitRef<'tcx>>,
-    [] fn impl_polarity: ImplPolarity(DefId) -> hir::ImplPolarity,
-
-    /// Maps a DefId of a type to a list of its inherent impls.
-    /// Contains implementations of methods that are inherent to a type.
-    /// Methods in these implementations don't need to be exported.
-    [] fn inherent_impls: InherentImpls(DefId) -> Lrc<Vec<DefId>>,
-
-    /// Set of all the def-ids in this crate that have MIR associated with
-    /// them. This includes all the body owners, but also things like struct
-    /// constructors.
-    [] fn mir_keys: mir_keys(CrateNum) -> Lrc<DefIdSet>,
-
-    /// Maps DefId's that have an associated Mir to the result
-    /// of the MIR qualify_consts pass. The actual meaning of
-    /// the value isn't known except to the pass itself.
-    [] fn mir_const_qualif: MirConstQualif(DefId) -> (u8, Lrc<IdxSetBuf<mir::Local>>),
-
-    /// Fetch the MIR for a given def-id right after it's built - this includes
-    /// unreachable code.
-    [] fn mir_built: MirBuilt(DefId) -> &'tcx Steal<mir::Mir<'tcx>>,
-
-    /// Fetch the MIR for a given def-id up till the point where it is
-    /// ready for const evaluation.
-    ///
-    /// See the README for the `mir` module for details.
-    [] fn mir_const: MirConst(DefId) -> &'tcx Steal<mir::Mir<'tcx>>,
-
-    [] fn mir_validated: MirValidated(DefId) -> &'tcx Steal<mir::Mir<'tcx>>,
-
-    /// MIR after our optimization passes have run. This is MIR that is ready
-    /// for codegen. This is also the only query that can fetch non-local MIR, at present.
-    [] fn optimized_mir: MirOptimized(DefId) -> &'tcx mir::Mir<'tcx>,
-
-    /// The result of unsafety-checking this def-id.
-    [] fn unsafety_check_result: UnsafetyCheckResult(DefId) -> mir::UnsafetyCheckResult,
-
-    /// HACK: when evaluated, this reports a "unsafe derive on repr(packed)" error
-    [] fn unsafe_derive_on_repr_packed: UnsafeDeriveOnReprPacked(DefId) -> (),
-
-    /// The signature of functions and closures.
-    [] fn fn_sig: FnSignature(DefId) -> ty::PolyFnSig<'tcx>,
-
-    /// Caches CoerceUnsized kinds for impls on custom types.
-    [] fn coerce_unsized_info: CoerceUnsizedInfo(DefId)
-        -> ty::adjustment::CoerceUnsizedInfo,
-
-    [] fn typeck_item_bodies: typeck_item_bodies_dep_node(CrateNum) -> CompileResult,
-
-    [] fn typeck_tables_of: TypeckTables(DefId) -> &'tcx ty::TypeckTables<'tcx>,
-
-    [] fn used_trait_imports: UsedTraitImports(DefId) -> Lrc<DefIdSet>,
-
-    [] fn has_typeck_tables: HasTypeckTables(DefId) -> bool,
-
-    [] fn coherent_trait: CoherenceCheckTrait(DefId) -> (),
-
-    [] fn borrowck: BorrowCheck(DefId) -> Lrc<BorrowCheckResult>,
-
-    /// Borrow checks the function body. If this is a closure, returns
-    /// additional requirements that the closure's creator must verify.
-    [] fn mir_borrowck: MirBorrowCheck(DefId) -> mir::BorrowCheckResult<'tcx>,
-
-    /// Gets a complete map from all types to their inherent impls.
-    /// Not meant to be used directly outside of coherence.
-    /// (Defined only for LOCAL_CRATE)
-    [] fn crate_inherent_impls: crate_inherent_impls_dep_node(CrateNum) -> CrateInherentImpls,
-
-    /// Checks all types in the krate for overlap in their inherent impls. Reports errors.
-    /// Not meant to be used directly outside of coherence.
-    /// (Defined only for LOCAL_CRATE)
-    [] fn crate_inherent_impls_overlap_check: inherent_impls_overlap_check_dep_node(CrateNum) -> (),
-
-    /// Results of evaluating const items or constants embedded in
-    /// other items (such as enum variant explicit discriminants).
-    [] fn const_eval: const_eval_dep_node(ty::ParamEnvAnd<'tcx, GlobalId<'tcx>>)
-        -> ConstEvalResult<'tcx>,
-
-    /// Converts a constant value to an constant allocation
-    [] fn const_value_to_allocation: const_value_to_allocation(
-        &'tcx ty::Const<'tcx>
-    ) -> &'tcx Allocation,
-
-    [] fn check_match: CheckMatch(DefId)
-        -> Result<(), ErrorReported>,
-
-    /// Performs the privacy check and computes "access levels".
-    [] fn privacy_access_levels: PrivacyAccessLevels(CrateNum) -> Lrc<AccessLevels>,
-
-    [] fn reachable_set: reachability_dep_node(CrateNum) -> ReachableSet,
-
-    /// Per-body `region::ScopeTree`. The `DefId` should be the owner-def-id for the body;
-    /// in the case of closures, this will be redirected to the enclosing function.
-    [] fn region_scope_tree: RegionScopeTree(DefId) -> Lrc<region::ScopeTree>,
-
-    [] fn mir_shims: mir_shim_dep_node(ty::InstanceDef<'tcx>) -> &'tcx mir::Mir<'tcx>,
-
-    [] fn def_symbol_name: SymbolName(DefId) -> ty::SymbolName,
-    [] fn symbol_name: symbol_name_dep_node(ty::Instance<'tcx>) -> ty::SymbolName,
-
-    [] fn describe_def: DescribeDef(DefId) -> Option<Def>,
-    [] fn def_span: DefSpan(DefId) -> Span,
-    [] fn lookup_stability: LookupStability(DefId) -> Option<&'tcx attr::Stability>,
-    [] fn lookup_deprecation_entry: LookupDeprecationEntry(DefId) -> Option<DeprecationEntry>,
-    [] fn item_attrs: ItemAttrs(DefId) -> Lrc<[ast::Attribute]>,
-    [] fn codegen_fn_attrs: codegen_fn_attrs(DefId) -> CodegenFnAttrs,
-    [] fn fn_arg_names: FnArgNames(DefId) -> Vec<ast::Name>,
-    /// Gets the rendered value of the specified constant or associated constant.
-    /// Used by rustdoc.
-    [] fn rendered_const: RenderedConst(DefId) -> String,
-    [] fn impl_parent: ImplParent(DefId) -> Option<DefId>,
-    [] fn trait_of_item: TraitOfItem(DefId) -> Option<DefId>,
-    [] fn const_is_rvalue_promotable_to_static: ConstIsRvaluePromotableToStatic(DefId) -> bool,
-    [] fn rvalue_promotable_map: RvaluePromotableMap(DefId) -> Lrc<ItemLocalSet>,
-    [] fn is_mir_available: IsMirAvailable(DefId) -> bool,
-    [] fn vtable_methods: vtable_methods_node(ty::PolyTraitRef<'tcx>)
-                          -> Lrc<Vec<Option<(DefId, &'tcx Substs<'tcx>)>>>,
-
-    [] fn codegen_fulfill_obligation: fulfill_obligation_dep_node(
-        (ty::ParamEnv<'tcx>, ty::PolyTraitRef<'tcx>)) -> Vtable<'tcx, ()>,
-    [] fn trait_impls_of: TraitImpls(DefId) -> Lrc<ty::trait_def::TraitImpls>,
-    [] fn specialization_graph_of: SpecializationGraph(DefId) -> Lrc<specialization_graph::Graph>,
-    [] fn is_object_safe: ObjectSafety(DefId) -> bool,
-
-    // Get the ParameterEnvironment for a given item; this environment
-    // will be in "user-facing" mode, meaning that it is suitabe for
-    // type-checking etc, and it does not normalize specializable
-    // associated types. This is almost always what you want,
-    // unless you are doing MIR optimizations, in which case you
-    // might want to use `reveal_all()` method to change modes.
-    [] fn param_env: ParamEnv(DefId) -> ty::ParamEnv<'tcx>,
-
-    // Trait selection queries. These are best used by invoking `ty.moves_by_default()`,
-    // `ty.is_copy()`, etc, since that will prune the environment where possible.
-    [] fn is_copy_raw: is_copy_dep_node(ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool,
-    [] fn is_sized_raw: is_sized_dep_node(ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool,
-    [] fn is_freeze_raw: is_freeze_dep_node(ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool,
-    [] fn needs_drop_raw: needs_drop_dep_node(ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool,
-    [] fn layout_raw: layout_dep_node(ty::ParamEnvAnd<'tcx, Ty<'tcx>>)
-                                  -> Result<&'tcx ty::layout::LayoutDetails,
-                                            ty::layout::LayoutError<'tcx>>,
-
-    [] fn dylib_dependency_formats: DylibDepFormats(CrateNum)
-                                    -> Lrc<Vec<(CrateNum, LinkagePreference)>>,
-
-    [fatal_cycle] fn is_panic_runtime: IsPanicRuntime(CrateNum) -> bool,
-    [fatal_cycle] fn is_compiler_builtins: IsCompilerBuiltins(CrateNum) -> bool,
-    [fatal_cycle] fn has_global_allocator: HasGlobalAllocator(CrateNum) -> bool,
-    [fatal_cycle] fn is_sanitizer_runtime: IsSanitizerRuntime(CrateNum) -> bool,
-    [fatal_cycle] fn is_profiler_runtime: IsProfilerRuntime(CrateNum) -> bool,
-    [fatal_cycle] fn panic_strategy: GetPanicStrategy(CrateNum) -> PanicStrategy,
-    [fatal_cycle] fn is_no_builtins: IsNoBuiltins(CrateNum) -> bool,
-
-    [] fn extern_crate: ExternCrate(DefId) -> Lrc<Option<ExternCrate>>,
-
-    [] fn specializes: specializes_node((DefId, DefId)) -> bool,
-    [] fn in_scope_traits_map: InScopeTraits(DefIndex)
-        -> Option<Lrc<FxHashMap<ItemLocalId, Lrc<StableVec<TraitCandidate>>>>>,
-    [] fn module_exports: ModuleExports(DefId) -> Option<Lrc<Vec<Export>>>,
-    [] fn lint_levels: lint_levels_node(CrateNum) -> Lrc<lint::LintLevelMap>,
-
-    [] fn impl_defaultness: ImplDefaultness(DefId) -> hir::Defaultness,
-
-    [] fn check_item_well_formed: CheckItemWellFormed(DefId) -> (),
-    [] fn check_trait_item_well_formed: CheckTraitItemWellFormed(DefId) -> (),
-    [] fn check_impl_item_well_formed: CheckImplItemWellFormed(DefId) -> (),
-
-    // The DefIds of all non-generic functions and statics in the given crate
-    // that can be reached from outside the crate.
-    //
-    // We expect this items to be available for being linked to.
-    //
-    // This query can also be called for LOCAL_CRATE. In this case it will
-    // compute which items will be reachable to other crates, taking into account
-    // the kind of crate that is currently compiled. Crates with only a
-    // C interface have fewer reachable things.
-    //
-    // Does not include external symbols that don't have a corresponding DefId,
-    // like the compiler-generated `main` function and so on.
-    [] fn reachable_non_generics: ReachableNonGenerics(CrateNum)
-        -> Lrc<DefIdMap<SymbolExportLevel>>,
-    [] fn is_reachable_non_generic: IsReachableNonGeneric(DefId) -> bool,
-    [] fn is_unreachable_local_definition: IsUnreachableLocalDefinition(DefId) -> bool,
-
-    [] fn upstream_monomorphizations: UpstreamMonomorphizations(CrateNum)
-        -> Lrc<DefIdMap<Lrc<FxHashMap<&'tcx Substs<'tcx>, CrateNum>>>>,
-    [] fn upstream_monomorphizations_for: UpstreamMonomorphizationsFor(DefId)
-        -> Option<Lrc<FxHashMap<&'tcx Substs<'tcx>, CrateNum>>>,
-
-    [] fn native_libraries: NativeLibraries(CrateNum) -> Lrc<Vec<NativeLibrary>>,
-
-    [] fn foreign_modules: ForeignModules(CrateNum) -> Lrc<Vec<ForeignModule>>,
-
-    [] fn plugin_registrar_fn: PluginRegistrarFn(CrateNum) -> Option<DefId>,
-    [] fn derive_registrar_fn: DeriveRegistrarFn(CrateNum) -> Option<DefId>,
-    [] fn crate_disambiguator: CrateDisambiguator(CrateNum) -> CrateDisambiguator,
-    [] fn crate_hash: CrateHash(CrateNum) -> Svh,
-    [] fn original_crate_name: OriginalCrateName(CrateNum) -> Symbol,
-    [] fn extra_filename: ExtraFileName(CrateNum) -> String,
-
-    [] fn implementations_of_trait: implementations_of_trait_node((CrateNum, DefId))
-        -> Lrc<Vec<DefId>>,
-    [] fn all_trait_implementations: AllTraitImplementations(CrateNum)
-        -> Lrc<Vec<DefId>>,
-
-    [] fn dllimport_foreign_items: DllimportForeignItems(CrateNum)
-        -> Lrc<FxHashSet<DefId>>,
-    [] fn is_dllimport_foreign_item: IsDllimportForeignItem(DefId) -> bool,
-    [] fn is_statically_included_foreign_item: IsStaticallyIncludedForeignItem(DefId) -> bool,
-    [] fn native_library_kind: NativeLibraryKind(DefId)
-        -> Option<NativeLibraryKind>,
-    [] fn link_args: link_args_node(CrateNum) -> Lrc<Vec<String>>,
-
-    // Lifetime resolution. See `middle::resolve_lifetimes`.
-    [] fn resolve_lifetimes: ResolveLifetimes(CrateNum) -> Lrc<ResolveLifetimes>,
-    [] fn named_region_map: NamedRegion(DefIndex) ->
-        Option<Lrc<FxHashMap<ItemLocalId, Region>>>,
-    [] fn is_late_bound_map: IsLateBound(DefIndex) ->
-        Option<Lrc<FxHashSet<ItemLocalId>>>,
-    [] fn object_lifetime_defaults_map: ObjectLifetimeDefaults(DefIndex)
-        -> Option<Lrc<FxHashMap<ItemLocalId, Lrc<Vec<ObjectLifetimeDefault>>>>>,
-
-    [] fn visibility: Visibility(DefId) -> ty::Visibility,
-    [] fn dep_kind: DepKind(CrateNum) -> DepKind,
-    [] fn crate_name: CrateName(CrateNum) -> Symbol,
-    [] fn item_children: ItemChildren(DefId) -> Lrc<Vec<Export>>,
-    [] fn extern_mod_stmt_cnum: ExternModStmtCnum(DefId) -> Option<CrateNum>,
-
-    [] fn get_lang_items: get_lang_items_node(CrateNum) -> Lrc<LanguageItems>,
-    [] fn defined_lang_items: DefinedLangItems(CrateNum) -> Lrc<Vec<(DefId, usize)>>,
-    [] fn missing_lang_items: MissingLangItems(CrateNum) -> Lrc<Vec<LangItem>>,
-    [] fn visible_parent_map: visible_parent_map_node(CrateNum)
-        -> Lrc<DefIdMap<DefId>>,
-    [] fn missing_extern_crate_item: MissingExternCrateItem(CrateNum) -> bool,
-    [] fn used_crate_source: UsedCrateSource(CrateNum) -> Lrc<CrateSource>,
-    [] fn postorder_cnums: postorder_cnums_node(CrateNum) -> Lrc<Vec<CrateNum>>,
-
-    [] fn freevars: Freevars(DefId) -> Option<Lrc<Vec<hir::Freevar>>>,
-    [] fn maybe_unused_trait_import: MaybeUnusedTraitImport(DefId) -> bool,
-    [] fn maybe_unused_extern_crates: maybe_unused_extern_crates_node(CrateNum)
-        -> Lrc<Vec<(DefId, Span)>>,
-
-    [] fn stability_index: stability_index_node(CrateNum) -> Lrc<stability::Index<'tcx>>,
-    [] fn all_crate_nums: all_crate_nums_node(CrateNum) -> Lrc<Vec<CrateNum>>,
-
-    /// A vector of every trait accessible in the whole crate
-    /// (i.e. including those from subcrates). This is used only for
-    /// error reporting.
-    [] fn all_traits: all_traits_node(CrateNum) -> Lrc<Vec<DefId>>,
-
-    [] fn exported_symbols: ExportedSymbols(CrateNum)
-        -> Arc<Vec<(ExportedSymbol<'tcx>, SymbolExportLevel)>>,
-    [] fn collect_and_partition_mono_items:
-        collect_and_partition_mono_items_node(CrateNum)
-        -> (Arc<DefIdSet>, Arc<Vec<Arc<CodegenUnit<'tcx>>>>),
-    [] fn is_codegened_item: IsCodegenedItem(DefId) -> bool,
-    [] fn codegen_unit: CodegenUnit(InternedString) -> Arc<CodegenUnit<'tcx>>,
-    [] fn compile_codegen_unit: CompileCodegenUnit(InternedString) -> Stats,
-    [] fn output_filenames: output_filenames_node(CrateNum)
-        -> Arc<OutputFilenames>,
-
-    // Erases regions from `ty` to yield a new type.
-    // Normally you would just use `tcx.erase_regions(&value)`,
-    // however, which uses this query as a kind of cache.
-    [] fn erase_regions_ty: erase_regions_ty(Ty<'tcx>) -> Ty<'tcx>,
-
-    /// Do not call this query directly: invoke `normalize` instead.
-    [] fn normalize_projection_ty: NormalizeProjectionTy(
-        CanonicalProjectionGoal<'tcx>
-    ) -> Result<
-        Lrc<Canonical<'tcx, canonical::QueryResult<'tcx, NormalizationResult<'tcx>>>>,
-        NoSolution,
-    >,
-
-    /// Do not call this query directly: invoke `normalize_erasing_regions` instead.
-    [] fn normalize_ty_after_erasing_regions: NormalizeTyAfterErasingRegions(
-        ParamEnvAnd<'tcx, Ty<'tcx>>
-    ) -> Ty<'tcx>,
-
-    /// Do not call this query directly: invoke `infcx.at().dropck_outlives()` instead.
-    [] fn dropck_outlives: DropckOutlives(
-        CanonicalTyGoal<'tcx>
-    ) -> Result<
-        Lrc<Canonical<'tcx, canonical::QueryResult<'tcx, DropckOutlivesResult<'tcx>>>>,
-        NoSolution,
-    >,
-
-    /// Do not call this query directly: invoke `infcx.predicate_may_hold()` or
-    /// `infcx.predicate_must_hold()` instead.
-    [] fn evaluate_obligation: EvaluateObligation(
-        CanonicalPredicateGoal<'tcx>
-    ) -> Result<traits::EvaluationResult, traits::OverflowError>,
-
-    /// Do not call this query directly: part of the `Eq` type-op
-    [] fn type_op_eq: TypeOpEq(
-        CanonicalTypeOpEqGoal<'tcx>
-    ) -> Result<
-        Lrc<Canonical<'tcx, canonical::QueryResult<'tcx, ()>>>,
-        NoSolution,
-    >,
-
-    /// Do not call this query directly: part of the `Subtype` type-op
-    [] fn type_op_subtype: TypeOpSubtype(
-        CanonicalTypeOpSubtypeGoal<'tcx>
-    ) -> Result<
-        Lrc<Canonical<'tcx, canonical::QueryResult<'tcx, ()>>>,
-        NoSolution,
-    >,
-
-    /// Do not call this query directly: part of the `ProvePredicate` type-op
-    [] fn type_op_prove_predicate: TypeOpProvePredicate(
-        CanonicalTypeOpProvePredicateGoal<'tcx>
-    ) -> Result<
-        Lrc<Canonical<'tcx, canonical::QueryResult<'tcx, ()>>>,
-        NoSolution,
-    >,
-
-    /// Do not call this query directly: part of the `Normalize` type-op
-    [] fn type_op_normalize_ty: TypeOpNormalizeTy(
-        CanonicalTypeOpNormalizeGoal<'tcx, Ty<'tcx>>
-    ) -> Result<
-        Lrc<Canonical<'tcx, canonical::QueryResult<'tcx, Ty<'tcx>>>>,
-        NoSolution,
-    >,
-
-    /// Do not call this query directly: part of the `Normalize` type-op
-    [] fn type_op_normalize_predicate: TypeOpNormalizePredicate(
-        CanonicalTypeOpNormalizeGoal<'tcx, ty::Predicate<'tcx>>
-    ) -> Result<
-        Lrc<Canonical<'tcx, canonical::QueryResult<'tcx, ty::Predicate<'tcx>>>>,
-        NoSolution,
-    >,
-
-    /// Do not call this query directly: part of the `Normalize` type-op
-    [] fn type_op_normalize_poly_fn_sig: TypeOpNormalizePolyFnSig(
-        CanonicalTypeOpNormalizeGoal<'tcx, ty::PolyFnSig<'tcx>>
-    ) -> Result<
-        Lrc<Canonical<'tcx, canonical::QueryResult<'tcx, ty::PolyFnSig<'tcx>>>>,
-        NoSolution,
-    >,
-
-    /// Do not call this query directly: part of the `Normalize` type-op
-    [] fn type_op_normalize_fn_sig: TypeOpNormalizeFnSig(
-        CanonicalTypeOpNormalizeGoal<'tcx, ty::FnSig<'tcx>>
-    ) -> Result<
-        Lrc<Canonical<'tcx, canonical::QueryResult<'tcx, ty::FnSig<'tcx>>>>,
-        NoSolution,
-    >,
-
-    [] fn substitute_normalize_and_test_predicates:
-        substitute_normalize_and_test_predicates_node((DefId, &'tcx Substs<'tcx>)) -> bool,
-
-    [] fn target_features_whitelist:
-        target_features_whitelist_node(CrateNum) -> Lrc<FxHashMap<String, Option<String>>>,
-
-    // Get an estimate of the size of an InstanceDef based on its MIR for CGU partitioning.
-    [] fn instance_def_size_estimate: instance_def_size_estimate_dep_node(ty::InstanceDef<'tcx>)
-        -> usize,
-
-    [] fn features_query: features_node(CrateNum) -> Lrc<feature_gate::Features>,
-
-    [] fn program_clauses_for: ProgramClausesFor(DefId) -> Clauses<'tcx>,
-
-    [] fn program_clauses_for_env: ProgramClausesForEnv(
-        ty::ParamEnv<'tcx>
-    ) -> Clauses<'tcx>,
-
-    [] fn wasm_import_module_map: WasmImportModuleMap(CrateNum)
-        -> Lrc<FxHashMap<DefId, String>>,
+    Other {
+        /// Records the type of every item.
+        [] fn type_of: TypeOfItem(DefId) -> Ty<'tcx>,
+
+        /// Maps from the def-id of an item (trait/struct/enum/fn) to its
+        /// associated generics.
+        [] fn generics_of: GenericsOfItem(DefId) -> &'tcx ty::Generics,
+
+        /// Maps from the def-id of an item (trait/struct/enum/fn) to the
+        /// predicates (where clauses) that must be proven true in order
+        /// to reference it. This is almost always the "predicates query"
+        /// that you want.
+        ///
+        /// `predicates_of` builds on `predicates_defined_on` -- in fact,
+        /// it is almost always the same as that query, except for the
+        /// case of traits. For traits, `predicates_of` contains
+        /// an additional `Self: Trait<...>` predicate that users don't
+        /// actually write. This reflects the fact that to invoke the
+        /// trait (e.g., via `Default::default`) you must supply types
+        /// that actually implement the trait. (However, this extra
+        /// predicate gets in the way of some checks, which are intended
+        /// to operate over only the actual where-clauses written by the
+        /// user.)
+        [] fn predicates_of: PredicatesOfItem(DefId) -> ty::GenericPredicates<'tcx>,
+
+        /// Maps from the def-id of an item (trait/struct/enum/fn) to the
+        /// predicates (where clauses) directly defined on it. This is
+        /// equal to the `explicit_predicates_of` predicates plus the
+        /// `inferred_outlives_of` predicates.
+        [] fn predicates_defined_on: PredicatesDefinedOnItem(DefId) -> ty::GenericPredicates<'tcx>,
+
+        /// Returns the predicates written explicit by the user.
+        [] fn explicit_predicates_of: ExplicitPredicatesOfItem(DefId)
+            -> ty::GenericPredicates<'tcx>,
+
+        /// Returns the inferred outlives predicates (e.g., for `struct
+        /// Foo<'a, T> { x: &'a T }`, this would return `T: 'a`).
+        [] fn inferred_outlives_of: InferredOutlivesOf(DefId) -> Lrc<Vec<ty::Predicate<'tcx>>>,
+
+        /// Maps from the def-id of a trait to the list of
+        /// super-predicates. This is a subset of the full list of
+        /// predicates. We store these in a separate map because we must
+        /// evaluate them even during type conversion, often before the
+        /// full predicates are available (note that supertraits have
+        /// additional acyclicity requirements).
+        [] fn super_predicates_of: SuperPredicatesOfItem(DefId) -> ty::GenericPredicates<'tcx>,
+
+        /// To avoid cycles within the predicates of a single item we compute
+        /// per-type-parameter predicates for resolving `T::AssocTy`.
+        [] fn type_param_predicates: type_param_predicates((DefId, DefId))
+            -> ty::GenericPredicates<'tcx>,
+
+        [] fn trait_def: TraitDefOfItem(DefId) -> &'tcx ty::TraitDef,
+        [] fn adt_def: AdtDefOfItem(DefId) -> &'tcx ty::AdtDef,
+        [] fn adt_destructor: AdtDestructor(DefId) -> Option<ty::Destructor>,
+        [] fn adt_sized_constraint: SizedConstraint(DefId) -> &'tcx [Ty<'tcx>],
+        [] fn adt_dtorck_constraint: DtorckConstraint(
+            DefId
+        ) -> Result<DtorckConstraint<'tcx>, NoSolution>,
+
+        /// True if this is a const fn
+        [] fn is_const_fn: IsConstFn(DefId) -> bool,
+
+        /// True if this is a foreign item (i.e., linked via `extern { ... }`).
+        [] fn is_foreign_item: IsForeignItem(DefId) -> bool,
+
+        /// Get a map with the variance of every item; use `item_variance`
+        /// instead.
+        [] fn crate_variances: crate_variances(CrateNum) -> Lrc<ty::CrateVariancesMap>,
+
+        /// Maps from def-id of a type or region parameter to its
+        /// (inferred) variance.
+        [] fn variances_of: ItemVariances(DefId) -> Lrc<Vec<ty::Variance>>,
+    },
+
+    TypeChecking {
+        /// Maps from def-id of a type to its (inferred) outlives.
+        [] fn inferred_outlives_crate: InferredOutlivesCrate(CrateNum)
+            -> Lrc<ty::CratePredicatesMap<'tcx>>,
+    },
+
+    Other {
+        /// Maps from an impl/trait def-id to a list of the def-ids of its items
+        [] fn associated_item_def_ids: AssociatedItemDefIds(DefId) -> Lrc<Vec<DefId>>,
+
+        /// Maps from a trait item to the trait item "descriptor"
+        [] fn associated_item: AssociatedItems(DefId) -> ty::AssociatedItem,
+
+        [] fn impl_trait_ref: ImplTraitRef(DefId) -> Option<ty::TraitRef<'tcx>>,
+        [] fn impl_polarity: ImplPolarity(DefId) -> hir::ImplPolarity,
+    },
+
+    TypeChecking {
+        /// Maps a DefId of a type to a list of its inherent impls.
+        /// Contains implementations of methods that are inherent to a type.
+        /// Methods in these implementations don't need to be exported.
+        [] fn inherent_impls: InherentImpls(DefId) -> Lrc<Vec<DefId>>,
+    },
+
+    Codegen {
+        /// Set of all the def-ids in this crate that have MIR associated with
+        /// them. This includes all the body owners, but also things like struct
+        /// constructors.
+        [] fn mir_keys: mir_keys(CrateNum) -> Lrc<DefIdSet>,
+
+        /// Maps DefId's that have an associated Mir to the result
+        /// of the MIR qualify_consts pass. The actual meaning of
+        /// the value isn't known except to the pass itself.
+        [] fn mir_const_qualif: MirConstQualif(DefId) -> (u8, Lrc<IdxSetBuf<mir::Local>>),
+
+        /// Fetch the MIR for a given def-id right after it's built - this includes
+        /// unreachable code.
+        [] fn mir_built: MirBuilt(DefId) -> &'tcx Steal<mir::Mir<'tcx>>,
+
+        /// Fetch the MIR for a given def-id up till the point where it is
+        /// ready for const evaluation.
+        ///
+        /// See the README for the `mir` module for details.
+        [] fn mir_const: MirConst(DefId) -> &'tcx Steal<mir::Mir<'tcx>>,
+
+        [] fn mir_validated: MirValidated(DefId) -> &'tcx Steal<mir::Mir<'tcx>>,
+
+        /// MIR after our optimization passes have run. This is MIR that is ready
+        /// for codegen. This is also the only query that can fetch non-local MIR, at present.
+        [] fn optimized_mir: MirOptimized(DefId) -> &'tcx mir::Mir<'tcx>,
+    },
+
+    TypeChecking {
+        /// The result of unsafety-checking this def-id.
+        [] fn unsafety_check_result: UnsafetyCheckResult(DefId) -> mir::UnsafetyCheckResult,
+
+        /// HACK: when evaluated, this reports a "unsafe derive on repr(packed)" error
+        [] fn unsafe_derive_on_repr_packed: UnsafeDeriveOnReprPacked(DefId) -> (),
+
+        /// The signature of functions and closures.
+        [] fn fn_sig: FnSignature(DefId) -> ty::PolyFnSig<'tcx>,
+    },
+
+    Other {
+        /// Caches CoerceUnsized kinds for impls on custom types.
+        [] fn coerce_unsized_info: CoerceUnsizedInfo(DefId)
+            -> ty::adjustment::CoerceUnsizedInfo,
+    },
+
+    TypeChecking {
+        [] fn typeck_item_bodies: typeck_item_bodies_dep_node(CrateNum) -> CompileResult,
+
+        [] fn typeck_tables_of: TypeckTables(DefId) -> &'tcx ty::TypeckTables<'tcx>,
+    },
+
+    Other {
+        [] fn used_trait_imports: UsedTraitImports(DefId) -> Lrc<DefIdSet>,
+    },
+
+    TypeChecking {
+        [] fn has_typeck_tables: HasTypeckTables(DefId) -> bool,
+
+        [] fn coherent_trait: CoherenceCheckTrait(DefId) -> (),
+    },
+
+    BorrowChecking {
+        [] fn borrowck: BorrowCheck(DefId) -> Lrc<BorrowCheckResult>,
+
+        /// Borrow checks the function body. If this is a closure, returns
+        /// additional requirements that the closure's creator must verify.
+        [] fn mir_borrowck: MirBorrowCheck(DefId) -> mir::BorrowCheckResult<'tcx>,
+    },
+
+    TypeChecking {
+        /// Gets a complete map from all types to their inherent impls.
+        /// Not meant to be used directly outside of coherence.
+        /// (Defined only for LOCAL_CRATE)
+        [] fn crate_inherent_impls: crate_inherent_impls_dep_node(CrateNum) -> CrateInherentImpls,
+
+        /// Checks all types in the krate for overlap in their inherent impls. Reports errors.
+        /// Not meant to be used directly outside of coherence.
+        /// (Defined only for LOCAL_CRATE)
+        [] fn crate_inherent_impls_overlap_check: inherent_impls_overlap_check_dep_node(CrateNum)
+            -> (),
+    },
+
+    Other {
+        /// Results of evaluating const items or constants embedded in
+        /// other items (such as enum variant explicit discriminants).
+        [] fn const_eval: const_eval_dep_node(ty::ParamEnvAnd<'tcx, GlobalId<'tcx>>)
+            -> ConstEvalResult<'tcx>,
+
+        /// Converts a constant value to an constant allocation
+        [] fn const_value_to_allocation: const_value_to_allocation(
+            &'tcx ty::Const<'tcx>
+        ) -> &'tcx Allocation,
+    },
+
+    TypeChecking {
+        [] fn check_match: CheckMatch(DefId)
+            -> Result<(), ErrorReported>,
+
+        /// Performs the privacy check and computes "access levels".
+        [] fn privacy_access_levels: PrivacyAccessLevels(CrateNum) -> Lrc<AccessLevels>,
+    },
+
+    Other {
+        [] fn reachable_set: reachability_dep_node(CrateNum) -> ReachableSet,
+
+        /// Per-body `region::ScopeTree`. The `DefId` should be the owner-def-id for the body;
+        /// in the case of closures, this will be redirected to the enclosing function.
+        [] fn region_scope_tree: RegionScopeTree(DefId) -> Lrc<region::ScopeTree>,
+
+        [] fn mir_shims: mir_shim_dep_node(ty::InstanceDef<'tcx>) -> &'tcx mir::Mir<'tcx>,
+
+        [] fn def_symbol_name: SymbolName(DefId) -> ty::SymbolName,
+        [] fn symbol_name: symbol_name_dep_node(ty::Instance<'tcx>) -> ty::SymbolName,
+
+        [] fn describe_def: DescribeDef(DefId) -> Option<Def>,
+        [] fn def_span: DefSpan(DefId) -> Span,
+        [] fn lookup_stability: LookupStability(DefId) -> Option<&'tcx attr::Stability>,
+        [] fn lookup_deprecation_entry: LookupDeprecationEntry(DefId) -> Option<DeprecationEntry>,
+        [] fn item_attrs: ItemAttrs(DefId) -> Lrc<[ast::Attribute]>,
+    },
+
+    Codegen {
+        [] fn codegen_fn_attrs: codegen_fn_attrs(DefId) -> CodegenFnAttrs,
+    },
+
+    Other {
+        [] fn fn_arg_names: FnArgNames(DefId) -> Vec<ast::Name>,
+        /// Gets the rendered value of the specified constant or associated constant.
+        /// Used by rustdoc.
+        [] fn rendered_const: RenderedConst(DefId) -> String,
+        [] fn impl_parent: ImplParent(DefId) -> Option<DefId>,
+    },
+
+    TypeChecking {
+        [] fn trait_of_item: TraitOfItem(DefId) -> Option<DefId>,
+        [] fn const_is_rvalue_promotable_to_static: ConstIsRvaluePromotableToStatic(DefId) -> bool,
+        [] fn rvalue_promotable_map: RvaluePromotableMap(DefId) -> Lrc<ItemLocalSet>,
+    },
+
+    Codegen {
+        [] fn is_mir_available: IsMirAvailable(DefId) -> bool,
+    },
+
+    Other {
+        [] fn vtable_methods: vtable_methods_node(ty::PolyTraitRef<'tcx>)
+                            -> Lrc<Vec<Option<(DefId, &'tcx Substs<'tcx>)>>>,
+    },
+
+    Codegen {
+        [] fn codegen_fulfill_obligation: fulfill_obligation_dep_node(
+            (ty::ParamEnv<'tcx>, ty::PolyTraitRef<'tcx>)) -> Vtable<'tcx, ()>,
+    },
+
+    TypeChecking {
+        [] fn trait_impls_of: TraitImpls(DefId) -> Lrc<ty::trait_def::TraitImpls>,
+        [] fn specialization_graph_of: SpecializationGraph(DefId)
+            -> Lrc<specialization_graph::Graph>,
+        [] fn is_object_safe: ObjectSafety(DefId) -> bool,
+
+        // Get the ParameterEnvironment for a given item; this environment
+        // will be in "user-facing" mode, meaning that it is suitabe for
+        // type-checking etc, and it does not normalize specializable
+        // associated types. This is almost always what you want,
+        // unless you are doing MIR optimizations, in which case you
+        // might want to use `reveal_all()` method to change modes.
+        [] fn param_env: ParamEnv(DefId) -> ty::ParamEnv<'tcx>,
+
+        // Trait selection queries. These are best used by invoking `ty.moves_by_default()`,
+        // `ty.is_copy()`, etc, since that will prune the environment where possible.
+        [] fn is_copy_raw: is_copy_dep_node(ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool,
+        [] fn is_sized_raw: is_sized_dep_node(ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool,
+        [] fn is_freeze_raw: is_freeze_dep_node(ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool,
+        [] fn needs_drop_raw: needs_drop_dep_node(ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool,
+        [] fn layout_raw: layout_dep_node(ty::ParamEnvAnd<'tcx, Ty<'tcx>>)
+                                    -> Result<&'tcx ty::layout::LayoutDetails,
+                                                ty::layout::LayoutError<'tcx>>,
+    },
+
+    Other {
+        [] fn dylib_dependency_formats: DylibDepFormats(CrateNum)
+                                        -> Lrc<Vec<(CrateNum, LinkagePreference)>>,
+    },
+
+    Codegen {
+        [fatal_cycle] fn is_panic_runtime: IsPanicRuntime(CrateNum) -> bool,
+        [fatal_cycle] fn is_compiler_builtins: IsCompilerBuiltins(CrateNum) -> bool,
+        [fatal_cycle] fn has_global_allocator: HasGlobalAllocator(CrateNum) -> bool,
+        [fatal_cycle] fn is_sanitizer_runtime: IsSanitizerRuntime(CrateNum) -> bool,
+        [fatal_cycle] fn is_profiler_runtime: IsProfilerRuntime(CrateNum) -> bool,
+        [fatal_cycle] fn panic_strategy: GetPanicStrategy(CrateNum) -> PanicStrategy,
+        [fatal_cycle] fn is_no_builtins: IsNoBuiltins(CrateNum) -> bool,
+
+        [] fn extern_crate: ExternCrate(DefId) -> Lrc<Option<ExternCrate>>,
+    },
+
+    TypeChecking {
+        [] fn specializes: specializes_node((DefId, DefId)) -> bool,
+        [] fn in_scope_traits_map: InScopeTraits(DefIndex)
+            -> Option<Lrc<FxHashMap<ItemLocalId, Lrc<StableVec<TraitCandidate>>>>>,
+    },
+
+    Other {
+        [] fn module_exports: ModuleExports(DefId) -> Option<Lrc<Vec<Export>>>,
+        [] fn lint_levels: lint_levels_node(CrateNum) -> Lrc<lint::LintLevelMap>,
+    },
+
+    TypeChecking {
+        [] fn impl_defaultness: ImplDefaultness(DefId) -> hir::Defaultness,
+
+        [] fn check_item_well_formed: CheckItemWellFormed(DefId) -> (),
+        [] fn check_trait_item_well_formed: CheckTraitItemWellFormed(DefId) -> (),
+        [] fn check_impl_item_well_formed: CheckImplItemWellFormed(DefId) -> (),
+    },
+
+    Linking {
+        // The DefIds of all non-generic functions and statics in the given crate
+        // that can be reached from outside the crate.
+        //
+        // We expect this items to be available for being linked to.
+        //
+        // This query can also be called for LOCAL_CRATE. In this case it will
+        // compute which items will be reachable to other crates, taking into account
+        // the kind of crate that is currently compiled. Crates with only a
+        // C interface have fewer reachable things.
+        //
+        // Does not include external symbols that don't have a corresponding DefId,
+        // like the compiler-generated `main` function and so on.
+        [] fn reachable_non_generics: ReachableNonGenerics(CrateNum)
+            -> Lrc<DefIdMap<SymbolExportLevel>>,
+        [] fn is_reachable_non_generic: IsReachableNonGeneric(DefId) -> bool,
+        [] fn is_unreachable_local_definition: IsUnreachableLocalDefinition(DefId) -> bool,
+    },
+
+    Codegen {
+        [] fn upstream_monomorphizations: UpstreamMonomorphizations(CrateNum)
+            -> Lrc<DefIdMap<Lrc<FxHashMap<&'tcx Substs<'tcx>, CrateNum>>>>,
+        [] fn upstream_monomorphizations_for: UpstreamMonomorphizationsFor(DefId)
+            -> Option<Lrc<FxHashMap<&'tcx Substs<'tcx>, CrateNum>>>,
+    },
+
+    Other {
+        [] fn native_libraries: NativeLibraries(CrateNum) -> Lrc<Vec<NativeLibrary>>,
+
+        [] fn foreign_modules: ForeignModules(CrateNum) -> Lrc<Vec<ForeignModule>>,
+
+        [] fn plugin_registrar_fn: PluginRegistrarFn(CrateNum) -> Option<DefId>,
+        [] fn derive_registrar_fn: DeriveRegistrarFn(CrateNum) -> Option<DefId>,
+        [] fn crate_disambiguator: CrateDisambiguator(CrateNum) -> CrateDisambiguator,
+        [] fn crate_hash: CrateHash(CrateNum) -> Svh,
+        [] fn original_crate_name: OriginalCrateName(CrateNum) -> Symbol,
+        [] fn extra_filename: ExtraFileName(CrateNum) -> String,
+    },
+
+    TypeChecking {
+        [] fn implementations_of_trait: implementations_of_trait_node((CrateNum, DefId))
+            -> Lrc<Vec<DefId>>,
+        [] fn all_trait_implementations: AllTraitImplementations(CrateNum)
+            -> Lrc<Vec<DefId>>,
+    },
+
+    Other {
+        [] fn dllimport_foreign_items: DllimportForeignItems(CrateNum)
+            -> Lrc<FxHashSet<DefId>>,
+        [] fn is_dllimport_foreign_item: IsDllimportForeignItem(DefId) -> bool,
+        [] fn is_statically_included_foreign_item: IsStaticallyIncludedForeignItem(DefId) -> bool,
+        [] fn native_library_kind: NativeLibraryKind(DefId)
+            -> Option<NativeLibraryKind>,
+    },
+
+    Linking {
+        [] fn link_args: link_args_node(CrateNum) -> Lrc<Vec<String>>,
+    },
+
+    BorrowChecking {
+        // Lifetime resolution. See `middle::resolve_lifetimes`.
+        [] fn resolve_lifetimes: ResolveLifetimes(CrateNum) -> Lrc<ResolveLifetimes>,
+        [] fn named_region_map: NamedRegion(DefIndex) ->
+            Option<Lrc<FxHashMap<ItemLocalId, Region>>>,
+        [] fn is_late_bound_map: IsLateBound(DefIndex) ->
+            Option<Lrc<FxHashSet<ItemLocalId>>>,
+        [] fn object_lifetime_defaults_map: ObjectLifetimeDefaults(DefIndex)
+            -> Option<Lrc<FxHashMap<ItemLocalId, Lrc<Vec<ObjectLifetimeDefault>>>>>,
+    },
+
+    TypeChecking {
+        [] fn visibility: Visibility(DefId) -> ty::Visibility,
+    },
+
+    Other {
+        [] fn dep_kind: DepKind(CrateNum) -> DepKind,
+        [] fn crate_name: CrateName(CrateNum) -> Symbol,
+        [] fn item_children: ItemChildren(DefId) -> Lrc<Vec<Export>>,
+        [] fn extern_mod_stmt_cnum: ExternModStmtCnum(DefId) -> Option<CrateNum>,
+
+        [] fn get_lang_items: get_lang_items_node(CrateNum) -> Lrc<LanguageItems>,
+        [] fn defined_lang_items: DefinedLangItems(CrateNum) -> Lrc<Vec<(DefId, usize)>>,
+        [] fn missing_lang_items: MissingLangItems(CrateNum) -> Lrc<Vec<LangItem>>,
+        [] fn visible_parent_map: visible_parent_map_node(CrateNum)
+            -> Lrc<DefIdMap<DefId>>,
+        [] fn missing_extern_crate_item: MissingExternCrateItem(CrateNum) -> bool,
+        [] fn used_crate_source: UsedCrateSource(CrateNum) -> Lrc<CrateSource>,
+        [] fn postorder_cnums: postorder_cnums_node(CrateNum) -> Lrc<Vec<CrateNum>>,
+
+        [] fn freevars: Freevars(DefId) -> Option<Lrc<Vec<hir::Freevar>>>,
+        [] fn maybe_unused_trait_import: MaybeUnusedTraitImport(DefId) -> bool,
+        [] fn maybe_unused_extern_crates: maybe_unused_extern_crates_node(CrateNum)
+            -> Lrc<Vec<(DefId, Span)>>,
+
+        [] fn stability_index: stability_index_node(CrateNum) -> Lrc<stability::Index<'tcx>>,
+        [] fn all_crate_nums: all_crate_nums_node(CrateNum) -> Lrc<Vec<CrateNum>>,
+
+        /// A vector of every trait accessible in the whole crate
+        /// (i.e. including those from subcrates). This is used only for
+        /// error reporting.
+        [] fn all_traits: all_traits_node(CrateNum) -> Lrc<Vec<DefId>>,
+    },
+
+    Linking {
+        [] fn exported_symbols: ExportedSymbols(CrateNum)
+            -> Arc<Vec<(ExportedSymbol<'tcx>, SymbolExportLevel)>>,
+    },
+
+    Codegen {
+        [] fn collect_and_partition_mono_items:
+            collect_and_partition_mono_items_node(CrateNum)
+            -> (Arc<DefIdSet>, Arc<Vec<Arc<CodegenUnit<'tcx>>>>),
+        [] fn is_codegened_item: IsCodegenedItem(DefId) -> bool,
+        [] fn codegen_unit: CodegenUnit(InternedString) -> Arc<CodegenUnit<'tcx>>,
+        [] fn compile_codegen_unit: CompileCodegenUnit(InternedString) -> Stats,
+    },
+
+    Other {
+        [] fn output_filenames: output_filenames_node(CrateNum)
+            -> Arc<OutputFilenames>,
+    },
+
+    TypeChecking {
+        // Erases regions from `ty` to yield a new type.
+        // Normally you would just use `tcx.erase_regions(&value)`,
+        // however, which uses this query as a kind of cache.
+        [] fn erase_regions_ty: erase_regions_ty(Ty<'tcx>) -> Ty<'tcx>,
+
+        /// Do not call this query directly: invoke `normalize` instead.
+        [] fn normalize_projection_ty: NormalizeProjectionTy(
+            CanonicalProjectionGoal<'tcx>
+        ) -> Result<
+            Lrc<Canonical<'tcx, canonical::QueryResult<'tcx, NormalizationResult<'tcx>>>>,
+            NoSolution,
+        >,
+
+        /// Do not call this query directly: invoke `normalize_erasing_regions` instead.
+        [] fn normalize_ty_after_erasing_regions: NormalizeTyAfterErasingRegions(
+            ParamEnvAnd<'tcx, Ty<'tcx>>
+        ) -> Ty<'tcx>,
+
+        /// Do not call this query directly: invoke `infcx.at().dropck_outlives()` instead.
+        [] fn dropck_outlives: DropckOutlives(
+            CanonicalTyGoal<'tcx>
+        ) -> Result<
+            Lrc<Canonical<'tcx, canonical::QueryResult<'tcx, DropckOutlivesResult<'tcx>>>>,
+            NoSolution,
+        >,
+
+        /// Do not call this query directly: invoke `infcx.predicate_may_hold()` or
+        /// `infcx.predicate_must_hold()` instead.
+        [] fn evaluate_obligation: EvaluateObligation(
+            CanonicalPredicateGoal<'tcx>
+        ) -> Result<traits::EvaluationResult, traits::OverflowError>,
+
+        /// Do not call this query directly: part of the `Eq` type-op
+        [] fn type_op_eq: TypeOpEq(
+            CanonicalTypeOpEqGoal<'tcx>
+        ) -> Result<
+            Lrc<Canonical<'tcx, canonical::QueryResult<'tcx, ()>>>,
+            NoSolution,
+        >,
+
+        /// Do not call this query directly: part of the `Subtype` type-op
+        [] fn type_op_subtype: TypeOpSubtype(
+            CanonicalTypeOpSubtypeGoal<'tcx>
+        ) -> Result<
+            Lrc<Canonical<'tcx, canonical::QueryResult<'tcx, ()>>>,
+            NoSolution,
+        >,
+
+        /// Do not call this query directly: part of the `ProvePredicate` type-op
+        [] fn type_op_prove_predicate: TypeOpProvePredicate(
+            CanonicalTypeOpProvePredicateGoal<'tcx>
+        ) -> Result<
+            Lrc<Canonical<'tcx, canonical::QueryResult<'tcx, ()>>>,
+            NoSolution,
+        >,
+
+        /// Do not call this query directly: part of the `Normalize` type-op
+        [] fn type_op_normalize_ty: TypeOpNormalizeTy(
+            CanonicalTypeOpNormalizeGoal<'tcx, Ty<'tcx>>
+        ) -> Result<
+            Lrc<Canonical<'tcx, canonical::QueryResult<'tcx, Ty<'tcx>>>>,
+            NoSolution,
+        >,
+
+        /// Do not call this query directly: part of the `Normalize` type-op
+        [] fn type_op_normalize_predicate: TypeOpNormalizePredicate(
+            CanonicalTypeOpNormalizeGoal<'tcx, ty::Predicate<'tcx>>
+        ) -> Result<
+            Lrc<Canonical<'tcx, canonical::QueryResult<'tcx, ty::Predicate<'tcx>>>>,
+            NoSolution,
+        >,
+
+        /// Do not call this query directly: part of the `Normalize` type-op
+        [] fn type_op_normalize_poly_fn_sig: TypeOpNormalizePolyFnSig(
+            CanonicalTypeOpNormalizeGoal<'tcx, ty::PolyFnSig<'tcx>>
+        ) -> Result<
+            Lrc<Canonical<'tcx, canonical::QueryResult<'tcx, ty::PolyFnSig<'tcx>>>>,
+            NoSolution,
+        >,
+
+        /// Do not call this query directly: part of the `Normalize` type-op
+        [] fn type_op_normalize_fn_sig: TypeOpNormalizeFnSig(
+            CanonicalTypeOpNormalizeGoal<'tcx, ty::FnSig<'tcx>>
+        ) -> Result<
+            Lrc<Canonical<'tcx, canonical::QueryResult<'tcx, ty::FnSig<'tcx>>>>,
+            NoSolution,
+        >,
+
+        [] fn substitute_normalize_and_test_predicates:
+            substitute_normalize_and_test_predicates_node((DefId, &'tcx Substs<'tcx>)) -> bool,
+    },
+
+    Other {
+        [] fn target_features_whitelist:
+            target_features_whitelist_node(CrateNum) -> Lrc<FxHashMap<String, Option<String>>>,
+
+        // Get an estimate of the size of an InstanceDef based on its MIR for CGU partitioning.
+        [] fn instance_def_size_estimate: instance_def_size_estimate_dep_node(ty::InstanceDef<'tcx>)
+            -> usize,
+
+        [] fn features_query: features_node(CrateNum) -> Lrc<feature_gate::Features>,
+    },
+
+    TypeChecking {
+        [] fn program_clauses_for: ProgramClausesFor(DefId) -> Clauses<'tcx>,
+
+        [] fn program_clauses_for_env: ProgramClausesForEnv(
+            ty::ParamEnv<'tcx>
+        ) -> Clauses<'tcx>,
+    },
+
+    Linking {
+        [] fn wasm_import_module_map: WasmImportModuleMap(CrateNum)
+            -> Lrc<FxHashMap<DefId, String>>,
+    },
 }
 
 // `try_get_query` can't be public because it uses the private query
index 9dc8321f82575092efefde3190b97208f93df534..78e1a6425465b8a2c40401ee8414253c6d78dbe7 100644 (file)
@@ -631,9 +631,19 @@ macro_rules! handle_cycle_error {
 }
 
 macro_rules! define_queries {
+    (<$tcx:tt> $($category:tt {
+        $($(#[$attr:meta])* [$($modifiers:tt)*] fn $name:ident: $node:ident($K:ty) -> $V:ty,)*
+    },)*) => {
+        define_queries_inner! { <$tcx>
+            $($( $(#[$attr])* category<$category> [$($modifiers)*] fn $name: $node($K) -> $V,)*)*
+        }
+    }
+}
+
+macro_rules! define_queries_inner {
     (<$tcx:tt>
-     $($(#[$attr:meta])*
-       [$($modifiers:tt)*] fn $name:ident: $node:ident($K:ty) -> $V:ty,)*) => {
+     $($(#[$attr:meta])* category<$category:tt>
+        [$($modifiers:tt)*] fn $name:ident: $node:ident($K:ty) -> $V:ty,)*) => {
 
         use std::mem;
         #[cfg(parallel_queries)]