Auto merge of #155678 - aerooneqq:single-owners-query-exp, r=oli-obk

Merge several HIR-level queries into one



Now four queries (`local_def_id_to_hir_id`, `opt_hir_owner_nodes`, `opt_ast_lowering_delayed_lints`, `in_scope_traits_map`) were replaced with regular methods which acts like getters. 
An `hir_owner` query was added that returns a `ProjectedMaybeOwner` that contains all those fields. `hir_attr_map` remains a separate query as adding attributes to `ProjectedMaybeOwner` led to [perf regressions](https://github.com/rust-lang/rust/pull/155678#issuecomment-4304597871). 
There is a similar issue with `in_scopes_trait_map`, but according to the comments from https://github.com/rust-lang/rustc-perf/pull/2436 it is a rare case.
Most of the changes in incremental tests are renames from `opt_hir_owner_nodes` -> `hir_owner`, but there are few cases when new dirty queries were added.

r? @petrochenkov
r? @oli-obk

compiler/rustc_incremental/src/assert_dep_graph.rs

@@ -113,11 +113,9 @@ fn process_attrs(&mut self, def_id: LocalDefId) {
         for attr in attrs {
             if let Attribute::Parsed(AttributeKind::RustcIfThisChanged(span, dep_node)) = *attr {
                 let dep_node = match dep_node {
-                    None => DepNode::from_def_path_hash(
-                        self.tcx,
-                        def_path_hash,
-                        DepKind::opt_hir_owner_nodes,
-                    ),
+                    None => {
+                        DepNode::from_def_path_hash(self.tcx, def_path_hash, DepKind::hir_owner)
+                    }
                     Some(n) => {
                         match DepNode::from_label_string(self.tcx, n.as_str(), def_path_hash) {
                             Ok(n) => n,

compiler/rustc_incremental/src/persist/clean.rs

@@ -54,8 +54,8 @@
 
 /// DepNodes for Hir, which is pretty much everything
 const BASE_HIR: &[&str] = &[
-    // opt_hir_owner_nodes should be computed for all nodes
-    label_strs::opt_hir_owner_nodes,
+    // hir_owner should be computed for all nodes
+    label_strs::hir_owner,
 ];
 
 /// `impl` implementation of struct/trait

compiler/rustc_interface/src/passes.rs

@@ -879,9 +879,9 @@ pub fn write_interface<'tcx>(tcx: TyCtxt<'tcx>) {
     providers.queries.analysis = analysis;
     providers.queries.hir_crate = rustc_ast_lowering::lower_to_hir;
     providers.queries.lower_delayed_owner = rustc_ast_lowering::lower_delayed_owner;
-    // `delayed_owner` is fed during `lower_delayed_owner`, by default it returns phantom,
+    // `hir_delayed_owner` is fed during `lower_delayed_owner`, by default it returns phantom,
     // as if this query was not fed it means that `MaybeOwner` does not exist for provided LocalDefId.
-    providers.queries.delayed_owner = |_, _| MaybeOwner::Phantom;
+    providers.queries.hir_delayed_owner = |_, _| MaybeOwner::Phantom;
     providers.queries.resolver_for_lowering_raw = resolver_for_lowering_raw;
     providers.queries.stripped_cfg_items = |tcx, _| &tcx.resolutions(()).stripped_cfg_items[..];
     providers.queries.resolutions = |tcx, ()| tcx.resolver_for_lowering_raw(()).1;

compiler/rustc_middle/src/arena.rs

@@ -118,6 +118,11 @@ macro_rules! arena_types {
             [] crate_inherent_impls: rustc_middle::ty::CrateInherentImpls,
             [] hir_owner_nodes: rustc_hir::OwnerNodes<'tcx>,
             [decode] token_stream: rustc_ast::tokenstream::TokenStream,
+            [] maybe_owner: rustc_middle::hir::ProjectedMaybeOwner<'tcx>,
+            [] owner_info: rustc_middle::hir::ProjectedOwnerInfo<'tcx>,
+            [] parenting: rustc_hir::def_id::LocalDefIdMap<rustc_hir::ItemLocalId>,
+            [] trait_candidates: rustc_hir::ItemLocalMap<&'tcx [rustc_hir::TraitCandidate<'tcx>]>,
+            [] delayed_lints: rustc_data_structures::steal::Steal<rustc_hir::lints::DelayedLints>,
         ]);
     )
 }

compiler/rustc_middle/src/dep_graph/graph.rs

@@ -213,6 +213,14 @@ pub fn assert_ignored(&self) {
         }
     }
 
+    pub fn assert_eval_always(&self) {
+        if self.data.is_some() {
+            read_deps(|deps| {
+                assert_matches!(deps, TaskDepsRef::EvalAlways, "expected eval always context")
+            });
+        }
+    }
+
     pub fn with_ignore<OP, R>(&self, op: OP) -> R
     where
         OP: FnOnce() -> R,

compiler/rustc_middle/src/hir/map.rs

@@ -6,20 +6,22 @@
 use rustc_ast::visit::{VisitorResult, walk_list};
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::stable_hash::{StableHash, StableHasher};
+use rustc_data_structures::steal::Steal;
 use rustc_data_structures::svh::Svh;
 use rustc_data_structures::sync::{DynSend, DynSync, par_for_each_in, spawn, try_par_for_each_in};
 use rustc_hir::def::{DefKind, Res};
 use rustc_hir::def_id::{DefId, LOCAL_CRATE, LocalDefId, LocalModDefId};
 use rustc_hir::definitions::{DefKey, DefPath, DefPathHash};
 use rustc_hir::intravisit::Visitor;
+use rustc_hir::lints::DelayedLints;
 use rustc_hir::*;
 use rustc_hir_pretty as pprust_hir;
 use rustc_span::def_id::StableCrateId;
 use rustc_span::{ErrorGuaranteed, Ident, Span, Symbol, kw, with_metavar_spans};
 
-use crate::hir::{ModuleItems, nested_filter};
+use crate::hir::{ModuleItems, ProjectedMaybeOwner, nested_filter};
 use crate::middle::debugger_visualizer::DebuggerVisualizerFile;
-use crate::query::LocalCrate;
+use crate::query::{IntoQueryKey, LocalCrate};
 use crate::ty::TyCtxt;
 
 /// An iterator that walks up the ancestor tree of a given `HirId`.
@@ -101,6 +103,37 @@ fn next(&mut self) -> Option<Self::Item> {
 }
 
 impl<'tcx> TyCtxt<'tcx> {
+    #[inline]
+    pub fn local_def_id_to_hir_id(self, def_id: impl IntoQueryKey<LocalDefId>) -> HirId {
+        let def_id = def_id.into_query_key();
+        match self.hir_owner(def_id) {
+            ProjectedMaybeOwner::Owner(_) => HirId::make_owner(def_id),
+            ProjectedMaybeOwner::NonOwner(hir_id) => hir_id,
+        }
+    }
+
+    /// This function is used only inside eval-always query `analysis`
+    /// (`analysis -> run_required_analysis` -> `emit_delayed_lints`), so it is safe
+    /// to obtain delayed lints from non-eval-always `owner` query.
+    #[inline]
+    pub fn opt_ast_lowering_delayed_lints(self, id: OwnerId) -> Option<&'tcx Steal<DelayedLints>> {
+        self.dep_graph.assert_eval_always();
+        self.hir_owner(id.def_id).as_owner().map(|o| o.delayed_lints)
+    }
+
+    #[inline]
+    pub fn in_scope_traits_map(
+        self,
+        id: OwnerId,
+    ) -> Option<&'tcx ItemLocalMap<&'tcx [TraitCandidate<'tcx>]>> {
+        self.hir_owner(id.def_id).as_owner().map(|o| o.trait_map)
+    }
+
+    #[inline]
+    pub fn opt_hir_owner_nodes(self, def_id: LocalDefId) -> Option<&'tcx OwnerNodes<'tcx>> {
+        self.hir_owner(def_id).as_owner().map(|o| o.nodes)
+    }
+
     #[inline]
     fn expect_hir_owner_nodes(self, def_id: LocalDefId) -> &'tcx OwnerNodes<'tcx> {
         self.opt_hir_owner_nodes(def_id)

compiler/rustc_middle/src/hir/mod.rs

@@ -16,7 +16,8 @@
 use rustc_data_structures::steal::Steal;
 use rustc_data_structures::sync::{DynSend, DynSync, try_par_for_each_in};
 use rustc_hir::def::{DefKind, Res};
-use rustc_hir::def_id::{DefId, LocalDefId, LocalModDefId};
+use rustc_hir::def_id::{DefId, LocalDefId, LocalDefIdMap, LocalModDefId};
+use rustc_hir::lints::DelayedLints;
 use rustc_hir::*;
 use rustc_index::IndexVec;
 use rustc_macros::{Decodable, Encodable, StableHash};
@@ -72,7 +73,7 @@ pub fn owner(&self, tcx: TyCtxt<'hir>, def_id: LocalDefId) -> MaybeOwner<'hir> {
             tcx.ensure_done().lower_delayed_owner(def_id);
         }
 
-        tcx.delayed_owner(def_id)
+        tcx.hir_delayed_owner(def_id)
     }
 }
 
@@ -422,8 +423,7 @@ fn hir_owner_parent_impl(self, owner_id: OwnerId) -> HirId {
             HirId {
                 owner: parent_owner_id,
                 local_id: self
-                    .hir_crate(())
-                    .owner(self, parent_owner_id.def_id)
+                    .hir_owner(parent_owner_id.def_id)
                     .unwrap()
                     .parenting
                     .get(&owner_id.def_id)
@@ -452,23 +452,75 @@ pub struct Hashes {
     pub attrs_hash: Option<Fingerprint>,
 }
 
+/// Unites some of `OwnerInfo`'s fields into same struct that is used by `hir_owner` query.
+/// `AttributeMap` is handled separately as placing it in this struct led to perf regressions:
+/// <https://github.com/rust-lang/rust/pull/155678#issuecomment-4304597871>.
+/// This struct is created mainly for uniting/splitting fields of `OwnerInfo` so they are
+/// stored/invalidated together in incremental compilation.
+/// For comments about each field see `OwnerInfo` struct.
+#[derive(Clone, Copy, Debug, StableHash)]
+pub struct ProjectedOwnerInfo<'tcx> {
+    nodes: &'tcx OwnerNodes<'tcx>,
+    parenting: &'tcx LocalDefIdMap<ItemLocalId>,
+    trait_map: &'tcx ItemLocalMap<&'tcx [TraitCandidate<'tcx>]>,
+
+    #[stable_hash(ignore)]
+    delayed_lints: &'tcx Steal<DelayedLints>,
+}
+
+impl<'tcx> ProjectedOwnerInfo<'tcx> {
+    pub fn new(
+        nodes: &'tcx OwnerNodes<'tcx>,
+        parenting: &'tcx LocalDefIdMap<ItemLocalId>,
+        trait_map: &'tcx ItemLocalMap<&'tcx [TraitCandidate<'tcx>]>,
+        delayed_lints: &'tcx Steal<DelayedLints>,
+    ) -> ProjectedOwnerInfo<'tcx> {
+        ProjectedOwnerInfo { nodes, parenting, trait_map, delayed_lints }
+    }
+}
+
+#[derive(Clone, Copy, Debug, StableHash)]
+pub enum ProjectedMaybeOwner<'tcx> {
+    Owner(ProjectedOwnerInfo<'tcx>),
+    NonOwner(HirId),
+}
+
+impl<'tcx> ProjectedMaybeOwner<'tcx> {
+    pub fn new(value: MaybeOwner<'tcx>, def_id: LocalDefId) -> Self {
+        match value {
+            MaybeOwner::Owner(o) => ProjectedMaybeOwner::Owner(ProjectedOwnerInfo {
+                nodes: &o.nodes,
+                parenting: &o.parenting,
+                trait_map: &o.trait_map,
+                delayed_lints: &o.delayed_lints,
+            }),
+            MaybeOwner::NonOwner(hir_id) => ProjectedMaybeOwner::NonOwner(hir_id),
+            MaybeOwner::Phantom => bug!("No HirId for {:?}", def_id),
+        }
+    }
+
+    pub fn as_owner(&self) -> Option<&ProjectedOwnerInfo<'tcx>> {
+        match self {
+            ProjectedMaybeOwner::Owner(i) => Some(i),
+            ProjectedMaybeOwner::NonOwner(_) => None,
+        }
+    }
+
+    pub fn unwrap(&'tcx self) -> &'tcx ProjectedOwnerInfo<'tcx> {
+        self.as_owner().unwrap_or_else(|| panic!("Not a HIR owner"))
+    }
+}
+
 pub fn provide(providers: &mut Providers) {
     providers.hir_crate_items = map::hir_crate_items;
     providers.crate_hash = map::crate_hash;
     providers.hir_module_items = map::hir_module_items;
-    providers.local_def_id_to_hir_id = |tcx, def_id| match tcx.hir_crate(()).owner(tcx, def_id) {
-        MaybeOwner::Owner(_) => HirId::make_owner(def_id),
-        MaybeOwner::NonOwner(hir_id) => hir_id,
-        MaybeOwner::Phantom => bug!("No HirId for {:?}", def_id),
-    };
-    providers.opt_hir_owner_nodes =
-        |tcx, id| tcx.hir_crate(()).owner(tcx, id).as_owner().map(|i| &i.nodes);
-    providers.hir_owner_parent_q = |tcx, owner_id| tcx.hir_owner_parent_impl(owner_id);
     providers.hir_attr_map = |tcx, id| {
         tcx.hir_crate(()).owner(tcx, id.def_id).as_owner().map_or(AttributeMap::EMPTY, |o| &o.attrs)
     };
-    providers.opt_ast_lowering_delayed_lints =
-        |tcx, id| tcx.hir_crate(()).owner(tcx, id.def_id).as_owner().map(|o| &o.delayed_lints);
+    providers.hir_owner =
+        |tcx, def_id| ProjectedMaybeOwner::new(tcx.hir_crate(()).owner(tcx, def_id), def_id);
+    providers.hir_owner_parent_q = |tcx, owner_id| tcx.hir_owner_parent_impl(owner_id);
     providers.def_span = |tcx, def_id| tcx.hir_span(tcx.local_def_id_to_hir_id(def_id));
     providers.def_ident_span = |tcx, def_id| {
         let hir_id = tcx.local_def_id_to_hir_id(def_id);
@@ -508,7 +560,4 @@ pub fn provide(providers: &mut Providers) {
         |tcx, trait_id| tcx.resolutions(()).trait_impls.get(&trait_id).map_or(&[], |xs| &xs[..]);
     providers.expn_that_defined =
         |tcx, id| tcx.resolutions(()).expn_that_defined.get(&id).copied().unwrap_or(ExpnId::root());
-    providers.in_scope_traits_map = |tcx, id| {
-        tcx.hir_crate(()).owner(tcx, id.def_id).as_owner().map(|owner_info| &owner_info.trait_map)
-    };
 }

compiler/rustc_middle/src/queries.rs

@@ -66,7 +66,7 @@
 use rustc_hir::def::{DefKind, DocLinkResMap};
 use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, LocalDefId, LocalDefIdSet, LocalModDefId};
 use rustc_hir::lang_items::{LangItem, LanguageItems};
-use rustc_hir::{ItemLocalId, ItemLocalMap, PreciseCapturingArgKind, TraitCandidate};
+use rustc_hir::{ItemLocalId, PreciseCapturingArgKind};
 use rustc_index::IndexVec;
 use rustc_lint_defs::LintId;
 use rustc_macros::rustc_queries;
@@ -215,7 +215,12 @@
         desc { "lowering the delayed AST owner `{}`", tcx.def_path_str(def_id) }
     }
 
-    query delayed_owner(def_id: LocalDefId) -> hir::MaybeOwner<'tcx>  {
+    query hir_owner(def_id: LocalDefId) -> rustc_middle::hir::ProjectedMaybeOwner<'tcx> {
+        desc { "getting owner for `{}`", tcx.def_path_str(def_id) }
+        feedable
+    }
+
+    query hir_delayed_owner(def_id: LocalDefId) -> hir::MaybeOwner<'tcx>  {
         feedable
         desc { "getting child of lowered delayed AST owner `{}`", tcx.def_path_str(def_id) }
     }
@@ -237,12 +242,6 @@
         cache_on_disk
     }
 
