Rollup merge of #104338 - compiler-errors:pointer-sized, r=eholk
Enforce that `dyn*` coercions are actually pointer-sized Implement a perma-unstable, rudimentary `PointerSized` trait to enforce `dyn*` casts are `usize`-sized for now, at least to prevent ICEs and weird codegen issues from cropping up after monomorphization since currently we enforce *nothing*. This probably can/should be removed in favor of a more sophisticated trait for handling `dyn*` conversions when we decide on one, but I just want to get something up for discussion and experimentation for now. r? ```@eholk``` cc ```@tmandry``` (though feel free to claim/reassign) Fixes #102141 Fixes #102173
This commit is contained in:
commit
24ee599195
13 changed files with 180 additions and 8 deletions
|
@ -270,6 +270,8 @@ language_item_table! {
|
|||
TryTraitBranch, sym::branch, branch_fn, Target::Method(MethodKind::Trait { body: false }), GenericRequirement::None;
|
||||
TryTraitFromYeet, sym::from_yeet, from_yeet_fn, Target::Fn, GenericRequirement::None;
|
||||
|
||||
PointerSized, sym::pointer_sized, pointer_sized, Target::Trait, GenericRequirement::Exact(0);
|
||||
|
||||
PollReady, sym::Ready, poll_ready_variant, Target::Variant, GenericRequirement::None;
|
||||
PollPending, sym::Pending, poll_pending_variant, Target::Variant, GenericRequirement::None;
|
||||
|
||||
|
|
|
@ -775,7 +775,7 @@ impl<'f, 'tcx> Coerce<'f, 'tcx> {
|
|||
|
||||
// Check the obligations of the cast -- for example, when casting
|
||||
// `usize` to `dyn* Clone + 'static`:
|
||||
let obligations = predicates
|
||||
let mut obligations: Vec<_> = predicates
|
||||
.iter()
|
||||
.map(|predicate| {
|
||||
// For each existential predicate (e.g., `?Self: Clone`) substitute
|
||||
|
@ -785,16 +785,33 @@ impl<'f, 'tcx> Coerce<'f, 'tcx> {
|
|||
let predicate = predicate.with_self_ty(self.tcx, a);
|
||||
Obligation::new(self.tcx, self.cause.clone(), self.param_env, predicate)
|
||||
})
|
||||
// Enforce the region bound (e.g., `usize: 'static`, in our example).
|
||||
.chain([Obligation::new(
|
||||
.chain([
|
||||
// Enforce the region bound (e.g., `usize: 'static`, in our example).
|
||||
Obligation::new(
|
||||
self.tcx,
|
||||
self.cause.clone(),
|
||||
self.param_env,
|
||||
ty::Binder::dummy(ty::PredicateKind::TypeOutlives(ty::OutlivesPredicate(
|
||||
a, b_region,
|
||||
))),
|
||||
),
|
||||
])
|
||||
.collect();
|
||||
|
||||
// Enforce that the type is `usize`/pointer-sized. For now, only those
|
||||
// can be coerced to `dyn*`, except for `dyn* -> dyn*` upcasts.
|
||||
if !a.is_dyn_star() {
|
||||
obligations.push(Obligation::new(
|
||||
self.tcx,
|
||||
self.cause.clone(),
|
||||
self.param_env,
|
||||
self.tcx.mk_predicate(ty::Binder::dummy(ty::PredicateKind::TypeOutlives(
|
||||
ty::OutlivesPredicate(a, b_region),
|
||||
))),
|
||||
)])
|
||||
.collect();
|
||||
ty::Binder::dummy(ty::TraitRef::new(
|
||||
self.tcx.require_lang_item(hir::LangItem::PointerSized, Some(self.cause.span)),
|
||||
self.tcx.mk_substs_trait(a, &[]),
|
||||
))
|
||||
.to_poly_trait_predicate(),
|
||||
));
|
||||
}
|
||||
|
||||
Ok(InferOk {
|
||||
value: (vec![Adjustment { kind: Adjust::DynStar, target: b }], b),
|
||||
|
|
|
@ -1067,6 +1067,7 @@ symbols! {
|
|||
plugins,
|
||||
pointee_trait,
|
||||
pointer,
|
||||
pointer_sized,
|
||||
poll,
|
||||
position,
|
||||
post_dash_lto: "post-lto",
|
||||
|
|
|
@ -304,6 +304,8 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
|
|||
self.assemble_candidates_for_transmutability(obligation, &mut candidates);
|
||||
} else if lang_items.tuple_trait() == Some(def_id) {
|
||||
self.assemble_candidate_for_tuple(obligation, &mut candidates);
|
||||
} else if lang_items.pointer_sized() == Some(def_id) {
|
||||
self.assemble_candidate_for_ptr_sized(obligation, &mut candidates);
|
||||
} else {
|
||||
if lang_items.clone_trait() == Some(def_id) {
|
||||
// Same builtin conditions as `Copy`, i.e., every type which has builtin support
|
||||
|
@ -1047,4 +1049,30 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
|
|||
| ty::Placeholder(_) => {}
|
||||
}
|
||||
}
|
||||
|
||||
fn assemble_candidate_for_ptr_sized(
|
||||
&mut self,
|
||||
obligation: &TraitObligation<'tcx>,
|
||||
candidates: &mut SelectionCandidateSet<'tcx>,
|
||||
) {
|
||||
// The regions of a type don't affect the size of the type
|
||||
let self_ty = self
|
||||
.tcx()
|
||||
.erase_regions(self.tcx().erase_late_bound_regions(obligation.predicate.self_ty()));
|
||||
|
||||
// But if there are inference variables, we have to wait until it's resolved.
|
||||
if self_ty.has_non_region_infer() {
|
||||
candidates.ambiguous = true;
|
||||
return;
|
||||
}
|
||||
|
||||
let usize_layout =
|
||||
self.tcx().layout_of(ty::ParamEnv::empty().and(self.tcx().types.usize)).unwrap().layout;
|
||||
if let Ok(layout) = self.tcx().layout_of(obligation.param_env.and(self_ty))
|
||||
&& layout.layout.size() == usize_layout.size()
|
||||
&& layout.layout.align().abi == usize_layout.align().abi
|
||||
{
|
||||
candidates.vec.push(BuiltinCandidate { has_nested: false });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue