mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-25 08:13:41 +00:00
Effects cleanup
- removed extra bits from predicates queries that are no longer needed in the new system - removed the need for `non_erasable_generics` to take in tcx and DefId, removed unused arguments in callers
This commit is contained in:
parent
c1db4dc242
commit
f6fea83342
@ -210,7 +210,6 @@ impl DebugContext {
|
|||||||
type_names::push_generic_params(
|
type_names::push_generic_params(
|
||||||
tcx,
|
tcx,
|
||||||
tcx.normalize_erasing_regions(ty::ParamEnv::reveal_all(), args),
|
tcx.normalize_erasing_regions(ty::ParamEnv::reveal_all(), args),
|
||||||
enclosing_fn_def_id,
|
|
||||||
&mut name,
|
&mut name,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -98,8 +98,7 @@ pub fn get_fn<'gcc, 'tcx>(cx: &CodegenCx<'gcc, 'tcx>, instance: Instance<'tcx>)
|
|||||||
// whether we are sharing generics or not. The important thing here is
|
// whether we are sharing generics or not. The important thing here is
|
||||||
// that the visibility we apply to the declaration is the same one that
|
// that the visibility we apply to the declaration is the same one that
|
||||||
// has been applied to the definition (wherever that definition may be).
|
// has been applied to the definition (wherever that definition may be).
|
||||||
let is_generic =
|
let is_generic = instance.args.non_erasable_generics().next().is_some();
|
||||||
instance.args.non_erasable_generics(tcx, instance.def_id()).next().is_some();
|
|
||||||
|
|
||||||
if is_generic {
|
if is_generic {
|
||||||
// This is a monomorphization. Its expected visibility depends
|
// This is a monomorphization. Its expected visibility depends
|
||||||
|
@ -98,8 +98,7 @@ pub(crate) fn get_fn<'ll, 'tcx>(cx: &CodegenCx<'ll, 'tcx>, instance: Instance<'t
|
|||||||
unsafe {
|
unsafe {
|
||||||
llvm::LLVMRustSetLinkage(llfn, llvm::Linkage::ExternalLinkage);
|
llvm::LLVMRustSetLinkage(llfn, llvm::Linkage::ExternalLinkage);
|
||||||
|
|
||||||
let is_generic =
|
let is_generic = instance.args.non_erasable_generics().next().is_some();
|
||||||
instance.args.non_erasable_generics(tcx, instance.def_id()).next().is_some();
|
|
||||||
|
|
||||||
let is_hidden = if is_generic {
|
let is_hidden = if is_generic {
|
||||||
// This is a monomorphization of a generic function.
|
// This is a monomorphization of a generic function.
|
||||||
|
@ -350,7 +350,6 @@ impl<'ll, 'tcx> DebugInfoCodegenMethods<'tcx> for CodegenCx<'ll, 'tcx> {
|
|||||||
type_names::push_generic_params(
|
type_names::push_generic_params(
|
||||||
tcx,
|
tcx,
|
||||||
tcx.normalize_erasing_regions(ty::ParamEnv::reveal_all(), args),
|
tcx.normalize_erasing_regions(ty::ParamEnv::reveal_all(), args),
|
||||||
enclosing_fn_def_id,
|
|
||||||
&mut name,
|
&mut name,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -312,7 +312,7 @@ fn exported_symbols_provider_local(
|
|||||||
|
|
||||||
match *mono_item {
|
match *mono_item {
|
||||||
MonoItem::Fn(Instance { def: InstanceKind::Item(def), args }) => {
|
MonoItem::Fn(Instance { def: InstanceKind::Item(def), args }) => {
|
||||||
if args.non_erasable_generics(tcx, def).next().is_some() {
|
if args.non_erasable_generics().next().is_some() {
|
||||||
let symbol = ExportedSymbol::Generic(def, args);
|
let symbol = ExportedSymbol::Generic(def, args);
|
||||||
symbols.push((symbol, SymbolExportInfo {
|
symbols.push((symbol, SymbolExportInfo {
|
||||||
level: SymbolExportLevel::Rust,
|
level: SymbolExportLevel::Rust,
|
||||||
@ -321,12 +321,9 @@ fn exported_symbols_provider_local(
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
MonoItem::Fn(Instance { def: InstanceKind::DropGlue(def_id, Some(ty)), args }) => {
|
MonoItem::Fn(Instance { def: InstanceKind::DropGlue(_, Some(ty)), args }) => {
|
||||||
// A little sanity-check
|
// A little sanity-check
|
||||||
assert_eq!(
|
assert_eq!(args.non_erasable_generics().next(), Some(GenericArgKind::Type(ty)));
|
||||||
args.non_erasable_generics(tcx, def_id).next(),
|
|
||||||
Some(GenericArgKind::Type(ty))
|
|
||||||
);
|
|
||||||
symbols.push((ExportedSymbol::DropGlue(ty), SymbolExportInfo {
|
symbols.push((ExportedSymbol::DropGlue(ty), SymbolExportInfo {
|
||||||
level: SymbolExportLevel::Rust,
|
level: SymbolExportLevel::Rust,
|
||||||
kind: SymbolExportKind::Text,
|
kind: SymbolExportKind::Text,
|
||||||
@ -334,14 +331,11 @@ fn exported_symbols_provider_local(
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
MonoItem::Fn(Instance {
|
MonoItem::Fn(Instance {
|
||||||
def: InstanceKind::AsyncDropGlueCtorShim(def_id, Some(ty)),
|
def: InstanceKind::AsyncDropGlueCtorShim(_, Some(ty)),
|
||||||
args,
|
args,
|
||||||
}) => {
|
}) => {
|
||||||
// A little sanity-check
|
// A little sanity-check
|
||||||
assert_eq!(
|
assert_eq!(args.non_erasable_generics().next(), Some(GenericArgKind::Type(ty)));
|
||||||
args.non_erasable_generics(tcx, def_id).next(),
|
|
||||||
Some(GenericArgKind::Type(ty))
|
|
||||||
);
|
|
||||||
symbols.push((ExportedSymbol::AsyncDropGlueCtorShim(ty), SymbolExportInfo {
|
symbols.push((ExportedSymbol::AsyncDropGlueCtorShim(ty), SymbolExportInfo {
|
||||||
level: SymbolExportLevel::Rust,
|
level: SymbolExportLevel::Rust,
|
||||||
kind: SymbolExportKind::Text,
|
kind: SymbolExportKind::Text,
|
||||||
|
@ -110,14 +110,14 @@ fn push_debuginfo_type_name<'tcx>(
|
|||||||
ty_and_layout,
|
ty_and_layout,
|
||||||
&|output, visited| {
|
&|output, visited| {
|
||||||
push_item_name(tcx, def.did(), true, output);
|
push_item_name(tcx, def.did(), true, output);
|
||||||
push_generic_params_internal(tcx, args, def.did(), output, visited);
|
push_generic_params_internal(tcx, args, output, visited);
|
||||||
},
|
},
|
||||||
output,
|
output,
|
||||||
visited,
|
visited,
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
push_item_name(tcx, def.did(), qualified, output);
|
push_item_name(tcx, def.did(), qualified, output);
|
||||||
push_generic_params_internal(tcx, args, def.did(), output, visited);
|
push_generic_params_internal(tcx, args, output, visited);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ty::Tuple(component_types) => {
|
ty::Tuple(component_types) => {
|
||||||
@ -251,13 +251,8 @@ fn push_debuginfo_type_name<'tcx>(
|
|||||||
let principal =
|
let principal =
|
||||||
tcx.normalize_erasing_late_bound_regions(ty::ParamEnv::reveal_all(), principal);
|
tcx.normalize_erasing_late_bound_regions(ty::ParamEnv::reveal_all(), principal);
|
||||||
push_item_name(tcx, principal.def_id, qualified, output);
|
push_item_name(tcx, principal.def_id, qualified, output);
|
||||||
let principal_has_generic_params = push_generic_params_internal(
|
let principal_has_generic_params =
|
||||||
tcx,
|
push_generic_params_internal(tcx, principal.args, output, visited);
|
||||||
principal.args,
|
|
||||||
principal.def_id,
|
|
||||||
output,
|
|
||||||
visited,
|
|
||||||
);
|
|
||||||
|
|
||||||
let projection_bounds: SmallVec<[_; 4]> = trait_data
|
let projection_bounds: SmallVec<[_; 4]> = trait_data
|
||||||
.projection_bounds()
|
.projection_bounds()
|
||||||
@ -538,13 +533,7 @@ pub fn compute_debuginfo_vtable_name<'tcx>(
|
|||||||
tcx.normalize_erasing_late_bound_regions(ty::ParamEnv::reveal_all(), trait_ref);
|
tcx.normalize_erasing_late_bound_regions(ty::ParamEnv::reveal_all(), trait_ref);
|
||||||
push_item_name(tcx, trait_ref.def_id, true, &mut vtable_name);
|
push_item_name(tcx, trait_ref.def_id, true, &mut vtable_name);
|
||||||
visited.clear();
|
visited.clear();
|
||||||
push_generic_params_internal(
|
push_generic_params_internal(tcx, trait_ref.args, &mut vtable_name, &mut visited);
|
||||||
tcx,
|
|
||||||
trait_ref.args,
|
|
||||||
trait_ref.def_id,
|
|
||||||
&mut vtable_name,
|
|
||||||
&mut visited,
|
|
||||||
);
|
|
||||||
} else {
|
} else {
|
||||||
vtable_name.push('_');
|
vtable_name.push('_');
|
||||||
}
|
}
|
||||||
@ -647,12 +636,11 @@ fn push_unqualified_item_name(
|
|||||||
fn push_generic_params_internal<'tcx>(
|
fn push_generic_params_internal<'tcx>(
|
||||||
tcx: TyCtxt<'tcx>,
|
tcx: TyCtxt<'tcx>,
|
||||||
args: GenericArgsRef<'tcx>,
|
args: GenericArgsRef<'tcx>,
|
||||||
def_id: DefId,
|
|
||||||
output: &mut String,
|
output: &mut String,
|
||||||
visited: &mut FxHashSet<Ty<'tcx>>,
|
visited: &mut FxHashSet<Ty<'tcx>>,
|
||||||
) -> bool {
|
) -> bool {
|
||||||
assert_eq!(args, tcx.normalize_erasing_regions(ty::ParamEnv::reveal_all(), args));
|
assert_eq!(args, tcx.normalize_erasing_regions(ty::ParamEnv::reveal_all(), args));
|
||||||
let mut args = args.non_erasable_generics(tcx, def_id).peekable();
|
let mut args = args.non_erasable_generics().peekable();
|
||||||
if args.peek().is_none() {
|
if args.peek().is_none() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -736,12 +724,11 @@ fn push_const_param<'tcx>(tcx: TyCtxt<'tcx>, ct: ty::Const<'tcx>, output: &mut S
|
|||||||
pub fn push_generic_params<'tcx>(
|
pub fn push_generic_params<'tcx>(
|
||||||
tcx: TyCtxt<'tcx>,
|
tcx: TyCtxt<'tcx>,
|
||||||
args: GenericArgsRef<'tcx>,
|
args: GenericArgsRef<'tcx>,
|
||||||
def_id: DefId,
|
|
||||||
output: &mut String,
|
output: &mut String,
|
||||||
) {
|
) {
|
||||||
let _prof = tcx.prof.generic_activity("compute_debuginfo_type_name");
|
let _prof = tcx.prof.generic_activity("compute_debuginfo_type_name");
|
||||||
let mut visited = FxHashSet::default();
|
let mut visited = FxHashSet::default();
|
||||||
push_generic_params_internal(tcx, args, def_id, output, &mut visited);
|
push_generic_params_internal(tcx, args, output, &mut visited);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn push_closure_or_coroutine_name<'tcx>(
|
fn push_closure_or_coroutine_name<'tcx>(
|
||||||
@ -786,7 +773,7 @@ fn push_closure_or_coroutine_name<'tcx>(
|
|||||||
// FIXME(async_closures): This is probably not going to be correct w.r.t.
|
// FIXME(async_closures): This is probably not going to be correct w.r.t.
|
||||||
// multiple coroutine flavors. Maybe truncate to (parent + 1)?
|
// multiple coroutine flavors. Maybe truncate to (parent + 1)?
|
||||||
let args = args.truncate_to(tcx, generics);
|
let args = args.truncate_to(tcx, generics);
|
||||||
push_generic_params_internal(tcx, args, enclosing_fn_def_id, output, visited);
|
push_generic_params_internal(tcx, args, output, visited);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn push_close_angle_bracket(cpp_like_debuginfo: bool, output: &mut String) {
|
fn push_close_angle_bracket(cpp_like_debuginfo: bool, output: &mut String) {
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
//! Bounds are restrictions applied to some types after they've been lowered from the HIR to the
|
//! Bounds are restrictions applied to some types after they've been lowered from the HIR to the
|
||||||
//! [`rustc_middle::ty`] form.
|
//! [`rustc_middle::ty`] form.
|
||||||
|
|
||||||
use rustc_data_structures::fx::FxIndexMap;
|
|
||||||
use rustc_hir::LangItem;
|
use rustc_hir::LangItem;
|
||||||
use rustc_middle::ty::{self, Ty, TyCtxt, Upcast};
|
use rustc_middle::ty::{self, Ty, TyCtxt, Upcast};
|
||||||
use rustc_span::Span;
|
use rustc_span::Span;
|
||||||
@ -25,7 +24,6 @@ use rustc_span::Span;
|
|||||||
#[derive(Default, PartialEq, Eq, Clone, Debug)]
|
#[derive(Default, PartialEq, Eq, Clone, Debug)]
|
||||||
pub(crate) struct Bounds<'tcx> {
|
pub(crate) struct Bounds<'tcx> {
|
||||||
clauses: Vec<(ty::Clause<'tcx>, Span)>,
|
clauses: Vec<(ty::Clause<'tcx>, Span)>,
|
||||||
effects_min_tys: FxIndexMap<Ty<'tcx>, Span>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'tcx> Bounds<'tcx> {
|
impl<'tcx> Bounds<'tcx> {
|
||||||
@ -96,15 +94,7 @@ impl<'tcx> Bounds<'tcx> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn clauses(
|
pub(crate) fn clauses(&self) -> impl Iterator<Item = (ty::Clause<'tcx>, Span)> + '_ {
|
||||||
&self,
|
|
||||||
// FIXME(effects): remove tcx
|
|
||||||
_tcx: TyCtxt<'tcx>,
|
|
||||||
) -> impl Iterator<Item = (ty::Clause<'tcx>, Span)> + '_ {
|
|
||||||
self.clauses.iter().cloned()
|
self.clauses.iter().cloned()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn effects_min_tys(&self) -> impl Iterator<Item = Ty<'tcx>> + '_ {
|
|
||||||
self.effects_min_tys.keys().copied()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -67,7 +67,7 @@ fn associated_type_bounds<'tcx>(
|
|||||||
)
|
)
|
||||||
});
|
});
|
||||||
|
|
||||||
let all_bounds = tcx.arena.alloc_from_iter(bounds.clauses(tcx).chain(bounds_from_parent));
|
let all_bounds = tcx.arena.alloc_from_iter(bounds.clauses().chain(bounds_from_parent));
|
||||||
debug!(
|
debug!(
|
||||||
"associated_type_bounds({}) = {:?}",
|
"associated_type_bounds({}) = {:?}",
|
||||||
tcx.def_path_str(assoc_item_def_id.to_def_id()),
|
tcx.def_path_str(assoc_item_def_id.to_def_id()),
|
||||||
@ -339,7 +339,7 @@ fn opaque_type_bounds<'tcx>(
|
|||||||
}
|
}
|
||||||
debug!(?bounds);
|
debug!(?bounds);
|
||||||
|
|
||||||
tcx.arena.alloc_from_iter(bounds.clauses(tcx))
|
tcx.arena.alloc_from_iter(bounds.clauses())
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -106,7 +106,6 @@ fn gather_explicit_predicates_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::Gen
|
|||||||
return ty::GenericPredicates {
|
return ty::GenericPredicates {
|
||||||
parent: Some(tcx.parent(def_id.to_def_id())),
|
parent: Some(tcx.parent(def_id.to_def_id())),
|
||||||
predicates: tcx.arena.alloc_from_iter(predicates),
|
predicates: tcx.arena.alloc_from_iter(predicates),
|
||||||
effects_min_tys: ty::List::empty(),
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -128,7 +127,6 @@ fn gather_explicit_predicates_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::Gen
|
|||||||
return ty::GenericPredicates {
|
return ty::GenericPredicates {
|
||||||
parent: Some(impl_def_id),
|
parent: Some(impl_def_id),
|
||||||
predicates: tcx.arena.alloc_from_iter(impl_predicates),
|
predicates: tcx.arena.alloc_from_iter(impl_predicates),
|
||||||
effects_min_tys: ty::List::empty(),
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -154,7 +152,6 @@ fn gather_explicit_predicates_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::Gen
|
|||||||
// We use an `IndexSet` to preserve order of insertion.
|
// We use an `IndexSet` to preserve order of insertion.
|
||||||
// Preserving the order of insertion is important here so as not to break UI tests.
|
// Preserving the order of insertion is important here so as not to break UI tests.
|
||||||
let mut predicates: FxIndexSet<(ty::Clause<'_>, Span)> = FxIndexSet::default();
|
let mut predicates: FxIndexSet<(ty::Clause<'_>, Span)> = FxIndexSet::default();
|
||||||
let mut effects_min_tys = Vec::new();
|
|
||||||
|
|
||||||
let hir_generics = node.generics().unwrap_or(NO_GENERICS);
|
let hir_generics = node.generics().unwrap_or(NO_GENERICS);
|
||||||
if let Node::Item(item) = node {
|
if let Node::Item(item) = node {
|
||||||
@ -189,8 +186,7 @@ fn gather_explicit_predicates_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::Gen
|
|||||||
ty::List::empty(),
|
ty::List::empty(),
|
||||||
PredicateFilter::All,
|
PredicateFilter::All,
|
||||||
);
|
);
|
||||||
predicates.extend(bounds.clauses(tcx));
|
predicates.extend(bounds.clauses());
|
||||||
effects_min_tys.extend(bounds.effects_min_tys());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// In default impls, we can assume that the self type implements
|
// In default impls, we can assume that the self type implements
|
||||||
@ -223,7 +219,7 @@ fn gather_explicit_predicates_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::Gen
|
|||||||
param.span,
|
param.span,
|
||||||
);
|
);
|
||||||
trace!(?bounds);
|
trace!(?bounds);
|
||||||
predicates.extend(bounds.clauses(tcx));
|
predicates.extend(bounds.clauses());
|
||||||
trace!(?predicates);
|
trace!(?predicates);
|
||||||
}
|
}
|
||||||
hir::GenericParamKind::Const { .. } => {
|
hir::GenericParamKind::Const { .. } => {
|
||||||
@ -275,8 +271,7 @@ fn gather_explicit_predicates_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::Gen
|
|||||||
bound_vars,
|
bound_vars,
|
||||||
PredicateFilter::All,
|
PredicateFilter::All,
|
||||||
);
|
);
|
||||||
predicates.extend(bounds.clauses(tcx));
|
predicates.extend(bounds.clauses());
|
||||||
effects_min_tys.extend(bounds.effects_min_tys());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
hir::WherePredicate::RegionPredicate(region_pred) => {
|
hir::WherePredicate::RegionPredicate(region_pred) => {
|
||||||
@ -348,7 +343,6 @@ fn gather_explicit_predicates_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::Gen
|
|||||||
ty::GenericPredicates {
|
ty::GenericPredicates {
|
||||||
parent: generics.parent,
|
parent: generics.parent,
|
||||||
predicates: tcx.arena.alloc_from_iter(predicates),
|
predicates: tcx.arena.alloc_from_iter(predicates),
|
||||||
effects_min_tys: tcx.mk_type_list(&effects_min_tys),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -499,7 +493,6 @@ pub(super) fn explicit_predicates_of<'tcx>(
|
|||||||
ty::GenericPredicates {
|
ty::GenericPredicates {
|
||||||
parent: predicates_and_bounds.parent,
|
parent: predicates_and_bounds.parent,
|
||||||
predicates: tcx.arena.alloc_slice(&predicates),
|
predicates: tcx.arena.alloc_slice(&predicates),
|
||||||
effects_min_tys: predicates_and_bounds.effects_min_tys,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -551,7 +544,6 @@ pub(super) fn explicit_predicates_of<'tcx>(
|
|||||||
return GenericPredicates {
|
return GenericPredicates {
|
||||||
parent: parent_preds.parent,
|
parent: parent_preds.parent,
|
||||||
predicates: { tcx.arena.alloc_from_iter(filtered_predicates) },
|
predicates: { tcx.arena.alloc_from_iter(filtered_predicates) },
|
||||||
effects_min_tys: parent_preds.effects_min_tys,
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
gather_explicit_predicates_of(tcx, def_id)
|
gather_explicit_predicates_of(tcx, def_id)
|
||||||
@ -630,7 +622,7 @@ pub(super) fn implied_predicates_with_filter<'tcx>(
|
|||||||
|
|
||||||
// Combine the two lists to form the complete set of superbounds:
|
// Combine the two lists to form the complete set of superbounds:
|
||||||
let implied_bounds =
|
let implied_bounds =
|
||||||
&*tcx.arena.alloc_from_iter(bounds.clauses(tcx).chain(where_bounds_that_match));
|
&*tcx.arena.alloc_from_iter(bounds.clauses().chain(where_bounds_that_match));
|
||||||
debug!(?implied_bounds);
|
debug!(?implied_bounds);
|
||||||
|
|
||||||
// Now require that immediate supertraits are lowered, which will, in
|
// Now require that immediate supertraits are lowered, which will, in
|
||||||
@ -874,7 +866,7 @@ impl<'tcx> ItemCtxt<'tcx> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
bounds.clauses(self.tcx).collect()
|
bounds.clauses().collect()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -966,7 +958,7 @@ pub(super) fn const_conditions<'tcx>(
|
|||||||
|
|
||||||
ty::ConstConditions {
|
ty::ConstConditions {
|
||||||
parent: has_parent.then(|| tcx.local_parent(def_id).to_def_id()),
|
parent: has_parent.then(|| tcx.local_parent(def_id).to_def_id()),
|
||||||
predicates: tcx.arena.alloc_from_iter(bounds.clauses(tcx).map(|(clause, span)| {
|
predicates: tcx.arena.alloc_from_iter(bounds.clauses().map(|(clause, span)| {
|
||||||
(
|
(
|
||||||
clause.kind().map_bound(|clause| match clause {
|
clause.kind().map_bound(|clause| match clause {
|
||||||
ty::ClauseKind::HostEffect(ty::HostEffectPredicate {
|
ty::ClauseKind::HostEffect(ty::HostEffectPredicate {
|
||||||
|
@ -278,8 +278,6 @@ impl<'tcx> PredicatesBuilder<'tcx> {
|
|||||||
ty::GenericPredicates {
|
ty::GenericPredicates {
|
||||||
parent: self.parent,
|
parent: self.parent,
|
||||||
predicates: self.tcx.arena.alloc_from_iter(preds),
|
predicates: self.tcx.arena.alloc_from_iter(preds),
|
||||||
// FIXME(fn_delegation): Support effects.
|
|
||||||
effects_min_tys: ty::List::empty(),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -62,7 +62,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
|
|||||||
|
|
||||||
let mut trait_bounds = vec![];
|
let mut trait_bounds = vec![];
|
||||||
let mut projection_bounds = vec![];
|
let mut projection_bounds = vec![];
|
||||||
for (pred, span) in bounds.clauses(tcx) {
|
for (pred, span) in bounds.clauses() {
|
||||||
let bound_pred = pred.kind();
|
let bound_pred = pred.kind();
|
||||||
match bound_pred.skip_binder() {
|
match bound_pred.skip_binder() {
|
||||||
ty::ClauseKind::Trait(trait_pred) => {
|
ty::ClauseKind::Trait(trait_pred) => {
|
||||||
|
@ -86,11 +86,9 @@ impl<'tcx> MonoItem<'tcx> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn is_generic_fn(&self, tcx: TyCtxt<'tcx>) -> bool {
|
pub fn is_generic_fn(&self) -> bool {
|
||||||
match self {
|
match self {
|
||||||
MonoItem::Fn(instance) => {
|
MonoItem::Fn(instance) => instance.args.non_erasable_generics().next().is_some(),
|
||||||
instance.args.non_erasable_generics(tcx, instance.def_id()).next().is_some()
|
|
||||||
}
|
|
||||||
MonoItem::Static(..) | MonoItem::GlobalAsm(..) => false,
|
MonoItem::Static(..) | MonoItem::GlobalAsm(..) => false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ impl<'tcx> Ty<'tcx> {
|
|||||||
/// ADTs with no type arguments.
|
/// ADTs with no type arguments.
|
||||||
pub fn is_simple_text(self, tcx: TyCtxt<'tcx>) -> bool {
|
pub fn is_simple_text(self, tcx: TyCtxt<'tcx>) -> bool {
|
||||||
match self.kind() {
|
match self.kind() {
|
||||||
Adt(def, args) => args.non_erasable_generics(tcx, def.did()).next().is_none(),
|
Adt(_, args) => args.non_erasable_generics().next().is_none(),
|
||||||
Ref(_, ty, _) => ty.is_simple_text(tcx),
|
Ref(_, ty, _) => ty.is_simple_text(tcx),
|
||||||
_ => self.is_simple_ty(),
|
_ => self.is_simple_ty(),
|
||||||
}
|
}
|
||||||
|
@ -501,9 +501,6 @@ impl<'tcx> GenericArgs<'tcx> {
|
|||||||
#[inline]
|
#[inline]
|
||||||
pub fn non_erasable_generics(
|
pub fn non_erasable_generics(
|
||||||
&'tcx self,
|
&'tcx self,
|
||||||
// FIXME(effects): Remove these
|
|
||||||
_tcx: TyCtxt<'tcx>,
|
|
||||||
_def_id: DefId,
|
|
||||||
) -> impl DoubleEndedIterator<Item = GenericArgKind<'tcx>> + 'tcx {
|
) -> impl DoubleEndedIterator<Item = GenericArgKind<'tcx>> + 'tcx {
|
||||||
self.iter().filter_map(|k| match k.unpack() {
|
self.iter().filter_map(|k| match k.unpack() {
|
||||||
ty::GenericArgKind::Lifetime(_) => None,
|
ty::GenericArgKind::Lifetime(_) => None,
|
||||||
|
@ -360,7 +360,6 @@ impl<'tcx> Generics {
|
|||||||
pub struct GenericPredicates<'tcx> {
|
pub struct GenericPredicates<'tcx> {
|
||||||
pub parent: Option<DefId>,
|
pub parent: Option<DefId>,
|
||||||
pub predicates: &'tcx [(Clause<'tcx>, Span)],
|
pub predicates: &'tcx [(Clause<'tcx>, Span)],
|
||||||
pub effects_min_tys: &'tcx ty::List<Ty<'tcx>>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'tcx> GenericPredicates<'tcx> {
|
impl<'tcx> GenericPredicates<'tcx> {
|
||||||
|
@ -204,7 +204,7 @@ impl<'tcx> Instance<'tcx> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// If this a non-generic instance, it cannot be a shared monomorphization.
|
// If this a non-generic instance, it cannot be a shared monomorphization.
|
||||||
self.args.non_erasable_generics(tcx, self.def_id()).next()?;
|
self.args.non_erasable_generics().next()?;
|
||||||
|
|
||||||
// compiler_builtins cannot use upstream monomorphizations.
|
// compiler_builtins cannot use upstream monomorphizations.
|
||||||
if tcx.is_compiler_builtins(LOCAL_CRATE) {
|
if tcx.is_compiler_builtins(LOCAL_CRATE) {
|
||||||
|
@ -439,12 +439,7 @@ impl<'tcx> Inliner<'tcx> {
|
|||||||
|
|
||||||
// Reachability pass defines which functions are eligible for inlining. Generally inlining
|
// Reachability pass defines which functions are eligible for inlining. Generally inlining
|
||||||
// other functions is incorrect because they could reference symbols that aren't exported.
|
// other functions is incorrect because they could reference symbols that aren't exported.
|
||||||
let is_generic = callsite
|
let is_generic = callsite.callee.args.non_erasable_generics().next().is_some();
|
||||||
.callee
|
|
||||||
.args
|
|
||||||
.non_erasable_generics(self.tcx, callsite.callee.def_id())
|
|
||||||
.next()
|
|
||||||
.is_some();
|
|
||||||
if !is_generic && !cross_crate_inlinable {
|
if !is_generic && !cross_crate_inlinable {
|
||||||
return Err("not exported");
|
return Err("not exported");
|
||||||
}
|
}
|
||||||
|
@ -505,7 +505,7 @@ fn collect_items_rec<'tcx>(
|
|||||||
// Check for PMEs and emit a diagnostic if one happened. To try to show relevant edges of the
|
// Check for PMEs and emit a diagnostic if one happened. To try to show relevant edges of the
|
||||||
// mono item graph.
|
// mono item graph.
|
||||||
if tcx.dcx().err_count() > error_count
|
if tcx.dcx().err_count() > error_count
|
||||||
&& starting_item.node.is_generic_fn(tcx)
|
&& starting_item.node.is_generic_fn()
|
||||||
&& starting_item.node.is_user_defined()
|
&& starting_item.node.is_user_defined()
|
||||||
{
|
{
|
||||||
let formatted_item = with_no_trimmed_paths!(starting_item.node.to_string());
|
let formatted_item = with_no_trimmed_paths!(starting_item.node.to_string());
|
||||||
|
@ -229,7 +229,7 @@ where
|
|||||||
}
|
}
|
||||||
|
|
||||||
let characteristic_def_id = characteristic_def_id_of_mono_item(cx.tcx, mono_item);
|
let characteristic_def_id = characteristic_def_id_of_mono_item(cx.tcx, mono_item);
|
||||||
let is_volatile = is_incremental_build && mono_item.is_generic_fn(cx.tcx);
|
let is_volatile = is_incremental_build && mono_item.is_generic_fn();
|
||||||
|
|
||||||
let cgu_name = match characteristic_def_id {
|
let cgu_name = match characteristic_def_id {
|
||||||
Some(def_id) => compute_codegen_unit_name(
|
Some(def_id) => compute_codegen_unit_name(
|
||||||
@ -822,7 +822,7 @@ fn mono_item_visibility<'tcx>(
|
|||||||
return Visibility::Hidden;
|
return Visibility::Hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
let is_generic = instance.args.non_erasable_generics(tcx, def_id).next().is_some();
|
let is_generic = instance.args.non_erasable_generics().next().is_some();
|
||||||
|
|
||||||
// Upstream `DefId` instances get different handling than local ones.
|
// Upstream `DefId` instances get different handling than local ones.
|
||||||
let Some(def_id) = def_id.as_local() else {
|
let Some(def_id) = def_id.as_local() else {
|
||||||
|
@ -161,8 +161,7 @@ impl<'tcx> Context for TablesWrapper<'tcx> {
|
|||||||
fn predicates_of(&self, def_id: stable_mir::DefId) -> stable_mir::ty::GenericPredicates {
|
fn predicates_of(&self, def_id: stable_mir::DefId) -> stable_mir::ty::GenericPredicates {
|
||||||
let mut tables = self.0.borrow_mut();
|
let mut tables = self.0.borrow_mut();
|
||||||
let def_id = tables[def_id];
|
let def_id = tables[def_id];
|
||||||
let GenericPredicates { parent, predicates, effects_min_tys: _ } =
|
let GenericPredicates { parent, predicates } = tables.tcx.predicates_of(def_id);
|
||||||
tables.tcx.predicates_of(def_id);
|
|
||||||
stable_mir::ty::GenericPredicates {
|
stable_mir::ty::GenericPredicates {
|
||||||
parent: parent.map(|did| tables.trait_def(did)),
|
parent: parent.map(|did| tables.trait_def(did)),
|
||||||
predicates: predicates
|
predicates: predicates
|
||||||
@ -183,8 +182,7 @@ impl<'tcx> Context for TablesWrapper<'tcx> {
|
|||||||
) -> stable_mir::ty::GenericPredicates {
|
) -> stable_mir::ty::GenericPredicates {
|
||||||
let mut tables = self.0.borrow_mut();
|
let mut tables = self.0.borrow_mut();
|
||||||
let def_id = tables[def_id];
|
let def_id = tables[def_id];
|
||||||
let GenericPredicates { parent, predicates, effects_min_tys: _ } =
|
let GenericPredicates { parent, predicates } = tables.tcx.explicit_predicates_of(def_id);
|
||||||
tables.tcx.explicit_predicates_of(def_id);
|
|
||||||
stable_mir::ty::GenericPredicates {
|
stable_mir::ty::GenericPredicates {
|
||||||
parent: parent.map(|did| tables.trait_def(did)),
|
parent: parent.map(|did| tables.trait_def(did)),
|
||||||
predicates: predicates
|
predicates: predicates
|
||||||
|
@ -135,7 +135,7 @@ fn symbol_name_provider<'tcx>(tcx: TyCtxt<'tcx>, instance: Instance<'tcx>) -> ty
|
|||||||
// This closure determines the instantiating crate for instances that
|
// This closure determines the instantiating crate for instances that
|
||||||
// need an instantiating-crate-suffix for their symbol name, in order
|
// need an instantiating-crate-suffix for their symbol name, in order
|
||||||
// to differentiate between local copies.
|
// to differentiate between local copies.
|
||||||
if is_generic(instance, tcx) {
|
if is_generic(instance) {
|
||||||
// For generics we might find re-usable upstream instances. If there
|
// For generics we might find re-usable upstream instances. If there
|
||||||
// is one, we rely on the symbol being instantiated locally.
|
// is one, we rely on the symbol being instantiated locally.
|
||||||
instance.upstream_monomorphization(tcx).unwrap_or(LOCAL_CRATE)
|
instance.upstream_monomorphization(tcx).unwrap_or(LOCAL_CRATE)
|
||||||
@ -241,7 +241,7 @@ fn compute_symbol_name<'tcx>(
|
|||||||
// the ID of the instantiating crate. This avoids symbol conflicts
|
// the ID of the instantiating crate. This avoids symbol conflicts
|
||||||
// in case the same instances is emitted in two crates of the same
|
// in case the same instances is emitted in two crates of the same
|
||||||
// project.
|
// project.
|
||||||
let avoid_cross_crate_conflicts = is_generic(instance, tcx) || is_globally_shared_function;
|
let avoid_cross_crate_conflicts = is_generic(instance) || is_globally_shared_function;
|
||||||
|
|
||||||
let instantiating_crate = avoid_cross_crate_conflicts.then(compute_instantiating_crate);
|
let instantiating_crate = avoid_cross_crate_conflicts.then(compute_instantiating_crate);
|
||||||
|
|
||||||
@ -276,6 +276,6 @@ fn compute_symbol_name<'tcx>(
|
|||||||
symbol
|
symbol
|
||||||
}
|
}
|
||||||
|
|
||||||
fn is_generic<'tcx>(instance: Instance<'tcx>, tcx: TyCtxt<'tcx>) -> bool {
|
fn is_generic<'tcx>(instance: Instance<'tcx>) -> bool {
|
||||||
instance.args.non_erasable_generics(tcx, instance.def_id()).next().is_some()
|
instance.args.non_erasable_generics().next().is_some()
|
||||||
}
|
}
|
||||||
|
@ -1400,7 +1400,6 @@ pub(crate) fn clean_middle_assoc_item(assoc_item: &ty::AssocItem, cx: &mut DocCo
|
|||||||
clean_ty_generics(cx, tcx.generics_of(assoc_item.def_id), ty::GenericPredicates {
|
clean_ty_generics(cx, tcx.generics_of(assoc_item.def_id), ty::GenericPredicates {
|
||||||
parent: None,
|
parent: None,
|
||||||
predicates,
|
predicates,
|
||||||
effects_min_tys: ty::List::empty(),
|
|
||||||
});
|
});
|
||||||
simplify::move_bounds_to_generic_parameters(&mut generics);
|
simplify::move_bounds_to_generic_parameters(&mut generics);
|
||||||
|
|
||||||
|
@ -324,7 +324,7 @@ fn check_copy_clone<'tcx>(cx: &LateContext<'tcx>, item: &Item<'_>, trait_ref: &h
|
|||||||
// If the current self type doesn't implement Copy (due to generic constraints), search to see if
|
// If the current self type doesn't implement Copy (due to generic constraints), search to see if
|
||||||
// there's a Copy impl for any instance of the adt.
|
// there's a Copy impl for any instance of the adt.
|
||||||
if !is_copy(cx, ty) {
|
if !is_copy(cx, ty) {
|
||||||
if ty_subs.non_erasable_generics(cx.tcx, ty_adt.did()).next().is_some() {
|
if ty_subs.non_erasable_generics().next().is_some() {
|
||||||
let has_copy_impl = cx.tcx.all_local_trait_impls(()).get(©_id).map_or(false, |impls| {
|
let has_copy_impl = cx.tcx.all_local_trait_impls(()).get(©_id).map_or(false, |impls| {
|
||||||
impls.iter().any(|&id| {
|
impls.iter().any(|&id| {
|
||||||
matches!(cx.tcx.type_of(id).instantiate_identity().kind(), ty::Adt(adt, _)
|
matches!(cx.tcx.type_of(id).instantiate_identity().kind(), ty::Adt(adt, _)
|
||||||
|
Loading…
Reference in New Issue
Block a user