-    /// Returns HIR ID for the given `LocalDefId`.
-    query local_def_id_to_hir_id(key: LocalDefId) -> hir::HirId {
-        desc { "getting HIR ID of `{}`", tcx.def_path_str(key) }
-        feedable
-    }
-
     /// Gives access to the HIR node's parent for the HIR owner `key`.
     ///
     /// This can be conveniently accessed by `tcx.hir_*` methods.
@@ -251,15 +250,6 @@
         desc { "getting HIR parent of `{}`", tcx.def_path_str(key) }
     }
 
-    /// Gives access to the HIR nodes and bodies inside `key` if it's a HIR owner.
-    ///
-    /// This can be conveniently accessed by `tcx.hir_*` methods.
-    /// Avoid calling this query directly.
-    query opt_hir_owner_nodes(key: LocalDefId) -> Option<&'tcx hir::OwnerNodes<'tcx>> {
-        desc { "getting HIR owner items in `{}`", tcx.def_path_str(key) }
-        feedable
-    }
-
     /// Gives access to the HIR attributes inside the HIR owner `key`.
     ///
     /// This can be conveniently accessed by `tcx.hir_*` methods.
@@ -269,18 +259,6 @@
         feedable
     }
 
-    /// Gives access to lints emitted during ast lowering.
-    ///
-    /// This can be conveniently accessed by `tcx.hir_*` methods.
-    /// Avoid calling this query directly.
-    query opt_ast_lowering_delayed_lints(key: hir::OwnerId) -> Option<&'tcx Steal<hir::lints::DelayedLints>> {
-        desc { "getting AST lowering delayed lints in `{}`", tcx.def_path_str(key) }
-        // This query has to be `no_hash` and `eval_always`,
-        // because it accesses `delayed_lints` which is not hashed as part of the HIR
-        no_hash
-        eval_always
-    }
-
     /// Returns the *default* of the const pararameter given by `DefId`.
     ///
     /// E.g., given `struct Ty<const N: usize = 3>;` this returns `3` for `N`.
@@ -1881,10 +1859,6 @@
     query specializes(_: (DefId, DefId)) -> bool {
         desc { "computing whether impls specialize one another" }
     }
-    query in_scope_traits_map(_: hir::OwnerId)
-        -> Option<&'tcx ItemLocalMap<&'tcx [TraitCandidate<'tcx>]>> {
-        desc { "getting traits in scope at a block" }
-    }
 
     /// Returns whether the impl or associated function has the `default` keyword.
     /// Note: This will ICE on inherent impl items. Consider using `AssocItem::defaultness`.

compiler/rustc_middle/src/query/erase.rs

