mirror of
https://github.com/rust-lang/rust.git
synced 2025-01-24 05:33:41 +00:00
Auto merge of #107434 - BoxyUwU:nll_const_equate, r=compiler-errors
emit `ConstEquate` in `TypeRelating<D>` emitting `ConstEquate` during mir typeck is useful since it can help catch bugs in hir typeck incase our impl of `ConstEquate` is wrong. doing this did actually catch a bug, when relating `Expr::Call` we `==` the types of all the argument consts which spuriously returns false if the type contains const projections/aliases which causes us to fall through to the `expected_found` error arm. Generally its an ICE if the `Const`'s `Ty`s arent equal but `ConstKind::Expr` is kind of special since they are sort of like const items that are `const CALL<F: const Fn(...), const N: F>` though we dont actually explicitly represent the `F` type param explicitly in `Expr::Call` so I just made us relate the `Const`'s ty field to avoid getting ICEs from the tests I added and the following existing test: ```rust // tests/ui/const-generics/generic_const_exprs/different-fn.rs #![feature(generic_const_exprs)] #![allow(incomplete_features)] use std::mem::size_of; use std::marker::PhantomData; struct Foo<T>(PhantomData<T>); fn test<T>() -> [u8; size_of::<T>()] { [0; size_of::<Foo<T>>()] //~^ ERROR unconstrained generic constant //~| ERROR mismatched types } fn main() { test::<u32>(); } ``` which has us relate two `ConstKind::Value` one for the fn item of `size_of::<Foo<T>>` and one for the fn item of `size_of::<T>()`, these only differ by their `Ty` and if we don't relate the `Ty` we'll end up getting an ICE from the checks that ensure the `ty` fields always match. In theory `Expr::UnOp` has the same problem so I added a call to `relate` for the ty's, although I was unable to create a repro test.
This commit is contained in:
commit
2a6ff72923
@ -817,12 +817,13 @@ impl<'tcx, D> ConstEquateRelation<'tcx> for TypeRelating<'_, 'tcx, D>
|
||||
where
|
||||
D: TypeRelatingDelegate<'tcx>,
|
||||
{
|
||||
fn const_equate_obligation(&mut self, _a: ty::Const<'tcx>, _b: ty::Const<'tcx>) {
|
||||
// We don't have to worry about the equality of consts during borrow checking
|
||||
// as consts always have a static lifetime.
|
||||
// FIXME(oli-obk): is this really true? We can at least have HKL and with
|
||||
// inline consts we may have further lifetimes that may be unsound to treat as
|
||||
// 'static.
|
||||
fn const_equate_obligation(&mut self, a: ty::Const<'tcx>, b: ty::Const<'tcx>) {
|
||||
self.delegate.register_obligations(vec![Obligation::new(
|
||||
self.tcx(),
|
||||
ObligationCause::dummy(),
|
||||
self.param_env(),
|
||||
ty::Binder::dummy(ty::PredicateKind::ConstEquate(a, b)),
|
||||
)]);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -629,6 +629,8 @@ pub fn super_relate_consts<'tcx, R: TypeRelation<'tcx>>(
|
||||
b = tcx.expand_abstract_consts(b);
|
||||
}
|
||||
|
||||
debug!("{}.super_relate_consts(normed_a = {:?}, normed_b = {:?})", relation.tag(), a, b);
|
||||
|
||||
// Currently, the values that can be unified are primitive types,
|
||||
// and those that derive both `PartialEq` and `Eq`, corresponding
|
||||
// to structural-match types.
|
||||
@ -665,30 +667,28 @@ pub fn super_relate_consts<'tcx, R: TypeRelation<'tcx>>(
|
||||
|
||||
// FIXME(generic_const_exprs): is it possible to relate two consts which are not identical
|
||||
// exprs? Should we care about that?
|
||||
// FIXME(generic_const_exprs): relating the `ty()`s is a little weird since it is supposed to
|
||||
// ICE If they mismatch. Unfortunately `ConstKind::Expr` is a little special and can be thought
|
||||
// of as being generic over the argument types, however this is implicit so these types don't get
|
||||
// related when we relate the substs of the item this const arg is for.
|
||||
let expr = match (ae, be) {
|
||||
(Expr::Binop(a_op, al, ar), Expr::Binop(b_op, bl, br))
|
||||
if a_op == b_op && al.ty() == bl.ty() && ar.ty() == br.ty() =>
|
||||
{
|
||||
(Expr::Binop(a_op, al, ar), Expr::Binop(b_op, bl, br)) if a_op == b_op => {
|
||||
r.relate(al.ty(), bl.ty())?;
|
||||
r.relate(ar.ty(), br.ty())?;
|
||||
Expr::Binop(a_op, r.consts(al, bl)?, r.consts(ar, br)?)
|
||||
}
|
||||
(Expr::UnOp(a_op, av), Expr::UnOp(b_op, bv))
|
||||
if a_op == b_op && av.ty() == bv.ty() =>
|
||||
{
|
||||
(Expr::UnOp(a_op, av), Expr::UnOp(b_op, bv)) if a_op == b_op => {
|
||||
r.relate(av.ty(), bv.ty())?;
|
||||
Expr::UnOp(a_op, r.consts(av, bv)?)
|
||||
}
|
||||
(Expr::Cast(ak, av, at), Expr::Cast(bk, bv, bt))
|
||||
if ak == bk && av.ty() == bv.ty() =>
|
||||
{
|
||||
(Expr::Cast(ak, av, at), Expr::Cast(bk, bv, bt)) if ak == bk => {
|
||||
r.relate(av.ty(), bv.ty())?;
|
||||
Expr::Cast(ak, r.consts(av, bv)?, r.tys(at, bt)?)
|
||||
}
|
||||
(Expr::FunctionCall(af, aa), Expr::FunctionCall(bf, ba))
|
||||
if aa.len() == ba.len()
|
||||
&& af.ty() == bf.ty()
|
||||
&& aa
|
||||
.iter()
|
||||
.zip(ba.iter())
|
||||
.all(|(a_arg, b_arg)| a_arg.ty() == b_arg.ty()) =>
|
||||
if aa.len() == ba.len() =>
|
||||
{
|
||||
r.relate(af.ty(), bf.ty())?;
|
||||
let func = r.consts(af, bf)?;
|
||||
let mut related_args = Vec::with_capacity(aa.len());
|
||||
for (a_arg, b_arg) in aa.iter().zip(ba.iter()) {
|
||||
|
@ -0,0 +1,18 @@
|
||||
// checks that when we relate a `Expr::Binop` we also relate the types of the
|
||||
// const arguments.
|
||||
#![feature(generic_const_exprs)]
|
||||
#![allow(incomplete_features)]
|
||||
|
||||
struct Bar<const B: bool>;
|
||||
|
||||
const fn make_generic(_: usize, a: bool) -> bool {
|
||||
a
|
||||
}
|
||||
|
||||
fn foo<const N: usize>() -> Bar<{ make_generic(N, true == false) }> {
|
||||
Bar::<{ make_generic(N, 1_u8 == 0_u8) }>
|
||||
//~^ error: mismatched types
|
||||
//~| error: unconstrained generic constant
|
||||
}
|
||||
|
||||
fn main() {}
|
@ -0,0 +1,20 @@
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/relate_binop_arg_tys.rs:13:5
|
||||
|
|
||||
LL | Bar::<{ make_generic(N, 1_u8 == 0_u8) }>
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `{ make_generic(N, true == false) }`, found `{ make_generic(N, 1_u8 == 0_u8) }`
|
||||
|
|
||||
= note: expected constant `{ make_generic(N, true == false) }`
|
||||
found constant `{ make_generic(N, 1_u8 == 0_u8) }`
|
||||
|
||||
error: unconstrained generic constant
|
||||
--> $DIR/relate_binop_arg_tys.rs:13:11
|
||||
|
|
||||
LL | Bar::<{ make_generic(N, 1_u8 == 0_u8) }>
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
|
||||
= help: try adding a `where` bound using this expression: `where [(); { make_generic(N, 1_u8 == 0_u8) }]:`
|
||||
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
For more information about this error, try `rustc --explain E0308`.
|
@ -0,0 +1,12 @@
|
||||
// checks that when we relate a `Expr::Cast` we also relate the type of the
|
||||
// const argument.
|
||||
#![feature(generic_const_exprs)]
|
||||
#![allow(incomplete_features)]
|
||||
|
||||
fn foo<const N: usize>() -> [(); (true as usize) + N] {
|
||||
[(); (1_u8 as usize) + N]
|
||||
//~^ error: mismatched types
|
||||
//~| error: unconstrained generic constant
|
||||
}
|
||||
|
||||
fn main() {}
|
@ -0,0 +1,20 @@
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/relate_cast_arg_ty.rs:7:5
|
||||
|
|
||||
LL | [(); (1_u8 as usize) + N]
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^ expected `(true as usize) + N`, found `(1_u8 as usize) + N`
|
||||
|
|
||||
= note: expected constant `(true as usize) + N`
|
||||
found constant `(1_u8 as usize) + N`
|
||||
|
||||
error: unconstrained generic constant
|
||||
--> $DIR/relate_cast_arg_ty.rs:7:10
|
||||
|
|
||||
LL | [(); (1_u8 as usize) + N]
|
||||
| ^^^^^^^^^^^^^^^^^^^
|
||||
|
|
||||
= help: try adding a `where` bound using this expression: `where [(); (1_u8 as usize) + N]:`
|
||||
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
For more information about this error, try `rustc --explain E0308`.
|
Loading…
Reference in New Issue
Block a user