mirror of
https://github.com/rust-lang/rust.git
synced 2025-02-03 10:33:34 +00:00
Rollup merge of #123618 - compiler-errors:overflow-ambig, r=spastorino
Discard overflow obligations in `impl_may_apply` Hacky fix for #123493. Throws away obligations that are overflowing in `impl_may_apply` when we recompute if an impl applies, since those will lead to fatal overflow if processed during fulfillment. Something about #114811 (I think it's the predicate reordering) caused us to evaluate predicates differently in error reporting leading to fatal overflow, though I believe the underlying overflow is possible to hit since this code was rewritten to use fulfillment. Fixes #123493
This commit is contained in:
commit
86b791a272
@ -5,6 +5,7 @@ use rustc_infer::traits::{Obligation, ObligationCause, PolyTraitObligation};
|
||||
use rustc_middle::ty;
|
||||
use rustc_span::{Span, DUMMY_SP};
|
||||
|
||||
use crate::traits::query::evaluate_obligation::InferCtxtExt;
|
||||
use crate::traits::ObligationCtxt;
|
||||
|
||||
#[derive(Debug)]
|
||||
@ -52,10 +53,21 @@ pub fn compute_applicable_impls_for_diagnostics<'tcx>(
|
||||
_ => return false,
|
||||
}
|
||||
|
||||
let impl_predicates = tcx.predicates_of(impl_def_id).instantiate(tcx, impl_args);
|
||||
ocx.register_obligations(impl_predicates.predicates.iter().map(|&predicate| {
|
||||
Obligation::new(tcx, ObligationCause::dummy(), param_env, predicate)
|
||||
}));
|
||||
let obligations = tcx
|
||||
.predicates_of(impl_def_id)
|
||||
.instantiate(tcx, impl_args)
|
||||
.into_iter()
|
||||
.map(|(predicate, _)| {
|
||||
Obligation::new(tcx, ObligationCause::dummy(), param_env, predicate)
|
||||
})
|
||||
// Kinda hacky, but let's just throw away obligations that overflow.
|
||||
// This may reduce the accuracy of this check (if the obligation guides
|
||||
// inference or it actually resulted in error after others are processed)
|
||||
// ... but this is diagnostics code.
|
||||
.filter(|obligation| {
|
||||
infcx.next_trait_solver() || infcx.evaluate_obligation(obligation).is_ok()
|
||||
});
|
||||
ocx.register_obligations(obligations);
|
||||
|
||||
ocx.select_where_possible().is_empty()
|
||||
})
|
||||
|
@ -2399,12 +2399,12 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
|
||||
if ambiguities.len() > 5 {
|
||||
let infcx = self.infcx;
|
||||
if !ambiguities.iter().all(|option| match option {
|
||||
DefId(did) => infcx.fresh_args_for_item(DUMMY_SP, *did).is_empty(),
|
||||
DefId(did) => infcx.tcx.generics_of(*did).count() == 0,
|
||||
ParamEnv(_) => true,
|
||||
}) {
|
||||
// If not all are blanket impls, we filter blanked impls out.
|
||||
ambiguities.retain(|option| match option {
|
||||
DefId(did) => infcx.fresh_args_for_item(DUMMY_SP, *did).is_empty(),
|
||||
DefId(did) => infcx.tcx.generics_of(*did).count() == 0,
|
||||
ParamEnv(_) => true,
|
||||
});
|
||||
}
|
||||
|
14
tests/ui/traits/overflow-computing-ambiguity.rs
Normal file
14
tests/ui/traits/overflow-computing-ambiguity.rs
Normal file
@ -0,0 +1,14 @@
|
||||
trait Hello {}
|
||||
|
||||
struct Foo<'a, T: ?Sized>(&'a T);
|
||||
|
||||
impl<'a, T: ?Sized> Hello for Foo<'a, &'a T> where Foo<'a, T>: Hello {}
|
||||
|
||||
impl Hello for Foo<'static, i32> {}
|
||||
|
||||
fn hello<T: ?Sized + Hello>() {}
|
||||
|
||||
fn main() {
|
||||
hello();
|
||||
//~^ ERROR type annotations needed
|
||||
}
|
23
tests/ui/traits/overflow-computing-ambiguity.stderr
Normal file
23
tests/ui/traits/overflow-computing-ambiguity.stderr
Normal file
@ -0,0 +1,23 @@
|
||||
error[E0283]: type annotations needed
|
||||
--> $DIR/overflow-computing-ambiguity.rs:12:5
|
||||
|
|
||||
LL | hello();
|
||||
| ^^^^^ cannot infer type of the type parameter `T` declared on the function `hello`
|
||||
|
|
||||
= note: cannot satisfy `_: Hello`
|
||||
= help: the following types implement trait `Hello`:
|
||||
Foo<'a, &'a T>
|
||||
Foo<'static, i32>
|
||||
note: required by a bound in `hello`
|
||||
--> $DIR/overflow-computing-ambiguity.rs:9:22
|
||||
|
|
||||
LL | fn hello<T: ?Sized + Hello>() {}
|
||||
| ^^^^^ required by this bound in `hello`
|
||||
help: consider specifying the generic argument
|
||||
|
|
||||
LL | hello::<T>();
|
||||
| +++++
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
|
||||
For more information about this error, try `rustc --explain E0283`.
|
Loading…
Reference in New Issue
Block a user