Don't call predicate_must_hold during fulfillment in intercrate

This commit is contained in:
Michael Goulet 2023-07-16 01:56:16 +00:00
parent bacf5bcbc7
commit 8f178d1b0c
3 changed files with 38 additions and 2 deletions

View File

@ -671,7 +671,7 @@ impl<'a, 'tcx> FulfillProcessor<'a, 'tcx> {
stalled_on: &mut Vec<TyOrConstInferVar<'tcx>>, stalled_on: &mut Vec<TyOrConstInferVar<'tcx>>,
) -> ProcessResult<PendingPredicateObligation<'tcx>, FulfillmentErrorCode<'tcx>> { ) -> ProcessResult<PendingPredicateObligation<'tcx>, FulfillmentErrorCode<'tcx>> {
let infcx = self.selcx.infcx; let infcx = self.selcx.infcx;
if obligation.predicate.is_global() { if obligation.predicate.is_global() && !self.selcx.is_intercrate() {
// no type variables present, can use evaluation for better caching. // no type variables present, can use evaluation for better caching.
// FIXME: consider caching errors too. // FIXME: consider caching errors too.
if infcx.predicate_must_hold_considering_regions(obligation) { if infcx.predicate_must_hold_considering_regions(obligation) {
@ -725,7 +725,7 @@ impl<'a, 'tcx> FulfillProcessor<'a, 'tcx> {
) -> ProcessResult<PendingPredicateObligation<'tcx>, FulfillmentErrorCode<'tcx>> { ) -> ProcessResult<PendingPredicateObligation<'tcx>, FulfillmentErrorCode<'tcx>> {
let tcx = self.selcx.tcx(); let tcx = self.selcx.tcx();
if obligation.predicate.is_global() { if obligation.predicate.is_global() && !self.selcx.is_intercrate() {
// no type variables present, can use evaluation for better caching. // no type variables present, can use evaluation for better caching.
// FIXME: consider caching errors too. // FIXME: consider caching errors too.
if self.selcx.infcx.predicate_must_hold_considering_regions(obligation) { if self.selcx.infcx.predicate_must_hold_considering_regions(obligation) {

View File

@ -0,0 +1,24 @@
// check-pass
// issue: 113415
// Makes sure that coherence doesn't call any of the `predicate_may_hold`-esque fns,
// since they are using a different infcx which doesn't preserve the intercrate flag.
#![feature(specialization)]
//~^ WARN the feature `specialization` is incomplete
trait Assoc {
type Output;
}
default impl<T> Assoc for T {
type Output = bool;
}
impl Assoc for u8 {}
trait Foo {}
impl Foo for u32 {}
impl Foo for <u8 as Assoc>::Output {}
fn main() {}

View File

@ -0,0 +1,12 @@
warning: the feature `specialization` is incomplete and may not be safe to use and/or cause compiler crashes
--> $DIR/coherence-doesnt-use-infcx-evaluate.rs:7:12
|
LL | #![feature(specialization)]
| ^^^^^^^^^^^^^^
|
= note: see issue #31844 <https://github.com/rust-lang/rust/issues/31844> for more information
= help: consider using `min_specialization` instead, which is more stable and complete
= note: `#[warn(incomplete_features)]` on by default
warning: 1 warning emitted