@@ -214,6 +214,7 @@ impl Erasable for $ty {
     rustc_hir::OpaqueTyOrigin<rustc_hir::def_id::DefId>,
     rustc_hir::def::DefKind,
     rustc_hir::def_id::DefId,
+    rustc_middle::hir::ProjectedMaybeOwner<'_>,
     rustc_middle::middle::codegen_fn_attrs::SanitizerFnAttrs,
     rustc_middle::middle::resolve_bound_vars::ObjectLifetimeDefault,
     rustc_middle::mir::ConstQualifs,

compiler/rustc_middle/src/ty/context.rs

@@ -52,6 +52,7 @@
 use crate::arena::Arena;
 use crate::dep_graph::dep_node::make_metadata;
 use crate::dep_graph::{DepGraph, DepKindVTable, DepNodeIndex};
+use crate::hir::{ProjectedMaybeOwner, ProjectedOwnerInfo};
 use crate::ich::StableHashState;
 use crate::infer::canonical::{CanonicalParamEnvCache, CanonicalVarKind};
 use crate::lint::emit_lint_base;
@@ -585,7 +586,7 @@ pub fn feed_anon_const_type(self, key: LocalDefId, value: ty::EarlyBinder<'tcx,
     /// Feeds the HIR delayed owner during AST -> HIR delayed lowering.
     pub fn feed_delayed_owner(self, key: LocalDefId, owner: MaybeOwner<'tcx>) {
         self.dep_graph.assert_ignored();
-        TyCtxtFeed { tcx: self, key }.delayed_owner(owner);
+        TyCtxtFeed { tcx: self, key }.hir_delayed_owner(owner);
     }
 
     // Trait impl item visibility is inherited from its trait when not specified
@@ -626,8 +627,13 @@ pub fn feed_owner_id(&self) -> TyCtxtFeed<'tcx, hir::OwnerId> {
 
     // Fills in all the important parts needed by HIR queries
     pub fn feed_hir(&self) {
-        self.local_def_id_to_hir_id(HirId::make_owner(self.def_id()));
-        self.opt_hir_owner_nodes(Some(self.tcx.arena.alloc(hir::OwnerNodes::synthetic())));
+        self.hir_owner(ProjectedMaybeOwner::Owner(ProjectedOwnerInfo::new(
+            self.tcx.arena.alloc(hir::OwnerNodes::synthetic()),
+            self.tcx.arena.alloc(Default::default()),
+            self.tcx.arena.alloc(Default::default()),
+            self.tcx.arena.alloc(Steal::new(Default::default())),
+        )));
+
         self.feed_owner_id().hir_attr_map(hir::AttributeMap::EMPTY);
     }
 }

tests/incremental/clean.rs

@@ -27,11 +27,11 @@ mod y {
     use x;
 
     #[rustc_clean(
-        except="opt_hir_owner_nodes,generics_of,predicates_of,type_of,fn_sig",
+        except="hir_owner,generics_of,predicates_of,type_of,fn_sig",
         cfg="bfail2",
     )]
     pub fn y() {
-        //[bfail2]~^ ERROR `opt_hir_owner_nodes(y)` should be dirty but is not
+        //[bfail2]~^ ERROR `hir_owner(y)` should be dirty but is not
         //[bfail2]~| ERROR `generics_of(y)` should be dirty but is not
         //[bfail2]~| ERROR `predicates_of(y)` should be dirty but is not
         //[bfail2]~| ERROR `type_of(y)` should be dirty but is not

tests/incremental/hash-module-order.rs

@@ -13,14 +13,14 @@
 #![feature(rustc_attrs)]
 
 #[cfg(rpass1)]
-#[rustc_clean(cfg="rpass1",except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="rpass1",except="hir_owner")]
 mod foo {
     struct First;
     struct Second;
 }
 
 #[cfg(rpass2)]
-#[rustc_clean(cfg="rpass2",except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="rpass2",except="hir_owner")]
 mod foo {
     struct Second;
     struct First;

tests/incremental/hashes/call_expressions.rs

@@ -28,9 +28,9 @@ pub fn change_callee_function() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_callee_function() {
     callee2(1, 2)
@@ -45,9 +45,9 @@ pub fn change_argument_function() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_argument_function() {
     callee1(1, 3)
@@ -62,9 +62,9 @@ mod change_callee_indirectly_function {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::callee2 as callee;
 
-    #[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,typeck_root", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,typeck_root", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     pub fn change_callee_indirectly_function() {
         callee(1, 2)
@@ -86,9 +86,9 @@ pub fn change_callee_method() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_callee_method() {
     let s = Struct;
@@ -105,9 +105,9 @@ pub fn change_argument_method() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_argument_method() {
     let s = Struct;
@@ -124,9 +124,9 @@ pub fn change_ufcs_callee_method() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_ufcs_callee_method() {
     let s = Struct;
@@ -143,9 +143,9 @@ pub fn change_argument_method_ufcs() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_argument_method_ufcs() {
     let s = Struct;
@@ -162,11 +162,11 @@ pub fn change_to_ufcs() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
-// One might think this would be expanded in the opt_hir_owner_nodes/Mir, but it actually
+// One might think this would be expanded in the hir_owner/Mir, but it actually
 // results in slightly different hir_owner/Mir.
 pub fn change_to_ufcs() {
     let s = Struct;
@@ -186,9 +186,9 @@ pub mod change_ufcs_callee_indirectly {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::Struct2 as Struct;
 
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
     #[rustc_clean(cfg="bpass6")]
     pub fn change_ufcs_callee_indirectly() {
         let s = Struct;

tests/incremental/hashes/closure_expressions.rs

@@ -25,9 +25,9 @@ pub fn change_closure_body() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_closure_body() {
     let _ = || 3u32;
@@ -43,9 +43,9 @@ pub fn add_parameter() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_parameter() {
     let x = 0u32;
@@ -61,9 +61,9 @@ pub fn change_parameter_pattern() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_parameter_pattern() {
     let _ = |(x,): (u32,)| x;
@@ -78,9 +78,9 @@ pub fn add_move() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_move() {
     let _ = move || 1;
@@ -96,9 +96,9 @@ pub fn add_type_ascription_to_parameter() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes, typeck_root")]
+#[rustc_clean(cfg = "bpass2", except = "hir_owner, typeck_root")]
 #[rustc_clean(cfg = "bpass3")]
-#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes, typeck_root")]
+#[rustc_clean(cfg = "bpass5", except = "hir_owner, typeck_root")]
 #[rustc_clean(cfg = "bpass6")]
 pub fn add_type_ascription_to_parameter() {
     let closure = |x: u32| x + 1u32;
@@ -115,9 +115,9 @@ pub fn change_parameter_type() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir, typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir, typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir, typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir, typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_parameter_type() {
     let closure = |x: u16| (x as u64) + 1;

tests/incremental/hashes/consts.rs

@@ -20,7 +20,7 @@
 const CONST_VISIBILITY: u8 = 0;
 
 #[cfg(not(bpass1))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
 pub const CONST_VISIBILITY: u8 = 0;
 
@@ -30,7 +30,7 @@
 const CONST_CHANGE_TYPE_1: i32 = 0;
 
 #[cfg(not(bpass1))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass3")]
 const CONST_CHANGE_TYPE_1: u32 = 0;
 
@@ -40,13 +40,13 @@
 const CONST_CHANGE_TYPE_2: Option<u32> = None;
 
 #[cfg(not(bpass1))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass3")]
 const CONST_CHANGE_TYPE_2: Option<u64> = None;
 
 
 // Change value between simple literals
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
 const CONST_CHANGE_VALUE_1: i16 = {
     #[cfg(bpass1)]
@@ -58,7 +58,7 @@
 
 
 // Change value between expressions
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
 const CONST_CHANGE_VALUE_2: i16 = {
     #[cfg(bpass1)]
@@ -68,7 +68,7 @@
     { 1 + 2 }
 };
 
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
 const CONST_CHANGE_VALUE_3: i16 = {
     #[cfg(bpass1)]
@@ -78,7 +78,7 @@
     { 2 * 3 }
 };
 
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
 const CONST_CHANGE_VALUE_4: i16 = {
     #[cfg(bpass1)]
@@ -100,11 +100,11 @@ mod const_change_type_indirectly {
     #[cfg(not(bpass1))]
     use super::ReferencedType2 as Type;
 
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
     #[rustc_clean(cfg="bpass3")]
     const CONST_CHANGE_TYPE_INDIRECTLY_1: Type = Type;
 
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
     #[rustc_clean(cfg="bpass3")]
     const CONST_CHANGE_TYPE_INDIRECTLY_2: Option<Type> = None;
 }

tests/incremental/hashes/enum_constructors.rs

@@ -38,9 +38,9 @@ pub fn change_field_value_struct_like() -> Enum {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_field_value_struct_like() -> Enum {
     Enum::Struct {
@@ -63,9 +63,9 @@ pub fn change_field_order_struct_like() -> Enum {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 // FIXME(michaelwoerister):Interesting. I would have thought that that changes the MIR. And it
 // would if it were not all constants
@@ -104,9 +104,9 @@ pub fn change_constructor_path_struct_like() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_constructor_path_struct_like() {
     let _ = Enum2::Struct {
@@ -129,9 +129,9 @@ pub fn change_constructor_variant_struct_like() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_constructor_variant_struct_like() {
     let _ = Enum2::Struct2 {
@@ -149,9 +149,9 @@ pub mod change_constructor_path_indirectly_struct_like {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::Enum2 as TheEnum;
 
-    #[rustc_clean(cfg="bpass2", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")]
+    #[rustc_clean(cfg="bpass2", except="fn_sig,hir_owner,optimized_mir,typeck_root")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")]
+    #[rustc_clean(cfg="bpass5", except="fn_sig,hir_owner,optimized_mir,typeck_root")]
     #[rustc_clean(cfg="bpass6")]
     pub fn function() -> TheEnum {
         TheEnum::Struct {
@@ -171,9 +171,9 @@ pub mod change_constructor_variant_indirectly_struct_like {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::Enum2::Struct2 as Variant;
 
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
     #[rustc_clean(cfg="bpass6")]
     pub fn function() -> Enum2 {
         Variant {
@@ -192,9 +192,9 @@ pub fn change_field_value_tuple_like() -> Enum {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_field_value_tuple_like() -> Enum {
     Enum::Tuple(0, 1, 3)
@@ -211,12 +211,12 @@ pub fn change_constructor_path_tuple_like() {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(
     cfg="bpass2",
-    except="opt_hir_owner_nodes,typeck_root"
+    except="hir_owner,typeck_root"
 )]
 #[rustc_clean(cfg="bpass3")]
 #[rustc_clean(
     cfg="bpass5",
-    except="opt_hir_owner_nodes,typeck_root"
+    except="hir_owner,typeck_root"
 )]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_constructor_path_tuple_like() {
@@ -234,12 +234,12 @@ pub fn change_constructor_variant_tuple_like() {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(
     cfg="bpass2",
-    except="opt_hir_owner_nodes,typeck_root"
+    except="hir_owner,typeck_root"
 )]
 #[rustc_clean(cfg="bpass3")]
 #[rustc_clean(
     cfg="bpass5",
-    except="opt_hir_owner_nodes,typeck_root"
+    except="hir_owner,typeck_root"
 )]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_constructor_variant_tuple_like() {
@@ -254,9 +254,9 @@ pub mod change_constructor_path_indirectly_tuple_like {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::Enum2 as TheEnum;
 
-    #[rustc_clean(cfg="bpass2", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")]
+    #[rustc_clean(cfg="bpass2", except="fn_sig,hir_owner,optimized_mir,typeck_root")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")]
+    #[rustc_clean(cfg="bpass5", except="fn_sig,hir_owner,optimized_mir,typeck_root")]
     #[rustc_clean(cfg="bpass6")]
     pub fn function() -> TheEnum {
         TheEnum::Tuple(0, 1, 2)
@@ -273,9 +273,9 @@ pub mod change_constructor_variant_indirectly_tuple_like {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::Enum2::Tuple2 as Variant;
 
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
     #[rustc_clean(cfg="bpass6")]
     pub fn function() -> Enum2 {
         Variant(0, 1, 2)
@@ -302,9 +302,9 @@ pub fn change_constructor_path_c_like() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_constructor_path_c_like() {
     let _x = Clike2::B;
@@ -319,9 +319,9 @@ pub fn change_constructor_variant_c_like() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_constructor_variant_c_like() {
     let _x = Clike::C;
@@ -335,9 +335,9 @@ pub mod change_constructor_path_indirectly_c_like {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::Clike2 as TheEnum;
 
-    #[rustc_clean(cfg="bpass2", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")]
+    #[rustc_clean(cfg="bpass2", except="fn_sig,hir_owner,optimized_mir,typeck_root")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")]
+    #[rustc_clean(cfg="bpass5", except="fn_sig,hir_owner,optimized_mir,typeck_root")]
     #[rustc_clean(cfg="bpass6")]
     pub fn function() -> TheEnum {
         TheEnum::B
@@ -354,9 +354,9 @@ pub mod change_constructor_variant_indirectly_c_like {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::Clike::B as Variant;
 
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
     #[rustc_clean(cfg="bpass6")]
     pub fn function() -> Clike {
         Variant

tests/incremental/hashes/enum_defs.rs

@@ -32,7 +32,7 @@ enum     EnumVisibility { A }
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub enum EnumVisibility { A }
 
@@ -46,9 +46,9 @@ enum EnumChangeNameCStyleVariant {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumChangeNameCStyleVariant {
     Variant1,
@@ -65,9 +65,9 @@ enum EnumChangeNameTupleStyleVariant {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumChangeNameTupleStyleVariant {
     Variant1,
@@ -84,9 +84,9 @@ enum EnumChangeNameStructStyleVariant {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumChangeNameStructStyleVariant {
     Variant1,
@@ -103,9 +103,9 @@ enum EnumChangeValueCStyleVariant0 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumChangeValueCStyleVariant0 {
     Variant1,
@@ -119,9 +119,9 @@ enum EnumChangeValueCStyleVariant1 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumChangeValueCStyleVariant1 {
     Variant1,
@@ -137,9 +137,9 @@ enum EnumAddCStyleVariant {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumAddCStyleVariant {
     Variant1,
@@ -156,9 +156,9 @@ enum EnumRemoveCStyleVariant {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumRemoveCStyleVariant {
     Variant1,
@@ -173,9 +173,9 @@ enum EnumAddTupleStyleVariant {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumAddTupleStyleVariant {
     Variant1,
@@ -192,9 +192,9 @@ enum EnumRemoveTupleStyleVariant {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumRemoveTupleStyleVariant {
     Variant1,
@@ -209,9 +209,9 @@ enum EnumAddStructStyleVariant {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumAddStructStyleVariant {
     Variant1,
@@ -228,9 +228,9 @@ enum EnumRemoveStructStyleVariant {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumRemoveStructStyleVariant {
     Variant1,
@@ -245,9 +245,9 @@ enum EnumChangeFieldTypeTupleStyleVariant {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumChangeFieldTypeTupleStyleVariant {
     Variant1(u32,
@@ -264,9 +264,9 @@ enum EnumChangeFieldTypeStructStyleVariant {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumChangeFieldTypeStructStyleVariant {
     Variant1,
@@ -285,9 +285,9 @@ enum EnumChangeFieldNameStructStyleVariant {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumChangeFieldNameStructStyleVariant {
     Variant1 { a: u32, c: u32 },
@@ -302,9 +302,9 @@ enum EnumChangeOrderTupleStyleVariant {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumChangeOrderTupleStyleVariant {
     Variant1(
@@ -321,9 +321,9 @@ enum EnumChangeFieldOrderStructStyleVariant {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumChangeFieldOrderStructStyleVariant {
     Variant1 { b: f32, a: u32 },
@@ -338,9 +338,9 @@ enum EnumAddFieldTupleStyleVariant {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumAddFieldTupleStyleVariant {
     Variant1(u32, u32, u32),
@@ -355,9 +355,9 @@ enum EnumAddFieldStructStyleVariant {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumAddFieldStructStyleVariant {
     Variant1 { a: u32, b: u32, c: u32 },
@@ -412,9 +412,9 @@ enum EnumChangeNameOfTypeParameter<S> {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,generics_of,predicates_of,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,generics_of,predicates_of,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,generics_of,predicates_of,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,generics_of,predicates_of,type_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumChangeNameOfTypeParameter<T> {
     Variant1(T),
@@ -430,9 +430,9 @@ enum EnumAddTypeParameter<S> {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,generics_of,predicates_of,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,generics_of,predicates_of,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,generics_of,predicates_of,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,generics_of,predicates_of,type_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumAddTypeParameter<S, T> {
     Variant1(S),
@@ -448,9 +448,9 @@ enum EnumChangeNameOfLifetimeParameter<'a> {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,generics_of,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,generics_of,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,generics_of,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,generics_of,type_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumChangeNameOfLifetimeParameter<'b> {
     Variant1(&'b u32),
@@ -466,9 +466,9 @@ enum EnumAddLifetimeParameter<'a> {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,generics_of,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,generics_of,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,generics_of,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,generics_of,type_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumAddLifetimeParameter<'a, 'b> {
     Variant1(&'a u32),
@@ -485,9 +485,9 @@ enum EnumAddLifetimeParameterBound<'a, 'b> {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,predicates_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,predicates_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,predicates_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,predicates_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumAddLifetimeParameterBound<'a, 'b: 'a> {
     Variant1(&'a u32),
@@ -502,9 +502,9 @@ enum EnumAddLifetimeBoundToParameter<'a, T> {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,predicates_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,predicates_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,predicates_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,predicates_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumAddLifetimeBoundToParameter<'a, T: 'a> {
     Variant1(T),
@@ -520,9 +520,9 @@ enum EnumAddTraitBound<S> {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,generics_of,predicates_of,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,generics_of,predicates_of,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,generics_of,predicates_of,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,generics_of,predicates_of,type_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumAddTraitBound<T: Sync> {
     Variant1(T),
@@ -538,9 +538,9 @@ enum EnumAddLifetimeParameterBoundWhere<'a, 'b> {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,predicates_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,predicates_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,predicates_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,predicates_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumAddLifetimeParameterBoundWhere<'a, 'b> where 'b: 'a {
     Variant1(&'a u32),
@@ -557,9 +557,9 @@ enum EnumAddLifetimeBoundToParameterWhere<'a, T> {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,predicates_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,predicates_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,predicates_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,predicates_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumAddLifetimeBoundToParameterWhere<'a, T> where T: 'a {
     Variant1(T),
@@ -575,9 +575,9 @@ enum EnumAddTraitBoundWhere<S> {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,generics_of,predicates_of,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,generics_of,predicates_of,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,generics_of,predicates_of,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,generics_of,predicates_of,type_of")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumAddTraitBoundWhere<T> where T: Sync {
     Variant1(T),
@@ -593,9 +593,9 @@ enum EnumSwapUsageTypeParameters<A, B> {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumSwapUsageTypeParameters<A, B> {
     Variant1 {
@@ -616,9 +616,9 @@ enum EnumSwapUsageLifetimeParameters<'a, 'b> {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 enum EnumSwapUsageLifetimeParameters<'a, 'b> {
     Variant1 {
@@ -643,9 +643,9 @@ mod change_field_type_indirectly_tuple_style {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::ReferencedType2 as FieldType;
 
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner")]
     #[rustc_clean(cfg="bpass6")]
     enum TupleStyle {
         Variant1(
@@ -663,9 +663,9 @@ mod change_field_type_indirectly_struct_style {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::ReferencedType2 as FieldType;
 
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner")]
     #[rustc_clean(cfg="bpass6")]
     enum StructStyle {
         Variant1 {
@@ -688,9 +688,9 @@ mod change_trait_bound_indirectly {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::ReferencedTrait2 as Trait;
 
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,predicates_of")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,predicates_of")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,predicates_of")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner,predicates_of")]
     #[rustc_clean(cfg="bpass6")]
     enum Enum<T: Trait> {
         Variant1(T)
@@ -706,9 +706,9 @@ mod change_trait_bound_indirectly_where {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::ReferencedTrait2 as Trait;
 
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,predicates_of")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,predicates_of")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,predicates_of")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner,predicates_of")]
     #[rustc_clean(cfg="bpass6")]
     enum Enum<T> where T: Trait {
         Variant1(T)

tests/incremental/hashes/exported_vs_not.rs

@@ -11,7 +11,7 @@
 #![crate_type="rlib"]
 
 // Case 1: The function body is not exported to metadata. If the body changes,
-//         the hash of the opt_hir_owner_nodes node should change, but not the hash of
+//         the hash of the hir_owner node should change, but not the hash of
 //         either the hir_owner or the Metadata node.
 
 #[cfg(any(bpass1,bpass4))]
@@ -20,9 +20,9 @@ pub fn body_not_exported_to_metadata() -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn body_not_exported_to_metadata() -> u32 {
     2
@@ -41,9 +41,9 @@ pub fn body_exported_to_metadata_because_of_inline() -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 #[inline]
 pub fn body_exported_to_metadata_because_of_inline() -> u32 {
@@ -63,9 +63,9 @@ pub fn body_exported_to_metadata_because_of_generic() -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 #[inline]
 pub fn body_exported_to_metadata_because_of_generic() -> u32 {

tests/incremental/hashes/extern_mods.rs

@@ -25,9 +25,9 @@
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes")]
+#[rustc_clean(cfg = "bpass2", except = "hir_owner")]
 #[rustc_clean(cfg = "bpass3")]
-#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes")]
+#[rustc_clean(cfg = "bpass5", except = "hir_owner")]
 #[rustc_clean(cfg = "bpass6")]
 extern "C" {
     pub fn change_function_name2(c: i64) -> i32;
@@ -130,9 +130,9 @@
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes")]
+#[rustc_clean(cfg = "bpass2", except = "hir_owner")]
 #[rustc_clean(cfg = "bpass3")]
-#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes")]
+#[rustc_clean(cfg = "bpass5", except = "hir_owner")]
 #[rustc_clean(cfg = "bpass6")]
 extern "rust-call" {
     pub fn change_calling_convention(c: (i32,));
@@ -160,9 +160,9 @@
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes")]
+#[rustc_clean(cfg = "bpass2", except = "hir_owner")]
 #[rustc_clean(cfg = "bpass3")]
-#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes")]
+#[rustc_clean(cfg = "bpass5", except = "hir_owner")]
 #[rustc_clean(cfg = "bpass6")]
 extern "C" {
     pub fn add_function1(c: i32);

tests/incremental/hashes/for_loops.rs

@@ -29,9 +29,9 @@ pub fn change_loop_body() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_loop_body() {
     let mut _x = 0;
@@ -54,9 +54,9 @@ pub fn change_iteration_variable_name() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_iteration_variable_name() {
     let mut _x = 0;
@@ -79,9 +79,9 @@ pub fn change_iteration_variable_pattern() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir, typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir, typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir, typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir, typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_iteration_variable_pattern() {
     let mut _x = 0;
@@ -104,9 +104,9 @@ pub fn change_iterable() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, promoted_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, promoted_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, promoted_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, promoted_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_iterable() {
     let mut _x = 0;
@@ -129,9 +129,9 @@ pub fn add_break() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir, typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir, typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir, typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir, typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_break() {
     let mut _x = 0;
@@ -154,9 +154,9 @@ pub fn add_loop_label() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_loop_label() {
     let mut _x = 0;
@@ -179,9 +179,9 @@ pub fn add_loop_label_to_break() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_loop_label_to_break() {
     let mut _x = 0;
@@ -206,9 +206,9 @@ pub fn change_break_label() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_break_label() {
     let mut _x = 0;
@@ -233,9 +233,9 @@ pub fn add_loop_label_to_continue() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_loop_label_to_continue() {
     let mut _x = 0;
@@ -260,9 +260,9 @@ pub fn change_continue_label() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_continue_label() {
     let mut _x = 0;
@@ -287,9 +287,9 @@ pub fn change_continue_to_break() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_continue_to_break() {
     let mut _x = 0;

tests/incremental/hashes/function_interfaces.rs

@@ -26,12 +26,12 @@ pub fn add_parameter() {}
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(
     cfg = "bpass2",
-    except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig"
+    except = "hir_owner, optimized_mir, typeck_root, fn_sig"
 )]
 #[rustc_clean(cfg = "bpass3")]
 #[rustc_clean(
     cfg = "bpass5",
-    except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig"
+    except = "hir_owner, optimized_mir, typeck_root, fn_sig"
 )]
 #[rustc_clean(cfg = "bpass6")]
 pub fn add_parameter(p: i32) {}
@@ -42,9 +42,9 @@ pub fn add_parameter(p: i32) {}
 pub fn add_return_type()       {}
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes")]
+#[rustc_clean(cfg = "bpass2", except = "hir_owner")]
 #[rustc_clean(cfg = "bpass3")]
-#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg = "bpass5", except = "hir_owner, optimized_mir")]
 #[rustc_clean(cfg = "bpass6")]
 pub fn add_return_type() -> () {}
 
@@ -56,12 +56,12 @@ pub fn type_of_parameter(p: i32) {}
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(
     cfg = "bpass2",
-    except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig"
+    except = "hir_owner, optimized_mir, typeck_root, fn_sig"
 )]
 #[rustc_clean(cfg = "bpass3")]
 #[rustc_clean(
     cfg = "bpass5",
-    except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig"
+    except = "hir_owner, optimized_mir, typeck_root, fn_sig"
 )]
 #[rustc_clean(cfg = "bpass6")]
 pub fn type_of_parameter(p: i64) {}
@@ -74,12 +74,12 @@ pub fn type_of_parameter_ref(p: &i32) {}
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(
     cfg = "bpass2",
-    except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig"
+    except = "hir_owner, optimized_mir, typeck_root, fn_sig"
 )]
 #[rustc_clean(cfg = "bpass3")]
 #[rustc_clean(
     cfg = "bpass5",
-    except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig"
+    except = "hir_owner, optimized_mir, typeck_root, fn_sig"
 )]
 #[rustc_clean(cfg = "bpass6")]
 pub fn type_of_parameter_ref(p: &mut i32) {}
@@ -92,12 +92,12 @@ pub fn order_of_parameters(p1: i32, p2: i64) {}
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(
     cfg = "bpass2",
-    except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig"
+    except = "hir_owner, optimized_mir, typeck_root, fn_sig"
 )]
 #[rustc_clean(cfg = "bpass3")]
 #[rustc_clean(
     cfg = "bpass5",
-    except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig"
+    except = "hir_owner, optimized_mir, typeck_root, fn_sig"
 )]
 #[rustc_clean(cfg = "bpass6")]
 pub fn order_of_parameters(p2: i64, p1: i32) {}
@@ -110,12 +110,12 @@ pub        fn make_unsafe() {}
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(
     cfg = "bpass2",
-    except = "opt_hir_owner_nodes, typeck_root, fn_sig"
+    except = "hir_owner, typeck_root, fn_sig"
 )]
 #[rustc_clean(cfg = "bpass3")]
 #[rustc_clean(
     cfg = "bpass5",
-    except = "opt_hir_owner_nodes, typeck_root, fn_sig"
+    except = "hir_owner, typeck_root, fn_sig"
 )]
 #[rustc_clean(cfg = "bpass6")]
 pub unsafe fn make_unsafe() {}
@@ -126,9 +126,9 @@ pub unsafe fn make_unsafe() {}
 pub            fn make_extern() {}
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes, typeck_root, fn_sig")]
+#[rustc_clean(cfg = "bpass2", except = "hir_owner, typeck_root, fn_sig")]
 #[rustc_clean(cfg = "bpass3")]
-#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes, typeck_root, fn_sig")]
+#[rustc_clean(cfg = "bpass5", except = "hir_owner, typeck_root, fn_sig")]
 #[rustc_clean(cfg = "bpass6")]
 pub extern "C" fn make_extern() {}
 
@@ -140,12 +140,12 @@ pub fn type_parameter   () {}
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(
     cfg = "bpass2",
-    except = "opt_hir_owner_nodes, generics_of, type_of, predicates_of"
+    except = "hir_owner, generics_of, type_of, predicates_of"
 )]
 #[rustc_clean(cfg = "bpass3")]
 #[rustc_clean(
     cfg = "bpass5",
-    except = "opt_hir_owner_nodes, generics_of, type_of, predicates_of"
+    except = "hir_owner, generics_of, type_of, predicates_of"
 )]
 #[rustc_clean(cfg = "bpass6")]
 pub fn type_parameter<T>() {}
@@ -156,9 +156,9 @@ pub fn type_parameter<T>() {}
 pub fn lifetime_parameter    () {}
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes, generics_of,fn_sig")]
+#[rustc_clean(cfg = "bpass2", except = "hir_owner, generics_of,fn_sig")]
 #[rustc_clean(cfg = "bpass3")]
-#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes, generics_of,fn_sig")]
+#[rustc_clean(cfg = "bpass5", except = "hir_owner, generics_of,fn_sig")]
 #[rustc_clean(cfg = "bpass6")]
 pub fn lifetime_parameter<'a>() {}
 
@@ -168,7 +168,7 @@ pub fn lifetime_parameter<'a>() {}
 pub fn trait_bound<T    >() {}
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes, predicates_of")]
+#[rustc_clean(cfg = "bpass2", except = "hir_owner, predicates_of")]
 #[rustc_clean(cfg = "bpass3")]
 pub fn trait_bound<T: Eq>() {}
 
@@ -178,9 +178,9 @@ pub fn trait_bound<T: Eq>() {}
 pub fn builtin_bound<T      >() {}
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes, predicates_of")]
+#[rustc_clean(cfg = "bpass2", except = "hir_owner, predicates_of")]
 #[rustc_clean(cfg = "bpass3")]
-#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes, predicates_of")]
+#[rustc_clean(cfg = "bpass5", except = "hir_owner, predicates_of")]
 #[rustc_clean(cfg = "bpass6")]
 pub fn builtin_bound<T: Send>() {}
 
@@ -192,12 +192,12 @@ pub fn lifetime_bound<'a, T>() {}
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(
     cfg = "bpass2",
-    except = "opt_hir_owner_nodes, generics_of, type_of, predicates_of,fn_sig"
+    except = "hir_owner, generics_of, type_of, predicates_of,fn_sig"
 )]
 #[rustc_clean(cfg = "bpass3")]
 #[rustc_clean(
     cfg = "bpass5",
-    except = "opt_hir_owner_nodes, generics_of, type_of, predicates_of,fn_sig,optimized_mir"
+    except = "hir_owner, generics_of, type_of, predicates_of,fn_sig,optimized_mir"
 )]
 #[rustc_clean(cfg = "bpass6")]
 pub fn lifetime_bound<'a, T: 'a>() {}
@@ -208,7 +208,7 @@ pub fn lifetime_bound<'a, T: 'a>() {}
 pub fn second_trait_bound<T: Eq        >() {}
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes, predicates_of")]
+#[rustc_clean(cfg = "bpass2", except = "hir_owner, predicates_of")]
 #[rustc_clean(cfg = "bpass3")]
 pub fn second_trait_bound<T: Eq + Clone>() {}
 
@@ -218,9 +218,9 @@ pub fn second_trait_bound<T: Eq + Clone>() {}
 pub fn second_builtin_bound<T: Send        >() {}
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes")]
+#[rustc_clean(cfg = "bpass2", except = "hir_owner")]
 #[rustc_clean(cfg = "bpass3")]
-#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes, predicates_of")]
+#[rustc_clean(cfg = "bpass5", except = "hir_owner, predicates_of")]
 #[rustc_clean(cfg = "bpass6")]
 pub fn second_builtin_bound<T: Send + Sized>() {}
 
@@ -232,12 +232,12 @@ pub fn second_lifetime_bound<'a, 'b, T: 'a     >() {}
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(
     cfg = "bpass2",
-    except = "opt_hir_owner_nodes, generics_of, type_of, predicates_of,fn_sig"
+    except = "hir_owner, generics_of, type_of, predicates_of,fn_sig"
 )]
 #[rustc_clean(cfg = "bpass3")]
 #[rustc_clean(
     cfg = "bpass5",
-    except = "opt_hir_owner_nodes, generics_of, type_of, predicates_of,fn_sig"
+    except = "hir_owner, generics_of, type_of, predicates_of,fn_sig"
 )]
 #[rustc_clean(cfg = "bpass6")]
 pub fn second_lifetime_bound<'a, 'b, T: 'a + 'b>() {}
@@ -303,9 +303,9 @@ pub fn return_impl_trait() -> i32        {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes, typeck_root, fn_sig")]
+#[rustc_clean(cfg = "bpass2", except = "hir_owner, typeck_root, fn_sig")]
 #[rustc_clean(cfg = "bpass3")]
-#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes, typeck_root, fn_sig, optimized_mir")]
+#[rustc_clean(cfg = "bpass5", except = "hir_owner, typeck_root, fn_sig, optimized_mir")]
 #[rustc_clean(cfg = "bpass6")]
 pub fn return_impl_trait() -> impl Clone {
     0
@@ -319,9 +319,9 @@ pub fn change_return_impl_trait() -> impl Clone {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes")]
+#[rustc_clean(cfg = "bpass2", except = "hir_owner")]
 #[rustc_clean(cfg = "bpass3")]
-#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes, typeck_root")]
+#[rustc_clean(cfg = "bpass5", except = "hir_owner, typeck_root")]
 #[rustc_clean(cfg = "bpass6")]
 pub fn change_return_impl_trait() -> impl  Copy {
     0u32
@@ -340,12 +340,12 @@ pub mod change_return_type_indirectly {
 
     #[rustc_clean(
         cfg = "bpass2",
-        except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig"
+        except = "hir_owner, optimized_mir, typeck_root, fn_sig"
     )]
     #[rustc_clean(cfg = "bpass3")]
     #[rustc_clean(
         cfg = "bpass5",
-        except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig"
+        except = "hir_owner, optimized_mir, typeck_root, fn_sig"
     )]
     #[rustc_clean(cfg = "bpass6")]
     pub fn indirect_return_type() -> ReturnType {
@@ -363,12 +363,12 @@ pub mod change_parameter_type_indirectly {
 
     #[rustc_clean(
         cfg = "bpass2",
-        except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig"
+        except = "hir_owner, optimized_mir, typeck_root, fn_sig"
     )]
     #[rustc_clean(cfg = "bpass3")]
     #[rustc_clean(
         cfg = "bpass5",
-        except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig"
+        except = "hir_owner, optimized_mir, typeck_root, fn_sig"
     )]
     #[rustc_clean(cfg = "bpass6")]
     pub fn indirect_parameter_type(p: ParameterType) {}
@@ -385,9 +385,9 @@ pub mod change_trait_bound_indirectly {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::ReferencedTrait2 as Trait;
 
-    #[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes, predicates_of")]
+    #[rustc_clean(cfg = "bpass2", except = "hir_owner, predicates_of")]
     #[rustc_clean(cfg = "bpass3")]
-    #[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes, predicates_of")]
+    #[rustc_clean(cfg = "bpass5", except = "hir_owner, predicates_of")]
     #[rustc_clean(cfg = "bpass6")]
     pub fn indirect_trait_bound<T: Trait>(p: T) {}
 }
@@ -400,9 +400,9 @@ pub mod change_trait_bound_indirectly_in_where_clause {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::ReferencedTrait2 as Trait;
 
-    #[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes, predicates_of")]
+    #[rustc_clean(cfg = "bpass2", except = "hir_owner, predicates_of")]
     #[rustc_clean(cfg = "bpass3")]
-    #[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes, predicates_of")]
+    #[rustc_clean(cfg = "bpass5", except = "hir_owner, predicates_of")]
     #[rustc_clean(cfg = "bpass6")]
     pub fn indirect_trait_bound_where<T>(p: T)
     where

tests/incremental/hashes/if_expressions.rs

@@ -28,9 +28,9 @@ pub fn change_condition(x: bool) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_condition(x: bool) -> u32 {
     if !x {
@@ -51,9 +51,9 @@ pub fn change_then_branch(x: bool) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_then_branch(x: bool) -> u32 {
     if x {
@@ -76,9 +76,9 @@ pub fn change_else_branch(x: bool) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_else_branch(x: bool) -> u32 {
     if x {
@@ -104,9 +104,9 @@ pub fn add_else_branch(x: bool) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_else_branch(x: bool) -> u32 {
     let mut ret = 1;
@@ -132,9 +132,9 @@ pub fn change_condition_if_let(x: Option<u32>) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_condition_if_let(x: Option<u32>) -> u32 {
     if let Some(_ ) = x {
@@ -157,9 +157,9 @@ pub fn change_then_branch_if_let(x: Option<u32>) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_then_branch_if_let(x: Option<u32>) -> u32 {
     if let Some(x) = x {
@@ -182,9 +182,9 @@ pub fn change_else_branch_if_let(x: Option<u32>) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_else_branch_if_let(x: Option<u32>) -> u32 {
     if let Some(x) = x {
@@ -210,9 +210,9 @@ pub fn add_else_branch_if_let(x: Option<u32>) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,typeck_root,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_else_branch_if_let(x: Option<u32>) -> u32 {
     let mut ret = 1;

tests/incremental/hashes/indexing_expressions.rs

@@ -24,9 +24,9 @@ fn change_simple_index(slice: &[u32]) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")]
+#[rustc_clean(except="hir_owner", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 fn change_simple_index(slice: &[u32]) -> u32 {
     slice[4]
@@ -41,9 +41,9 @@ fn change_lower_bound(slice: &[u32]) -> &[u32] {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")]
+#[rustc_clean(except="hir_owner", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 fn change_lower_bound(slice: &[u32]) -> &[u32] {
     &slice[2..5]
@@ -58,9 +58,9 @@ fn change_upper_bound(slice: &[u32]) -> &[u32] {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")]
+#[rustc_clean(except="hir_owner", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 fn change_upper_bound(slice: &[u32]) -> &[u32] {
     &slice[3..7]
@@ -75,9 +75,9 @@ fn add_lower_bound(slice: &[u32]) -> &[u32] {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,typeck_root", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,typeck_root", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 fn add_lower_bound(slice: &[u32]) -> &[u32] {
     &slice[3..4]
@@ -92,9 +92,9 @@ fn add_upper_bound(slice: &[u32]) -> &[u32] {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,typeck_root", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,typeck_root", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 fn add_upper_bound(slice: &[u32]) -> &[u32] {
     &slice[3..7]
@@ -109,9 +109,9 @@ fn change_mutability(slice: &mut [u32]) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,typeck_root", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,typeck_root", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 fn change_mutability(slice: &mut [u32]) -> u32 {
     (&    slice[3..5])[0]
@@ -126,9 +126,9 @@ fn exclusive_to_inclusive_range(slice: &[u32]) -> &[u32] {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,typeck_root", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,typeck_root", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 fn exclusive_to_inclusive_range(slice: &[u32]) -> &[u32] {
     &slice[3..=7]

tests/incremental/hashes/inherent_impls.rs

@@ -27,9 +27,9 @@ pub fn method_name() { }
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,associated_item_def_ids")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,associated_item_def_ids")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,associated_item_def_ids")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,associated_item_def_ids")]
 #[rustc_clean(cfg="bpass6")]
 impl Foo {
     #[rustc_clean(cfg="bpass3")]
@@ -54,12 +54,12 @@ pub fn method_body() {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl Foo {
-    #[rustc_clean(cfg="bpass2",except="opt_hir_owner_nodes,optimized_mir,promoted_mir,typeck_root")]
+    #[rustc_clean(cfg="bpass2",except="hir_owner,optimized_mir,promoted_mir,typeck_root")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5",except="opt_hir_owner_nodes,optimized_mir,promoted_mir,typeck_root")]
+    #[rustc_clean(cfg="bpass5",except="hir_owner,optimized_mir,promoted_mir,typeck_root")]
     #[rustc_clean(cfg="bpass6")]
     pub fn method_body() {
         println!("Hello, world!");
@@ -85,12 +85,12 @@ pub fn method_body_inlined() {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl Foo {
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
     #[rustc_clean(cfg="bpass6")]
     #[inline]
     pub fn method_body_inlined() {
@@ -112,12 +112,12 @@ pub fn method_privacy() { }
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl Foo {
     #[rustc_clean(cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner")]
     #[rustc_clean(cfg="bpass6")]
     fn     method_privacy() { }
 }
@@ -141,17 +141,17 @@ pub fn method_selfness() { }
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 impl Foo {
     #[rustc_clean(
         cfg="bpass2",
-        except="opt_hir_owner_nodes,fn_sig,generics_of,typeck_root,associated_item,optimized_mir",
+        except="hir_owner,fn_sig,generics_of,typeck_root,associated_item,optimized_mir",
     )]
     #[rustc_clean(cfg="bpass3")]
     #[rustc_clean(
         cfg="bpass5",
-        except="opt_hir_owner_nodes,fn_sig,generics_of,typeck_root,associated_item,optimized_mir",
+        except="hir_owner,fn_sig,generics_of,typeck_root,associated_item,optimized_mir",
     )]
     #[rustc_clean(cfg="bpass6")]
     pub fn method_selfness(&self) { }
@@ -170,12 +170,12 @@ pub fn method_selfmutness(&    self) { }
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl Foo {
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,fn_sig,typeck_root,optimized_mir")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,fn_sig,typeck_root,optimized_mir")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,fn_sig,typeck_root,optimized_mir")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner,fn_sig,typeck_root,optimized_mir")]
     #[rustc_clean(cfg="bpass6")]
     pub fn method_selfmutness(&mut self) { }
 }
@@ -189,9 +189,9 @@ pub fn add_method_to_impl1(&self) { }
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,associated_item_def_ids")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,associated_item_def_ids")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,associated_item_def_ids")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,associated_item_def_ids")]
 #[rustc_clean(cfg="bpass6")]
 impl Foo {
     #[rustc_clean(cfg="bpass2")]
@@ -220,12 +220,12 @@ pub fn add_method_parameter(&self        ) { }
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl Foo {
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,fn_sig,typeck_root,optimized_mir")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,fn_sig,typeck_root,optimized_mir")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,fn_sig,typeck_root,optimized_mir")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner,fn_sig,typeck_root,optimized_mir")]
     #[rustc_clean(cfg="bpass6")]
     pub fn add_method_parameter(&self, _: i32) { }
 }
@@ -245,12 +245,12 @@ pub fn change_method_parameter_name(&self, a: i64) { }
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl Foo {
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
     #[rustc_clean(cfg="bpass6")]
     pub fn change_method_parameter_name(&self, b: i64) { }
 }
@@ -270,12 +270,12 @@ pub fn change_method_return_type(&self) -> u16 { 0 }
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl Foo {
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,fn_sig,optimized_mir,typeck_root")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,fn_sig,optimized_mir,typeck_root")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,fn_sig,optimized_mir,typeck_root")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner,fn_sig,optimized_mir,typeck_root")]
     #[rustc_clean(cfg="bpass6")]
     pub fn change_method_return_type(&self) -> u32 { 0 }
 }
@@ -322,12 +322,12 @@ pub fn change_method_parameter_order(&self, a: i64, b: i64) { }
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl Foo {
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
     #[rustc_clean(cfg="bpass6")]
     pub fn change_method_parameter_order(&self, b: i64, a: i64) { }
 }
@@ -347,12 +347,12 @@ pub        fn make_method_unsafe(&self) { }
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl Foo {
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,fn_sig,typeck_root")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,fn_sig,typeck_root")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,fn_sig,typeck_root")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner,fn_sig,typeck_root")]
     #[rustc_clean(cfg="bpass6")]
     pub unsafe fn make_method_unsafe(&self) { }
 }
@@ -372,12 +372,12 @@ pub            fn make_method_extern(&self) { }
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl Foo {
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,fn_sig,typeck_root")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,fn_sig,typeck_root")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,fn_sig,typeck_root")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner,fn_sig,typeck_root")]
     #[rustc_clean(cfg="bpass6")]
     pub extern "C" fn make_method_extern(&self) { }
 }
@@ -397,12 +397,12 @@ pub extern "C"      fn change_method_calling_convention(&self) { }
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl Foo {
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,fn_sig,typeck_root")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,fn_sig,typeck_root")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,fn_sig,typeck_root")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner,fn_sig,typeck_root")]
     #[rustc_clean(cfg="bpass6")]
     pub extern "system" fn change_method_calling_convention(&self) { }
 }
@@ -431,7 +431,7 @@ pub fn add_lifetime_parameter_to_method    (&self) { }
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl Foo {
     // Warning: Note that `typeck_root` are coming up clean here.
@@ -443,9 +443,9 @@ impl Foo {
     // if we lower generics before the body, then the `HirId` for
     // things in the body will be affected. So if you start to see
     // `typeck_root` appear dirty, that might be the cause. -nmatsakis
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,fn_sig")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,fn_sig")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,fn_sig,generics_of")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner,fn_sig,generics_of")]
     #[rustc_clean(cfg="bpass6")]
     pub fn add_lifetime_parameter_to_method<'a>(&self) { }
 }
@@ -480,7 +480,7 @@ pub fn add_type_parameter_to_method   (&self) { }
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl Foo {
     // Warning: Note that `typeck_root` are coming up clean here.
@@ -494,12 +494,12 @@ impl Foo {
     // appear dirty, that might be the cause. -nmatsakis
     #[rustc_clean(
         cfg="bpass2",
-        except="opt_hir_owner_nodes,generics_of,predicates_of,type_of",
+        except="hir_owner,generics_of,predicates_of,type_of",
     )]
     #[rustc_clean(cfg="bpass3")]
     #[rustc_clean(
         cfg="bpass5",
-        except="opt_hir_owner_nodes,generics_of,predicates_of,type_of",
+        except="hir_owner,generics_of,predicates_of,type_of",
     )]
     #[rustc_clean(cfg="bpass6")]
     pub fn add_type_parameter_to_method<T>(&self) { }
@@ -526,17 +526,17 @@ pub fn add_lifetime_bound_to_lifetime_param_of_method<'a, 'b    >(&self) { }
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl Foo {
     #[rustc_clean(
         cfg="bpass2",
-        except="opt_hir_owner_nodes,generics_of,predicates_of,type_of,fn_sig"
+        except="hir_owner,generics_of,predicates_of,type_of,fn_sig"
     )]
     #[rustc_clean(cfg="bpass3")]
     #[rustc_clean(
         cfg="bpass5",
-        except="opt_hir_owner_nodes,generics_of,predicates_of,type_of,fn_sig"
+        except="hir_owner,generics_of,predicates_of,type_of,fn_sig"
     )]
     #[rustc_clean(cfg="bpass6")]
     pub fn add_lifetime_bound_to_lifetime_param_of_method<'a, 'b: 'a>(&self) { }
@@ -572,7 +572,7 @@ pub fn add_lifetime_bound_to_type_param_of_method<'a, T    >(&self) { }
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl Foo {
     // Warning: Note that `typeck_root` are coming up clean here.
@@ -586,12 +586,12 @@ impl Foo {
     // appear dirty, that might be the cause. -nmatsakis
     #[rustc_clean(
         cfg="bpass2",
-        except="opt_hir_owner_nodes,generics_of,predicates_of,type_of,fn_sig"
+        except="hir_owner,generics_of,predicates_of,type_of,fn_sig"
     )]
     #[rustc_clean(cfg="bpass3")]
     #[rustc_clean(
         cfg="bpass5",
-        except="opt_hir_owner_nodes,generics_of,predicates_of,type_of,fn_sig"
+        except="hir_owner,generics_of,predicates_of,type_of,fn_sig"
     )]
     #[rustc_clean(cfg="bpass6")]
     pub fn add_lifetime_bound_to_type_param_of_method<'a, T: 'a>(&self) { }
@@ -621,7 +621,7 @@ pub fn add_trait_bound_to_type_param_of_method<T       >(&self) { }
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl Foo {
     // Warning: Note that `typeck_root` are coming up clean here.
@@ -633,9 +633,9 @@ impl Foo {
     // generics before the body, then the `HirId` for things in the
     // body will be affected. So if you start to see `typeck_root`
     // appear dirty, that might be the cause. -nmatsakis
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,predicates_of")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,predicates_of")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,predicates_of")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner,predicates_of")]
     #[rustc_clean(cfg="bpass6")]
     pub fn add_trait_bound_to_type_param_of_method<T: Clone>(&self) { }
 }
@@ -678,9 +678,9 @@ pub fn add_type_parameter_to_impl(&self) { }
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,generics_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,generics_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,generics_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,generics_of")]
 #[rustc_clean(cfg="bpass6")]
 impl<T> Bar<T> {
     #[rustc_clean(
@@ -705,9 +705,9 @@ pub fn change_impl_self_type(&self) { }
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 impl Bar<u64> {
     #[rustc_clean(cfg="bpass2", except="fn_sig,optimized_mir,typeck_root")]
@@ -726,9 +726,9 @@ pub fn add_lifetime_bound_to_impl_parameter(&self) { }
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 impl<T: 'static> Bar<T> {
     #[rustc_clean(cfg="bpass2")]
@@ -747,9 +747,9 @@ pub fn add_trait_bound_to_impl_parameter(&self) { }
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 impl<T: Clone> Bar<T> {
     #[rustc_clean(cfg="bpass2")]

tests/incremental/hashes/inline_asm.rs

@@ -34,9 +34,9 @@ pub fn change_template(_a: i32) -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 pub fn change_template(_a: i32) -> i32 {
@@ -67,9 +67,9 @@ pub fn change_output(a: i32) -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 pub fn change_output(a: i32) -> i32 {
@@ -101,9 +101,9 @@ pub fn change_input(_a: i32, _b: i32) -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 pub fn change_input(_a: i32, _b: i32) -> i32 {
@@ -134,9 +134,9 @@ pub fn change_input_constraint(_a: i32, _b: i32) -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 pub fn change_input_constraint(_a: i32, _b: i32) -> i32 {
@@ -167,9 +167,9 @@ pub fn change_clobber(_a: i32) -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 pub fn change_clobber(_a: i32) -> i32 {
@@ -202,9 +202,9 @@ pub fn change_options(_a: i32) -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 pub fn change_options(_a: i32) -> i32 {

tests/incremental/hashes/let_expressions.rs

@@ -24,9 +24,9 @@ pub fn change_name() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_name() {
     let _y = 2u64;
@@ -41,9 +41,9 @@ pub fn add_type() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_type() {
     let _x: u32 = 2u32;
@@ -58,9 +58,9 @@ pub fn change_type() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,typeck_root,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,typeck_root,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_type() {
     let _x: u8  = 2;
@@ -75,9 +75,9 @@ pub fn change_mutability_of_reference_type() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,typeck_root,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,typeck_root,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_mutability_of_reference_type() {
     let _x: &mut u64;
@@ -92,9 +92,9 @@ pub fn change_mutability_of_slot() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,typeck_root,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_mutability_of_slot() {
     let     _x: u64 = 0;
@@ -109,9 +109,9 @@ pub fn change_simple_binding_to_pattern() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,typeck_root,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,typeck_root,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_simple_binding_to_pattern() {
     let (_a, _b) = (0u8, 'x');
@@ -126,9 +126,9 @@ pub fn change_name_in_pattern() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_name_in_pattern() {
     let (_a, _c) = (1u8, 'y');
@@ -143,9 +143,9 @@ pub fn add_ref_in_pattern() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,typeck_root,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,typeck_root,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_ref_in_pattern() {
     let (ref _a, _b) = (1u8, 'y');
@@ -160,9 +160,9 @@ pub fn add_amp_in_pattern() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,typeck_root,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,typeck_root,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_amp_in_pattern() {
     let (&_a, _b) = (&1u8, 'y');
@@ -177,9 +177,9 @@ pub fn change_mutability_of_binding_in_pattern() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,typeck_root,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_mutability_of_binding_in_pattern() {
     let (mut _a, _b) = (99u8, 'q');
@@ -194,9 +194,9 @@ pub fn add_initializer() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,typeck_root,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,typeck_root,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_initializer() {
     let _x: i16 = 3i16;
@@ -211,9 +211,9 @@ pub fn change_initializer() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_initializer() {
     let _x = 5u16;

tests/incremental/hashes/loop_expressions.rs

@@ -29,9 +29,9 @@ pub fn change_loop_body() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_loop_body() {
     let mut _x = 0;
@@ -54,9 +54,9 @@ pub fn add_break() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir, typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir, typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir, typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir, typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_break() {
     let mut _x = 0;
@@ -79,9 +79,9 @@ pub fn add_loop_label() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_loop_label() {
     let mut _x = 0;
@@ -104,9 +104,9 @@ pub fn add_loop_label_to_break() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_loop_label_to_break() {
     let mut _x = 0;
@@ -131,9 +131,9 @@ pub fn change_break_label() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir, typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir, typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir, typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir, typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_break_label() {
     let mut _x = 0;
@@ -158,9 +158,9 @@ pub fn add_loop_label_to_continue() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_loop_label_to_continue() {
     let mut _x = 0;
@@ -185,9 +185,9 @@ pub fn change_continue_label() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_continue_label() {
     let mut _x = 0;
@@ -212,9 +212,9 @@ pub fn change_continue_to_break() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, typeck_root, optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, typeck_root, optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, typeck_root, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, typeck_root, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_continue_to_break() {
     let mut _x = 0;

tests/incremental/hashes/match_expressions.rs

@@ -29,9 +29,9 @@ pub fn add_arm(x: u32) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_arm(x: u32) -> u32 {
     match x {
@@ -55,9 +55,9 @@ pub fn change_order_of_arms(x: u32) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_order_of_arms(x: u32) -> u32 {
     match x {
@@ -80,9 +80,9 @@ pub fn add_guard_clause(x: u32, y: bool) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_guard_clause(x: u32, y: bool) -> u32 {
     match x {
@@ -105,9 +105,9 @@ pub fn change_guard_clause(x: u32, y: bool) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_guard_clause(x: u32, y: bool) -> u32 {
     match x {
@@ -130,9 +130,9 @@ pub fn add_at_binding(x: u32) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_at_binding(x: u32) -> u32 {
     match x {
@@ -155,9 +155,9 @@ pub fn change_name_of_at_binding(x: u32) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_name_of_at_binding(x: u32) -> u32 {
     match x {
@@ -179,9 +179,9 @@ pub fn change_simple_name_to_pattern(x: u32) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_simple_name_to_pattern(x: u32) -> u32 {
     match (x, x & 1) {
@@ -203,9 +203,9 @@ pub fn change_name_in_pattern(x: u32) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_name_in_pattern(x: u32) -> u32 {
     match (x, x & 1) {
@@ -228,9 +228,9 @@ pub fn change_mutability_of_binding_in_pattern(x: u32) -> u32 {
 
 // Ignore optimized_mir in bpass2, the only change to optimized MIR is a span.
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_mutability_of_binding_in_pattern(x: u32) -> u32 {
     match (x, x & 1) {
@@ -251,9 +251,9 @@ pub fn add_ref_to_binding_in_pattern(x: u32) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_ref_to_binding_in_pattern(x: u32) -> u32 {
     match (x, x & 1) {
@@ -274,9 +274,9 @@ pub fn add_amp_to_binding_in_pattern(x: u32) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_amp_to_binding_in_pattern(x: u32) -> u32 {
     match (&x, x & 1) {
@@ -298,9 +298,9 @@ pub fn change_rhs_of_arm(x: u32) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_rhs_of_arm(x: u32) -> u32 {
     match x {
@@ -323,9 +323,9 @@ pub fn add_alternative_to_arm(x: u32) -> u32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_alternative_to_arm(x: u32) -> u32 {
     match x {

tests/incremental/hashes/panic_exprs.rs

@@ -19,7 +19,7 @@
 
 
 // Indexing expression
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
 pub fn indexing(slice: &[u8]) -> u8 {
     #[cfg(bpass1)]
@@ -34,7 +34,7 @@ pub fn indexing(slice: &[u8]) -> u8 {
 
 
 // Arithmetic overflow plus
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
 pub fn arithmetic_overflow_plus(val: i32) -> i32 {
     #[cfg(bpass1)]
@@ -49,7 +49,7 @@ pub fn arithmetic_overflow_plus(val: i32) -> i32 {
 
 
 // Arithmetic overflow minus
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
 pub fn arithmetic_overflow_minus(val: i32) -> i32 {
     #[cfg(bpass1)]
@@ -64,7 +64,7 @@ pub fn arithmetic_overflow_minus(val: i32) -> i32 {
 
 
 // Arithmetic overflow mult
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
 pub fn arithmetic_overflow_mult(val: i32) -> i32 {
     #[cfg(bpass1)]
@@ -79,7 +79,7 @@ pub fn arithmetic_overflow_mult(val: i32) -> i32 {
 
 
 // Arithmetic overflow negation
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
 pub fn arithmetic_overflow_negation(val: i32) -> i32 {
     #[cfg(bpass1)]
@@ -94,7 +94,7 @@ pub fn arithmetic_overflow_negation(val: i32) -> i32 {
 
 
 // Division by zero
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
 pub fn division_by_zero(val: i32) -> i32 {
     #[cfg(bpass1)]
@@ -108,7 +108,7 @@ pub fn division_by_zero(val: i32) -> i32 {
 }
 
 // Division by zero
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
 pub fn mod_by_zero(val: i32) -> i32 {
     #[cfg(bpass1)]
@@ -123,7 +123,7 @@ pub fn mod_by_zero(val: i32) -> i32 {
 
 
 // shift left
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
 pub fn shift_left(val: i32, shift: usize) -> i32 {
     #[cfg(bpass1)]
@@ -138,7 +138,7 @@ pub fn shift_left(val: i32, shift: usize) -> i32 {
 
 
 // shift right
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
 pub fn shift_right(val: i32, shift: usize) -> i32 {
     #[cfg(bpass1)]

tests/incremental/hashes/statics.rs

@@ -27,7 +27,7 @@
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub static STATIC_VISIBILITY: u8 = 0;
 
@@ -37,9 +37,9 @@
 static STATIC_MUTABILITY: u8 = 0;
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 static mut STATIC_MUTABILITY: u8 = 0;
 
@@ -88,9 +88,9 @@
 static STATIC_CHANGE_TYPE_1: i16 = 0;
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass6")]
 static STATIC_CHANGE_TYPE_1: u64 = 0;
 
@@ -100,17 +100,17 @@
 static STATIC_CHANGE_TYPE_2: Option<i8> = None;
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass6")]
 static STATIC_CHANGE_TYPE_2: Option<u16> = None;
 
 
 // Change value between simple literals
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 static STATIC_CHANGE_VALUE_1: i16 = {
     #[cfg(any(bpass1,bpass4))]
@@ -122,9 +122,9 @@
 
 
 // Change value between expressions
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 static STATIC_CHANGE_VALUE_2: i16 = {
     #[cfg(any(bpass1,bpass4))]
@@ -134,9 +134,9 @@
     { 1 + 2 }
 };
 
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 static STATIC_CHANGE_VALUE_3: i16 = {
     #[cfg(any(bpass1,bpass4))]
@@ -146,9 +146,9 @@
     { 2 * 3 }
 };
 
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 static STATIC_CHANGE_VALUE_4: i16 = {
     #[cfg(any(bpass1,bpass4))]
@@ -170,15 +170,15 @@ mod static_change_type_indirectly {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::ReferencedType2 as Type;
 
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner,type_of")]
     #[rustc_clean(cfg="bpass6")]
     static STATIC_CHANGE_TYPE_INDIRECTLY_1: Type = Type;
 
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner,type_of")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")]
+    #[rustc_clean(cfg="bpass5", except="hir_owner,type_of")]
     #[rustc_clean(cfg="bpass6")]
     static STATIC_CHANGE_TYPE_INDIRECTLY_2: Option<Type> = None;
 }

tests/incremental/hashes/struct_constructors.rs

@@ -35,9 +35,9 @@ pub fn change_field_value_regular_struct() -> RegularStruct {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_field_value_regular_struct() -> RegularStruct {
     RegularStruct {
@@ -60,9 +60,9 @@ pub fn change_field_order_regular_struct() -> RegularStruct {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_field_order_regular_struct() -> RegularStruct {
     RegularStruct {
@@ -91,9 +91,9 @@ pub fn add_field_regular_struct() -> RegularStruct {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_field_regular_struct() -> RegularStruct {
     let struct1 = RegularStruct {
@@ -128,9 +128,9 @@ pub fn change_field_label_regular_struct() -> RegularStruct {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_field_label_regular_struct() -> RegularStruct {
     let struct1 = RegularStruct {
@@ -165,9 +165,9 @@ pub fn change_constructor_path_regular_struct() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_constructor_path_regular_struct() {
     let _ = RegularStruct2 {
@@ -186,9 +186,9 @@ pub mod change_constructor_path_indirectly_regular_struct {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::RegularStruct2 as Struct;
 
-    #[rustc_clean(cfg="bpass2", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")]
+    #[rustc_clean(cfg="bpass2", except="fn_sig,hir_owner,optimized_mir,typeck_root")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(cfg="bpass5", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")]
+    #[rustc_clean(cfg="bpass5", except="fn_sig,hir_owner,optimized_mir,typeck_root")]
     #[rustc_clean(cfg="bpass6")]
     pub fn function() -> Struct {
         Struct {
@@ -210,9 +210,9 @@ pub fn change_field_value_tuple_struct() -> TupleStruct {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_field_value_tuple_struct() -> TupleStruct {
     TupleStruct(0, 1, 3)
@@ -229,9 +229,9 @@ pub fn change_constructor_path_tuple_struct() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_constructor_path_tuple_struct() {
     let _ = TupleStruct2(0, 1, 2);
@@ -246,9 +246,9 @@ pub mod change_constructor_path_indirectly_tuple_struct {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::TupleStruct2 as Struct;
 
-    #[rustc_clean(cfg="bpass5", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")]
+    #[rustc_clean(cfg="bpass5", except="fn_sig,hir_owner,optimized_mir,typeck_root")]
     #[rustc_clean(cfg="bpass6")]
-    #[rustc_clean(cfg="bpass2", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")]
+    #[rustc_clean(cfg="bpass2", except="fn_sig,hir_owner,optimized_mir,typeck_root")]
     #[rustc_clean(cfg="bpass3")]
     pub fn function() -> Struct {
         Struct(0, 1, 2)

tests/incremental/hashes/struct_defs.rs

@@ -52,9 +52,9 @@
 struct TupleStructFieldType(i32);
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")]
+#[rustc_clean(except="hir_owner", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 // Note that changing the type of a field does not change the type of the struct or enum, but
 // adding/removing fields or changing a fields name or visibility does.
@@ -69,9 +69,9 @@ struct TupleStructFieldType(
 struct TupleStructAddField(i32);
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,type_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,type_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,type_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,type_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 struct TupleStructAddField(
     i32,
@@ -87,7 +87,7 @@ struct TupleStructAddField(
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2", except="type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass6")]
 struct TupleStructFieldVisibility(pub char);
 
@@ -98,9 +98,9 @@ struct TupleStructAddField(
 struct RecordStructFieldType { x: f32 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")]
+#[rustc_clean(except="hir_owner", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 // Note that changing the type of a field does not change the type of the struct or enum, but
 // adding/removing fields or changing a fields name or visibility does.
@@ -115,9 +115,9 @@ struct RecordStructFieldType {
 struct RecordStructFieldName { x: f32 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,type_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,type_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,type_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,type_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 struct RecordStructFieldName { y: f32 }
 
@@ -128,9 +128,9 @@ struct RecordStructFieldName { y: f32 }
 struct RecordStructAddField { x: f32 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,type_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,type_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,type_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,type_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 struct RecordStructAddField {
     x: f32,
@@ -145,7 +145,7 @@ struct RecordStructFieldVisibility {     x: f32 }
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2", except="type_of")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,type_of")]
 #[rustc_clean(cfg="bpass6")]
 struct RecordStructFieldVisibility { pub x: f32 }
 
@@ -156,9 +156,9 @@ struct RecordStructFieldVisibility { pub x: f32 }
 struct AddLifetimeParameter<'a>(&'a f32, &'a f64);
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,type_of,generics_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,type_of,generics_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,type_of,generics_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,type_of,generics_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 struct AddLifetimeParameter<'a, 'b>(&'a f32, &'b f64);
 
@@ -169,9 +169,9 @@ struct RecordStructFieldVisibility { pub x: f32 }
 struct AddLifetimeParameterBound<'a, 'b>(&'a f32, &'b f64);
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 struct AddLifetimeParameterBound<'a, 'b: 'a>(
     &'a f32,
@@ -182,9 +182,9 @@ struct AddLifetimeParameterBound<'a, 'b: 'a>(
 struct AddLifetimeParameterBoundWhereClause<'a, 'b>(&'a f32, &'b f64);
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 struct AddLifetimeParameterBoundWhereClause<'a, 'b>(
     &'a f32,
@@ -198,9 +198,9 @@ struct AddLifetimeParameterBoundWhereClause<'a, 'b>(
 struct AddTypeParameter<T1>(T1, T1);
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,type_of,generics_of,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,type_of,generics_of,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,type_of,generics_of,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,type_of,generics_of,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 struct AddTypeParameter<T1, T2>(
      // The field contains the parent's Generics, so it's dirty even though its
@@ -216,9 +216,9 @@ struct AddTypeParameter<T1, T2>(
 struct AddTypeParameterBound<T>(T);
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 struct AddTypeParameterBound<T: Send>(
     T
@@ -229,9 +229,9 @@ struct AddTypeParameterBound<T: Send>(
 struct AddTypeParameterBoundWhereClause<T>(T);
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 struct AddTypeParameterBoundWhereClause<T>(
     T
@@ -258,7 +258,7 @@ struct AddTypeParameterBoundWhereClause<T>(
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub struct Visibility;
 
@@ -272,9 +272,9 @@ mod tuple_struct_change_field_type_indirectly {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::ReferencedType2 as FieldType;
 
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     struct TupleStruct(
         FieldType
@@ -289,9 +289,9 @@ mod record_struct_change_field_type_indirectly {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::ReferencedType2 as FieldType;
 
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     struct RecordStruct {
         _x: FieldType
@@ -311,9 +311,9 @@ mod change_trait_bound_indirectly {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::ReferencedTrait2 as Trait;
 
-    #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     struct Struct<T: Trait>(T);
 }
@@ -325,9 +325,9 @@ mod change_trait_bound_indirectly_in_where_clause {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::ReferencedTrait2 as Trait;
 
-    #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     struct Struct<T>(T) where T : Trait;
 }

tests/incremental/hashes/trait_defs.rs

@@ -31,7 +31,7 @@ trait TraitVisibility { }
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,predicates_of")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,predicates_of")]
 #[rustc_clean(cfg="bpass6")]
 pub trait TraitVisibility { }
 
@@ -42,9 +42,9 @@ pub trait TraitVisibility { }
 trait TraitUnsafety { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")]
+#[rustc_clean(except="hir_owner", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 unsafe trait TraitUnsafety { }
 
@@ -56,9 +56,9 @@ trait TraitAddMethod {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,associated_item_def_ids", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,associated_item_def_ids,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub trait TraitAddMethod {
     fn method();
@@ -73,9 +73,9 @@ trait TraitChangeMethodName {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,associated_item_def_ids", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,associated_item_def_ids,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitChangeMethodName {
     fn methodChanged();
@@ -96,12 +96,12 @@ trait TraitAddReturnType {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddReturnType {
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method() -> u32;
 }
@@ -121,12 +121,12 @@ trait TraitChangeReturnType {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitChangeReturnType {
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method() -> u64;
 }
@@ -146,12 +146,12 @@ trait TraitAddParameterToMethod {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddParameterToMethod {
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method(a: u32);
 }
@@ -178,19 +178,19 @@ fn with_default(x: i32) {}
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitChangeMethodParameterName {
     // FIXME(#38501) This should preferably always be clean.
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method(b: u32);
 
-    #[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn with_default(y: i32) {}
 }
@@ -210,12 +210,12 @@ trait TraitChangeMethodParameterType {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitChangeMethodParameterType {
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method(a: i64);
 }
@@ -235,12 +235,12 @@ trait TraitChangeMethodParameterTypeRef {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitChangeMethodParameterTypeRef {
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method(a: &mut i32);
 }
@@ -260,12 +260,12 @@ trait TraitChangeMethodParametersOrder {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitChangeMethodParametersOrder {
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method(b: i64, a: i32);
 }
@@ -285,12 +285,12 @@ trait TraitAddMethodAutoImplementation {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddMethodAutoImplementation {
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method() {}
 }
@@ -305,9 +305,9 @@ trait TraitChangeOrderOfMethods {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,associated_item_def_ids", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,associated_item_def_ids", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitChangeOrderOfMethods {
     fn method1();
@@ -329,12 +329,12 @@ trait TraitChangeModeSelfRefToMut {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitChangeModeSelfRefToMut {
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method(&mut self);
 }
@@ -353,12 +353,12 @@ fn method(    self) {}
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitChangeModeSelfOwnToMut: Sized {
-    #[rustc_clean(except="opt_hir_owner_nodes,typeck_root,optimized_mir", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,typeck_root,optimized_mir", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,typeck_root,optimized_mir", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,typeck_root,optimized_mir", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method(mut self) {}
 }
@@ -377,12 +377,12 @@ trait TraitChangeModeSelfOwnToRef {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitChangeModeSelfOwnToRef {
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig,generics_of", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,fn_sig,generics_of", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig,generics_of", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,fn_sig,generics_of", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method(&self);
 }
@@ -402,12 +402,12 @@ trait TraitAddUnsafeModifier {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddUnsafeModifier {
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     unsafe fn method();
 }
@@ -427,12 +427,12 @@ trait TraitAddExternModifier {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddExternModifier {
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     extern "C" fn method();
 }
@@ -452,12 +452,12 @@ trait TraitChangeExternCToExternSystem {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitChangeExternCToRustIntrinsic {
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     extern "system" fn method();
 }
@@ -479,13 +479,13 @@ trait TraitAddTypeParameterToMethod {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddTypeParameterToMethod {
-    #[rustc_clean(except="opt_hir_owner_nodes,generics_of,predicates_of,type_of",
+    #[rustc_clean(except="hir_owner,generics_of,predicates_of,type_of",
         cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,generics_of,predicates_of,type_of",
+    #[rustc_clean(except="hir_owner,generics_of,predicates_of,type_of",
         cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method<T>();
@@ -506,12 +506,12 @@ trait TraitAddLifetimeParameterToMethod {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddLifetimeParameterToMethod {
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig,generics_of", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,fn_sig,generics_of", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig,generics_of", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,fn_sig,generics_of", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method<'a>();
 }
@@ -535,12 +535,12 @@ trait TraitAddTraitBoundToMethodTypeParameter {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddTraitBoundToMethodTypeParameter {
-    #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method<T: ReferencedTrait0>();
 }
@@ -560,12 +560,12 @@ trait TraitAddBuiltinBoundToMethodTypeParameter {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddBuiltinBoundToMethodTypeParameter {
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method<T: Sized>();
 }
@@ -591,16 +591,16 @@ trait TraitAddLifetimeBoundToMethodLifetimeParameter {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddLifetimeBoundToMethodLifetimeParameter {
     #[rustc_clean(
-        except="opt_hir_owner_nodes,generics_of,predicates_of,fn_sig,type_of",
+        except="hir_owner,generics_of,predicates_of,fn_sig,type_of",
         cfg="bpass2",
     )]
     #[rustc_clean(cfg="bpass3")]
     #[rustc_clean(
-        except="opt_hir_owner_nodes,generics_of,predicates_of,fn_sig,type_of",
+        except="hir_owner,generics_of,predicates_of,fn_sig,type_of",
         cfg="bpass5",
     )]
     #[rustc_clean(cfg="bpass6")]
@@ -622,12 +622,12 @@ trait TraitAddSecondTraitBoundToMethodTypeParameter {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddSecondTraitBoundToMethodTypeParameter {
-    #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method<T: ReferencedTrait0 + ReferencedTrait1>();
 }
@@ -647,12 +647,12 @@ trait TraitAddSecondBuiltinBoundToMethodTypeParameter {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddSecondBuiltinBoundToMethodTypeParameter {
-    #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method<T: Sized + Sync>();
 }
@@ -678,16 +678,16 @@ trait TraitAddSecondLifetimeBoundToMethodLifetimeParameter {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddSecondLifetimeBoundToMethodLifetimeParameter {
     #[rustc_clean(
-        except="opt_hir_owner_nodes,generics_of,predicates_of,fn_sig,type_of",
+        except="hir_owner,generics_of,predicates_of,fn_sig,type_of",
         cfg="bpass2",
     )]
     #[rustc_clean(cfg="bpass3")]
     #[rustc_clean(
-        except="opt_hir_owner_nodes,generics_of,predicates_of,fn_sig,type_of",
+        except="hir_owner,generics_of,predicates_of,fn_sig,type_of",
         cfg="bpass5",
     )]
     #[rustc_clean(cfg="bpass6")]
@@ -711,9 +711,9 @@ trait TraitAddAssociatedType {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,associated_item_def_ids", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,associated_item_def_ids", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddAssociatedType {
     #[rustc_clean(cfg="bpass3")]
@@ -747,12 +747,12 @@ trait TraitAddTraitBoundToAssociatedType {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddTraitBoundToAssociatedType {
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     type Associated: ReferencedTrait0;
 
@@ -776,12 +776,12 @@ trait TraitAddLifetimeBoundToAssociatedType<'a> {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddLifetimeBoundToAssociatedType<'a> {
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     type Associated: 'a;
 
@@ -805,12 +805,12 @@ trait TraitAddDefaultToAssociatedType {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddDefaultToAssociatedType {
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     type Associated = ReferenceType0;
 
@@ -826,9 +826,9 @@ trait TraitAddAssociatedConstant {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,associated_item_def_ids", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,associated_item_def_ids,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddAssociatedConstant {
     const Value: u32;
@@ -857,12 +857,12 @@ trait TraitAddInitializerToAssociatedConstant {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddInitializerToAssociatedConstant {
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     const Value: u32 = 1;
 
@@ -894,12 +894,12 @@ trait TraitChangeTypeOfAssociatedConstant {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitChangeTypeOfAssociatedConstant {
-    #[rustc_clean(except="opt_hir_owner_nodes,type_of", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,type_of", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,type_of", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,type_of", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     const Value: f64;
 
@@ -917,9 +917,9 @@ trait TraitChangeTypeOfAssociatedConstant {
 trait TraitAddSuperTrait { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddSuperTrait : ReferencedTrait0 { }
 
@@ -930,9 +930,9 @@ trait TraitAddSuperTrait : ReferencedTrait0 { }
 trait TraitAddBuiltiBound { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddBuiltiBound : Send { }
 
@@ -943,9 +943,9 @@ trait TraitAddBuiltiBound : Send { }
 trait TraitAddStaticLifetimeBound { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddStaticLifetimeBound : 'static { }
 
@@ -956,9 +956,9 @@ trait TraitAddStaticLifetimeBound : 'static { }
 trait TraitAddTraitAsSecondBound : ReferencedTrait0 { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddTraitAsSecondBound : ReferencedTrait0 + ReferencedTrait1 { }
 
@@ -966,9 +966,9 @@ trait TraitAddTraitAsSecondBound : ReferencedTrait0 + ReferencedTrait1 { }
 trait TraitAddTraitAsSecondBoundFromBuiltin : Send { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddTraitAsSecondBoundFromBuiltin : Send + ReferencedTrait0 { }
 
@@ -979,9 +979,9 @@ trait TraitAddTraitAsSecondBoundFromBuiltin : Send + ReferencedTrait0 { }
 trait TraitAddBuiltinBoundAsSecondBound : ReferencedTrait0 { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddBuiltinBoundAsSecondBound : ReferencedTrait0 + Send { }
 
@@ -989,9 +989,9 @@ trait TraitAddBuiltinBoundAsSecondBound : ReferencedTrait0 + Send { }
 trait TraitAddBuiltinBoundAsSecondBoundFromBuiltin : Send { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddBuiltinBoundAsSecondBoundFromBuiltin: Send + Copy { }
 
@@ -1002,9 +1002,9 @@ trait TraitAddBuiltinBoundAsSecondBoundFromBuiltin: Send + Copy { }
 trait TraitAddStaticBoundAsSecondBound : ReferencedTrait0 { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddStaticBoundAsSecondBound : ReferencedTrait0 + 'static { }
 
@@ -1012,9 +1012,9 @@ trait TraitAddStaticBoundAsSecondBound : ReferencedTrait0 + 'static { }
 trait TraitAddStaticBoundAsSecondBoundFromBuiltin : Send { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddStaticBoundAsSecondBoundFromBuiltin : Send + 'static { }
 
@@ -1025,9 +1025,9 @@ trait TraitAddStaticBoundAsSecondBoundFromBuiltin : Send + 'static { }
 trait TraitAddTypeParameterToTrait { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,generics_of,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,generics_of,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,generics_of,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,generics_of,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddTypeParameterToTrait<T> { }
 
@@ -1038,9 +1038,9 @@ trait TraitAddTypeParameterToTrait<T> { }
 trait TraitAddLifetimeParameterToTrait { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,generics_of,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,generics_of,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,generics_of,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,generics_of,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddLifetimeParameterToTrait<'a> { }
 
@@ -1051,9 +1051,9 @@ trait TraitAddLifetimeParameterToTrait<'a> { }
 trait TraitAddTraitBoundToTypeParameterOfTrait<T> { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddTraitBoundToTypeParameterOfTrait<T: ReferencedTrait0> { }
 
@@ -1064,9 +1064,9 @@ trait TraitAddTraitBoundToTypeParameterOfTrait<T: ReferencedTrait0> { }
 trait TraitAddLifetimeBoundToTypeParameterOfTrait<'a, T> { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddLifetimeBoundToTypeParameterOfTrait<'a, T: 'a> { }
 
@@ -1077,9 +1077,9 @@ trait TraitAddLifetimeBoundToTypeParameterOfTrait<'a, T: 'a> { }
 trait TraitAddLifetimeBoundToLifetimeParameterOfTrait<'a, 'b> { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddLifetimeBoundToLifetimeParameterOfTrait<'a: 'b, 'b> { }
 
@@ -1090,9 +1090,9 @@ trait TraitAddLifetimeBoundToLifetimeParameterOfTrait<'a: 'b, 'b> { }
 trait TraitAddBuiltinBoundToTypeParameterOfTrait<T> { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddBuiltinBoundToTypeParameterOfTrait<T: Send> { }
 
@@ -1103,9 +1103,9 @@ trait TraitAddBuiltinBoundToTypeParameterOfTrait<T: Send> { }
 trait TraitAddSecondTypeParameterToTrait<T> { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,generics_of,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,generics_of,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,generics_of,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,generics_of,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddSecondTypeParameterToTrait<T, S> { }
 
@@ -1116,9 +1116,9 @@ trait TraitAddSecondTypeParameterToTrait<T, S> { }
 trait TraitAddSecondLifetimeParameterToTrait<'a> { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,generics_of,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,generics_of,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,generics_of,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,generics_of,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddSecondLifetimeParameterToTrait<'a, 'b> { }
 
@@ -1129,9 +1129,9 @@ trait TraitAddSecondLifetimeParameterToTrait<'a, 'b> { }
 trait TraitAddSecondTraitBoundToTypeParameterOfTrait<T: ReferencedTrait0> { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddSecondTraitBoundToTypeParameterOfTrait<T: ReferencedTrait0 + ReferencedTrait1> { }
 
@@ -1142,9 +1142,9 @@ trait TraitAddSecondTraitBoundToTypeParameterOfTrait<T: ReferencedTrait0 + Refer
 trait TraitAddSecondLifetimeBoundToTypeParameterOfTrait<'a, 'b, T: 'a> { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddSecondLifetimeBoundToTypeParameterOfTrait<'a, 'b, T: 'a + 'b> { }
 
@@ -1155,9 +1155,9 @@ trait TraitAddSecondLifetimeBoundToTypeParameterOfTrait<'a, 'b, T: 'a + 'b> { }
 trait TraitAddSecondLifetimeBoundToLifetimeParameterOfTrait<'a: 'b, 'b, 'c> { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddSecondLifetimeBoundToLifetimeParameterOfTrait<'a: 'b + 'c, 'b, 'c> { }
 
@@ -1168,9 +1168,9 @@ trait TraitAddSecondLifetimeBoundToLifetimeParameterOfTrait<'a: 'b + 'c, 'b, 'c>
 trait TraitAddSecondBuiltinBoundToTypeParameterOfTrait<T: Send> { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddSecondBuiltinBoundToTypeParameterOfTrait<T: Send + Sync> { }
 
@@ -1186,9 +1186,9 @@ struct ReferenceType1 {}
 trait TraitAddTraitBoundToTypeParameterOfTraitWhere<T> { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddTraitBoundToTypeParameterOfTraitWhere<T> where T: ReferencedTrait0 { }
 
@@ -1199,9 +1199,9 @@ trait TraitAddTraitBoundToTypeParameterOfTraitWhere<T> where T: ReferencedTrait0
 trait TraitAddLifetimeBoundToTypeParameterOfTraitWhere<'a, T> { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddLifetimeBoundToTypeParameterOfTraitWhere<'a, T> where T: 'a { }
 
@@ -1212,9 +1212,9 @@ trait TraitAddLifetimeBoundToTypeParameterOfTraitWhere<'a, T> where T: 'a { }
 trait TraitAddLifetimeBoundToLifetimeParameterOfTraitWhere<'a, 'b> { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddLifetimeBoundToLifetimeParameterOfTraitWhere<'a, 'b> where 'a: 'b { }
 
@@ -1225,9 +1225,9 @@ trait TraitAddLifetimeBoundToLifetimeParameterOfTraitWhere<'a, 'b> where 'a: 'b
 trait TraitAddBuiltinBoundToTypeParameterOfTraitWhere<T> { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddBuiltinBoundToTypeParameterOfTraitWhere<T> where T: Send { }
 
@@ -1238,9 +1238,9 @@ trait TraitAddBuiltinBoundToTypeParameterOfTraitWhere<T> where T: Send { }
 trait TraitAddSecondTraitBoundToTypeParameterOfTraitWhere<T> where T: ReferencedTrait0 { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddSecondTraitBoundToTypeParameterOfTraitWhere<T>
     where T: ReferencedTrait0 + ReferencedTrait1 { }
@@ -1252,9 +1252,9 @@ trait TraitAddSecondTraitBoundToTypeParameterOfTraitWhere<T>
 trait TraitAddSecondLifetimeBoundToTypeParameterOfTraitWhere<'a, 'b, T> where T: 'a { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddSecondLifetimeBoundToTypeParameterOfTraitWhere<'a, 'b, T> where T: 'a + 'b { }
 
@@ -1265,9 +1265,9 @@ trait TraitAddSecondLifetimeBoundToTypeParameterOfTraitWhere<'a, 'b, T> where T:
 trait TraitAddSecondLifetimeBoundToLifetimeParameterOfTraitWhere<'a, 'b, 'c> where 'a: 'b { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddSecondLifetimeBoundToLifetimeParameterOfTraitWhere<'a, 'b, 'c> where 'a: 'b + 'c { }
 
@@ -1278,9 +1278,9 @@ trait TraitAddSecondLifetimeBoundToLifetimeParameterOfTraitWhere<'a, 'b, 'c> whe
 trait TraitAddSecondBuiltinBoundToTypeParameterOfTraitWhere<T> where T: Send { }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 trait TraitAddSecondBuiltinBoundToTypeParameterOfTraitWhere<T> where T: Send + Sync { }
 
@@ -1297,9 +1297,9 @@ mod change_return_type_of_method_indirectly_use {
     #[rustc_clean(cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     trait TraitChangeReturnType {
-        #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")]
+        #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass2")]
         #[rustc_clean(cfg="bpass3")]
-        #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")]
+        #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass5")]
         #[rustc_clean(cfg="bpass6")]
         fn method() -> ReturnType;
     }
@@ -1319,9 +1319,9 @@ mod change_method_parameter_type_indirectly_by_use {
     #[rustc_clean(cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     trait TraitChangeArgType {
-        #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")]
+        #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass2")]
         #[rustc_clean(cfg="bpass3")]
-        #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")]
+        #[rustc_clean(except="hir_owner,fn_sig", cfg="bpass5")]
         #[rustc_clean(cfg="bpass6")]
         fn method(a: ArgType);
     }
@@ -1341,9 +1341,9 @@ mod change_method_parameter_type_bound_indirectly_by_use {
     #[rustc_clean(cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     trait TraitChangeBoundOfMethodTypeParameter {
-        #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+        #[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
         #[rustc_clean(cfg="bpass3")]
-        #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+        #[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
         #[rustc_clean(cfg="bpass6")]
         fn method<T: Bound>(a: T);
     }
@@ -1364,9 +1364,9 @@ mod change_method_parameter_type_bound_indirectly_by_use_where {
     #[rustc_clean(cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     trait TraitChangeBoundOfMethodTypeParameterWhere {
-        #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+        #[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
         #[rustc_clean(cfg="bpass3")]
-        #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+        #[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
         #[rustc_clean(cfg="bpass6")]
         fn method<T>(a: T) where T: Bound;
     }
@@ -1381,9 +1381,9 @@ mod change_method_type_parameter_bound_indirectly {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::ReferencedTrait1 as Bound;
 
-    #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     trait TraitChangeTraitBound<T: Bound> {
         fn method(a: T);
@@ -1400,9 +1400,9 @@ mod change_method_type_parameter_bound_indirectly_where {
     #[cfg(not(any(bpass1,bpass4)))]
     use super::ReferencedTrait1 as Bound;
 
-    #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,predicates_of", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     trait TraitChangeTraitBoundWhere<T> where T: Bound {
         fn method(a: T);

tests/incremental/hashes/trait_impls.rs

@@ -33,9 +33,9 @@ fn method_name() { }
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,associated_item_def_ids", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids,predicates_of", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,associated_item_def_ids,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub trait ChangeMethodNameTrait {
     #[rustc_clean(cfg="bpass3")]
@@ -44,9 +44,9 @@ pub trait ChangeMethodNameTrait {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,associated_item_def_ids", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,associated_item_def_ids", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl ChangeMethodNameTrait for Foo {
     #[rustc_clean(cfg="bpass3")]
@@ -76,12 +76,12 @@ fn method_name() {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl ChangeMethodBodyTrait for Foo {
-    #[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,typeck_root", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,typeck_root", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method_name() {
         ()
@@ -111,12 +111,12 @@ fn method_name() {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl ChangeMethodBodyTraitInlined for Foo {
-    #[rustc_clean(except="opt_hir_owner_nodes,typeck_root,optimized_mir", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,typeck_root,optimized_mir", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,typeck_root,optimized_mir", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,typeck_root,optimized_mir", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     #[inline]
     fn method_name() {
@@ -144,16 +144,16 @@ pub trait ChangeMethodSelfnessTrait {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl ChangeMethodSelfnessTrait for Foo {
     #[rustc_clean(
-        except="opt_hir_owner_nodes,associated_item,generics_of,fn_sig,typeck_root,optimized_mir",
+        except="hir_owner,associated_item,generics_of,fn_sig,typeck_root,optimized_mir",
         cfg="bpass2",
     )]
     #[rustc_clean(cfg="bpass3")]
     #[rustc_clean(
-        except="opt_hir_owner_nodes,associated_item,generics_of,fn_sig,typeck_root,optimized_mir",
+        except="hir_owner,associated_item,generics_of,fn_sig,typeck_root,optimized_mir",
         cfg="bpass5",
     )]
     #[rustc_clean(cfg="bpass6")]
@@ -182,16 +182,16 @@ pub trait RemoveMethodSelfnessTrait {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl RemoveMethodSelfnessTrait for Foo {
     #[rustc_clean(
-        except="opt_hir_owner_nodes,associated_item,generics_of,fn_sig,typeck_root,optimized_mir",
+        except="hir_owner,associated_item,generics_of,fn_sig,typeck_root,optimized_mir",
         cfg="bpass2",
     )]
     #[rustc_clean(cfg="bpass3")]
     #[rustc_clean(
-        except="opt_hir_owner_nodes,associated_item,generics_of,fn_sig,typeck_root,optimized_mir",
+        except="hir_owner,associated_item,generics_of,fn_sig,typeck_root,optimized_mir",
         cfg="bpass5",
     )]
     #[rustc_clean(cfg="bpass6")]
@@ -222,12 +222,12 @@ pub trait ChangeMethodSelfmutnessTrait {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl ChangeMethodSelfmutnessTrait for Foo {
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig,typeck_root,optimized_mir", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,fn_sig,typeck_root,optimized_mir", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig,typeck_root,optimized_mir", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,fn_sig,typeck_root,optimized_mir", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method_name(&mut self) {}
 }
@@ -250,9 +250,9 @@ pub trait ChangeItemKindTrait {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,associated_item_def_ids", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,associated_item_def_ids", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl ChangeItemKindTrait for Foo {
     type name = ();
@@ -278,9 +278,9 @@ pub trait RemoveItemTrait {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,associated_item_def_ids", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,associated_item_def_ids", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl RemoveItemTrait for Foo {
     type TypeName = ();
@@ -305,9 +305,9 @@ pub trait AddItemTrait {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,associated_item_def_ids", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,associated_item_def_ids", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl AddItemTrait for Foo {
     type TypeName = ();
@@ -333,12 +333,12 @@ fn method_name() { }
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner,predicates_of", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub trait ChangeHasValueTrait {
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method_name() { }
 }
@@ -370,12 +370,12 @@ fn         method_name() { }
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl AddDefaultTrait for Foo {
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     default fn method_name() { }
 }
@@ -404,12 +404,12 @@ pub trait AddArgumentTrait {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl AddArgumentTrait for Foo {
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig,typeck_root,optimized_mir", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,fn_sig,typeck_root,optimized_mir", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig,typeck_root,optimized_mir", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,fn_sig,typeck_root,optimized_mir", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method_name(&self, _x: u32) { }
 }
@@ -438,12 +438,12 @@ pub trait ChangeArgumentTypeTrait {
 #[cfg(not(any(bpass1,bpass4)))]
 #[rustc_clean(cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl ChangeArgumentTypeTrait for Foo {
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig,typeck_root,optimized_mir", cfg="bpass2")]
+    #[rustc_clean(except="hir_owner,fn_sig,typeck_root,optimized_mir", cfg="bpass2")]
     #[rustc_clean(cfg="bpass3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,fn_sig,typeck_root,optimized_mir", cfg="bpass5")]
+    #[rustc_clean(except="hir_owner,fn_sig,typeck_root,optimized_mir", cfg="bpass5")]
     #[rustc_clean(cfg="bpass6")]
     fn method_name(&self, _x: char) { }
 }
@@ -463,18 +463,18 @@ fn id(t: u32) -> u32 { t }
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,generics_of,impl_trait_header", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,generics_of,impl_trait_header", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,generics_of,impl_trait_header", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,generics_of,impl_trait_header", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl<TTT> AddTypeParameterToImpl<TTT> for Bar<TTT> {
     #[rustc_clean(
-        except="opt_hir_owner_nodes,generics_of,fn_sig,type_of,typeck_root,optimized_mir",
+        except="hir_owner,generics_of,fn_sig,type_of,typeck_root,optimized_mir",
         cfg="bpass2",
     )]
     #[rustc_clean(cfg="bpass3")]
     #[rustc_clean(
-        except="opt_hir_owner_nodes,generics_of,fn_sig,type_of,typeck_root,optimized_mir",
+        except="hir_owner,generics_of,fn_sig,type_of,typeck_root,optimized_mir",
         cfg="bpass5",
     )]
     #[rustc_clean(cfg="bpass6")]
@@ -494,9 +494,9 @@ fn id(self) -> Self { self }
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,impl_trait_header", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,impl_trait_header", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,impl_trait_header", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,impl_trait_header", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl ChangeSelfTypeOfImpl for u64 {
     #[rustc_clean(except="fn_sig,typeck_root,optimized_mir", cfg="bpass2")]
@@ -519,9 +519,9 @@ fn id(self) -> Self { self }
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")]
+#[rustc_clean(except="hir_owner", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl<T: 'static> AddLifetimeBoundToImplParameter for T {
     #[rustc_clean(cfg="bpass2")]
@@ -544,9 +544,9 @@ fn id(self) -> Self { self }
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")]
+#[rustc_clean(except="hir_owner", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")]
+#[rustc_clean(except="hir_owner", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 impl<T: Clone> AddTraitBoundToImplParameter for T {
     #[rustc_clean(cfg="bpass2")]

tests/incremental/hashes/type_defs.rs

@@ -25,7 +25,7 @@
 type ChangePrimitiveType = i32;
 
 #[cfg(not(bpass1))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
 type ChangePrimitiveType = i64;
 
@@ -36,7 +36,7 @@
 type ChangeMutability = &'static i32;
 
 #[cfg(not(bpass1))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
 type ChangeMutability = &'static mut i32;
 
@@ -47,7 +47,7 @@
 type ChangeLifetime<'a> = (&'static i32, &'a i32);
 
 #[cfg(not(bpass1))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
 type ChangeLifetime<'a> = (&'a i32, &'a i32);
 
@@ -61,7 +61,7 @@
 type ChangeTypeStruct = Struct1;
 
 #[cfg(not(bpass1))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
 type ChangeTypeStruct = Struct2;
 
@@ -72,7 +72,7 @@
 type ChangeTypeTuple = (u32, u64);
 
 #[cfg(not(bpass1))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
 type ChangeTypeTuple = (u32, i64);
 
@@ -92,7 +92,7 @@ enum Enum2 {
 type ChangeTypeEnum = Enum1;
 
 #[cfg(not(bpass1))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
 type ChangeTypeEnum = Enum2;
 
@@ -103,7 +103,7 @@ enum Enum2 {
 type AddTupleField = (i32, i64);
 
 #[cfg(not(bpass1))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
 type AddTupleField = (i32, i64, i16);
 
@@ -114,7 +114,7 @@ enum Enum2 {
 type ChangeNestedTupleField = (i32, (i64, i16));
 
 #[cfg(not(bpass1))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
 type ChangeNestedTupleField = (i32, (i64, i8));
 
@@ -125,7 +125,7 @@ enum Enum2 {
 type AddTypeParam<T1> = (T1, T1);
 
 #[cfg(not(bpass1))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
 type AddTypeParam<T1, T2> = (T1, T2);
 
@@ -136,7 +136,7 @@ enum Enum2 {
 type AddTypeParamBound<T1> = (T1, u32);
 
 #[cfg(not(bpass1))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
 type AddTypeParamBound<T1: Clone> = (T1, u32);
 
@@ -147,7 +147,7 @@ enum Enum2 {
 type AddTypeParamBoundWhereClause<T1> where T1: Clone = (T1, u32);
 
 #[cfg(not(bpass1))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
 type AddTypeParamBoundWhereClause<T1> where T1: Clone+Copy = (T1, u32);
 
@@ -158,7 +158,7 @@ enum Enum2 {
 type AddLifetimeParam<'a> = (&'a u32, &'a u32);
 
 #[cfg(not(bpass1))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
 type AddLifetimeParam<'a, 'b> = (&'a u32, &'b u32);
 
@@ -169,7 +169,7 @@ enum Enum2 {
 type AddLifetimeParamBound<'a, 'b> = (&'a u32, &'b u32);
 
 #[cfg(not(bpass1))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
 type AddLifetimeParamBound<'a, 'b: 'a> = (&'a u32, &'b u32);
 
@@ -182,7 +182,7 @@ enum Enum2 {
     = (&'a u32, &'b u32, &'c u32);
 
 #[cfg(not(bpass1))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
 type AddLifetimeParamBoundWhereClause<'a, 'b, 'c>
 where 'b: 'a,
@@ -201,7 +201,7 @@ mod change_trait_bound_indirectly {
     #[cfg(not(bpass1))]
     use super::ReferencedTrait2 as Trait;
 
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner")]
     #[rustc_clean(cfg="bpass3")]
     type ChangeTraitBoundIndirectly<T: Trait> = (T, u32);
 }
@@ -215,7 +215,7 @@ mod change_trait_bound_indirectly_in_where_clause {
     #[cfg(not(bpass1))]
     use super::ReferencedTrait2 as Trait;
 
-    #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+    #[rustc_clean(cfg="bpass2", except="hir_owner")]
     #[rustc_clean(cfg="bpass3")]
     type ChangeTraitBoundIndirectly<T> where T : Trait = (T, u32);
 }

tests/incremental/hashes/unary_and_binary_exprs.rs

@@ -25,9 +25,9 @@ pub fn const_negation() -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn const_negation() -> i32 {
      -1
@@ -42,9 +42,9 @@ pub fn const_bitwise_not() -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn const_bitwise_not() -> i32 {
      !99
@@ -59,9 +59,9 @@ pub fn var_negation(x: i32, y: i32) -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn var_negation(x: i32, y: i32) -> i32 {
     -y
@@ -76,9 +76,9 @@ pub fn var_bitwise_not(x: i32, y: i32) -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn var_bitwise_not(x: i32, y: i32) -> i32 {
     !y
@@ -93,9 +93,9 @@ pub fn var_deref(x: &i32, y: &i32) -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn var_deref(x: &i32, y: &i32) -> i32 {
     *y
@@ -110,9 +110,9 @@ pub fn first_const_add() -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn first_const_add() -> i32 {
     2 + 3
@@ -127,9 +127,9 @@ pub fn second_const_add() -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn second_const_add() -> i32 {
     1 + 3
@@ -144,9 +144,9 @@ pub fn first_var_add(a: i32, b: i32) -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn first_var_add(a: i32, b: i32) -> i32 {
     b + 2
@@ -161,9 +161,9 @@ pub fn second_var_add(a: i32, b: i32) -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn second_var_add(a: i32, b: i32) -> i32 {
     1 + b
@@ -178,9 +178,9 @@ pub fn plus_to_minus(a: i32) -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn plus_to_minus(a: i32) -> i32 {
     1 - a
@@ -195,9 +195,9 @@ pub fn plus_to_mult(a: i32) -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn plus_to_mult(a: i32) -> i32 {
     1 * a
@@ -212,9 +212,9 @@ pub fn plus_to_div(a: i32) -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn plus_to_div(a: i32) -> i32 {
     1 / a
@@ -229,9 +229,9 @@ pub fn plus_to_mod(a: i32) -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn plus_to_mod(a: i32) -> i32 {
     1 % a
@@ -246,9 +246,9 @@ pub fn and_to_or(a: bool, b: bool) -> bool {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn and_to_or(a: bool, b: bool) -> bool {
     a || b
@@ -263,9 +263,9 @@ pub fn bitwise_and_to_bitwise_or(a: i32) -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn bitwise_and_to_bitwise_or(a: i32) -> i32 {
     1 | a
@@ -280,9 +280,9 @@ pub fn bitwise_and_to_bitwise_xor(a: i32) -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn bitwise_and_to_bitwise_xor(a: i32) -> i32 {
     1 ^ a
@@ -297,9 +297,9 @@ pub fn bitwise_and_to_lshift(a: i32) -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn bitwise_and_to_lshift(a: i32) -> i32 {
     a << 1
@@ -314,9 +314,9 @@ pub fn bitwise_and_to_rshift(a: i32) -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn bitwise_and_to_rshift(a: i32) -> i32 {
     a >> 1
@@ -331,9 +331,9 @@ pub fn eq_to_uneq(a: i32) -> bool {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn eq_to_uneq(a: i32) -> bool {
     a != 1
@@ -348,9 +348,9 @@ pub fn eq_to_lt(a: i32) -> bool {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn eq_to_lt(a: i32) -> bool {
     a  < 1
@@ -365,9 +365,9 @@ pub fn eq_to_gt(a: i32) -> bool {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn eq_to_gt(a: i32) -> bool {
     a  > 1
@@ -382,9 +382,9 @@ pub fn eq_to_le(a: i32) -> bool {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn eq_to_le(a: i32) -> bool {
     a <= 1
@@ -399,9 +399,9 @@ pub fn eq_to_ge(a: i32) -> bool {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn eq_to_ge(a: i32) -> bool {
     a >= 1
@@ -418,9 +418,9 @@ pub fn type_cast(a: u8) -> u64 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir,typeck_root", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir,typeck_root", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir,typeck_root", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir,typeck_root", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn type_cast(a: u8) -> u64 {
     let b = a as u32;
@@ -437,9 +437,9 @@ pub fn value_cast(a: u32) -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn value_cast(a: u32) -> i32 {
     2 as i32
@@ -457,9 +457,9 @@ pub fn place() -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn place() -> i32 {
     let mut x = 10;
@@ -479,9 +479,9 @@ pub fn rvalue() -> i32 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn rvalue() -> i32 {
     let mut x = 10;
@@ -498,9 +498,9 @@ pub fn index_to_slice(s: &[u8], i: usize, j: usize) -> u8 {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass2")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="bpass5")]
 #[rustc_clean(cfg="bpass6")]
 pub fn index_to_slice(s: &[u8], i: usize, j: usize) -> u8 {
     s[j]

tests/incremental/hashes/while_let_loops.rs

@@ -29,9 +29,9 @@ pub fn change_loop_body() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_loop_body() {
     let mut _x = 0;
@@ -54,9 +54,9 @@ pub fn change_loop_condition() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_loop_condition() {
     let mut _x = 0;
@@ -79,9 +79,9 @@ pub fn add_break() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_break() {
     let mut _x = 0;
@@ -104,9 +104,9 @@ pub fn add_loop_label() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_loop_label() {
     let mut _x = 0;
@@ -129,9 +129,9 @@ pub fn add_loop_label_to_break() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_loop_label_to_break() {
     let mut _x = 0;
@@ -156,9 +156,9 @@ pub fn change_break_label() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_break_label() {
     let mut _x = 0;
@@ -181,9 +181,9 @@ pub fn add_loop_label_to_continue() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_loop_label_to_continue() {
     let mut _x = 0;
@@ -208,9 +208,9 @@ pub fn change_continue_label() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_continue_label() {
     let mut _x = 0;
@@ -235,9 +235,9 @@ pub fn change_continue_to_break() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_continue_to_break() {
     let mut _x = 0;

tests/incremental/hashes/while_loops.rs

@@ -29,9 +29,9 @@ pub fn change_loop_body() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_loop_body() {
     let mut _x = 0;
@@ -54,9 +54,9 @@ pub fn change_loop_condition() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_loop_condition() {
     let mut _x = 0;
@@ -79,9 +79,9 @@ pub fn add_break() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir, typeck_root")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir, typeck_root")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir, typeck_root")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir, typeck_root")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_break() {
     let mut _x = 0;
@@ -104,9 +104,9 @@ pub fn add_loop_label() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_loop_label() {
     let mut _x = 0;
@@ -129,9 +129,9 @@ pub fn add_loop_label_to_break() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_loop_label_to_break() {
     let mut _x = 0;
@@ -156,9 +156,9 @@ pub fn change_break_label() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner,optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_break_label() {
     let mut _x = 0;
@@ -183,9 +183,9 @@ pub fn add_loop_label_to_continue() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub fn add_loop_label_to_continue() {
     let mut _x = 0;
@@ -210,9 +210,9 @@ pub fn change_continue_label() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass2", except="hir_owner")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")]
+#[rustc_clean(cfg="bpass5", except="hir_owner")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_continue_label() {
     let mut _x = 0;
@@ -237,9 +237,9 @@ pub fn change_continue_to_break() {
 }
 
 #[cfg(not(any(bpass1,bpass4)))]
-#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass2", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass3")]
-#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")]
+#[rustc_clean(cfg="bpass5", except="hir_owner, optimized_mir")]
 #[rustc_clean(cfg="bpass6")]
 pub fn change_continue_to_break() {
     let mut _x = 0;

tests/incremental/hygiene/auxiliary/cached_hygiene.rs

@@ -13,7 +13,7 @@ macro_rules! first_macro {
     }
 }
 
-#[rustc_clean(except="opt_hir_owner_nodes,typeck_root,optimized_mir", cfg="rpass2")]
+#[rustc_clean(except="hir_owner,typeck_root,optimized_mir", cfg="rpass2")]
 #[inline(always)]
 pub fn changed_fn() {
     // This will cause additional hygiene to be generate,

tests/incremental/ich_method_call_trait_scope.rs

@@ -27,7 +27,7 @@ mod mod3 {
     #[cfg(rpass2)]
     use Trait2;
 
-    #[rustc_clean(except="typeck_root", cfg="rpass2")]
+    #[rustc_clean(except="hir_owner,typeck_root", cfg="rpass2")]
     fn bar() {
         ().method();
     }

tests/incremental/ich_nested_items.rs

@@ -10,7 +10,7 @@
 #![feature(rustc_attrs)]
 #![allow(dead_code)]
 
-#[rustc_clean(except = "opt_hir_owner_nodes", cfg = "bpass2")]
+#[rustc_clean(except = "hir_owner", cfg = "bpass2")]
 pub fn foo() {
     #[cfg(bpass1)]
     pub fn baz() {} // order is different...

tests/incremental/ich_resolve_results.rs

@@ -31,13 +31,13 @@ mod mod3 {
     use mod2::Foo;
 
     #[rustc_clean(cfg="rpass2")]
-    #[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="rpass3")]
+    #[rustc_clean(except="hir_owner,typeck_root", cfg="rpass3")]
     fn in_expr() {
         Foo(0);
     }
 
     #[rustc_clean(cfg="rpass2")]
-    #[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="rpass3")]
+    #[rustc_clean(except="hir_owner,typeck_root", cfg="rpass3")]
     fn in_type() {
         test::<Foo>();
     }

tests/incremental/source_loc_macros.rs

@@ -23,7 +23,7 @@ fn file_same() {
     let _ = file!();
 }
 
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="rpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="rpass2")]
 fn line_different() {
     #[cfg(rpass1)]
     {
@@ -35,7 +35,7 @@ fn line_different() {
     }
 }
 
-#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="rpass2")]
+#[rustc_clean(except="hir_owner,optimized_mir", cfg="rpass2")]
 fn col_different() {
     #[cfg(rpass1)]
     {

tests/incremental/string_constant.rs

@@ -17,7 +17,7 @@ pub fn x() {
     }
 
     #[cfg(bpass2)]
-    #[rustc_clean(except = "opt_hir_owner_nodes,optimized_mir", cfg = "bpass2")]
+    #[rustc_clean(except = "hir_owner,optimized_mir", cfg = "bpass2")]
     pub fn x() {
         println!("{}", "2");
     }

tests/ui/parallel-rustc/default-trait-shadow-cycle-issue-151358.stderr

@@ -1,16 +1,16 @@
 error: internal compiler error: query cycle when printing cycle detected
    |
-   = note: ...when getting HIR ID of `Default`
+   = note: ...when getting owner for `Default`
    = note: ...which requires getting the crate HIR...
    = note: ...which requires perform lints prior to AST lowering...
    = note: ...which requires looking up span for `Default`...
-   = note: ...which again requires getting HIR ID of `Default`, completing the cycle
+   = note: ...which again requires getting owner for `Default`, completing the cycle
    = note: cycle used when getting the resolver for lowering
    = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
 
 error[E0391]: cycle detected when getting the resolver for lowering
    |
-   = note: ...which requires getting HIR ID of `Default`...
+   = note: ...which requires getting owner for `Default`...
    = note: ...which requires getting the crate HIR...
    = note: ...which requires perform lints prior to AST lowering...
    = note: ...which again requires getting the resolver for lowering, completing the cycle

tests/ui/query-system/query-cycle-printing-issue-151358.stderr

@@ -1,16 +1,16 @@
 error: internal compiler error: query cycle when printing cycle detected
    |
-   = note: ...when getting HIR ID of `Default`
+   = note: ...when getting owner for `Default`
    = note: ...which requires getting the crate HIR...
    = note: ...which requires perform lints prior to AST lowering...
    = note: ...which requires looking up span for `Default`...
-   = note: ...which again requires getting HIR ID of `Default`, completing the cycle
+   = note: ...which again requires getting owner for `Default`, completing the cycle
    = note: cycle used when getting the resolver for lowering
    = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
 
 error[E0391]: cycle detected when getting the resolver for lowering
    |
-   = note: ...which requires getting HIR ID of `Default`...
+   = note: ...which requires getting owner for `Default`...
    = note: ...which requires getting the crate HIR...
    = note: ...which requires perform lints prior to AST lowering...
    = note: ...which again requires getting the resolver for lowering, completing the cycle

tests/ui/resolve/query-cycle-issue-124901.stderr

@@ -1,16 +1,16 @@
 error: internal compiler error: query cycle when printing cycle detected
    |
-   = note: ...when getting HIR ID of `Default`
+   = note: ...when getting owner for `Default`
    = note: ...which requires getting the crate HIR...
    = note: ...which requires perform lints prior to AST lowering...
    = note: ...which requires looking up span for `Default`...
-   = note: ...which again requires getting HIR ID of `Default`, completing the cycle
+   = note: ...which again requires getting owner for `Default`, completing the cycle
    = note: cycle used when getting the resolver for lowering
    = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
 
 error[E0391]: cycle detected when getting the resolver for lowering
    |
-   = note: ...which requires getting HIR ID of `Default`...
+   = note: ...which requires getting owner for `Default`...
    = note: ...which requires getting the crate HIR...
    = note: ...which requires perform lints prior to AST lowering...
    = note: ...which again requires getting the resolver for lowering, completing the cycle