Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions compiler/rustc_trait_selection/src/traits/vtable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use rustc_span::DUMMY_SP;
use smallvec::{SmallVec, smallvec};
use tracing::debug;

use crate::traits::{impossible_predicates, is_vtable_safe_method};
use crate::traits::is_vtable_safe_method;

#[derive(Clone, Debug)]
pub enum VtblSegment<'tcx> {
Expand Down Expand Up @@ -271,11 +271,7 @@ fn vtable_entries<'tcx>(
// do not hold for this particular set of type parameters.
// Note that this method could then never be called, so we
// do not want to try and codegen it, in that case (see #23435).
let predicates = tcx.predicates_of(def_id).instantiate_own(tcx, args);
if impossible_predicates(
tcx,
predicates.map(|(predicate, _)| predicate).collect(),
) {
if tcx.instantiate_and_check_impossible_predicates((def_id, args)) {
debug!("vtable_entries: predicates do not hold");
return VtblEntry::Vacant;
}
Expand Down
18 changes: 0 additions & 18 deletions tests/crashes/137190-2.rs

This file was deleted.

10 changes: 0 additions & 10 deletions tests/crashes/137190-3.rs

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
//@ known-bug: #135470
// Regression test for #135470.
// Verify that we don't ICE when building vtable entries
// for a blanket impl involving async and impossible predicates.

//@ check-pass
//@ compile-flags: -Copt-level=0
//@ edition: 2021

Expand Down
25 changes: 25 additions & 0 deletions tests/ui/coercion/vtable-unsatisfied-supertrait-generics.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Regression test for #137190.
// Variant of vtable-unsatisfied-supertrait.rs with generic traits.
// Verify that we don't ICE when building vtable entries
// for a generic trait whose supertrait is not implemented.

//@ compile-flags: --crate-type lib

trait Supertrait<T> {
fn method(&self) {}
}

trait Trait<P>: Supertrait<()> {}

impl<P> Trait<P> for () {}
//~^ ERROR the trait bound `(): Supertrait<()>` is not satisfied

const fn upcast<P>(x: &dyn Trait<P>) -> &dyn Supertrait<()> {
x
}

const fn foo() -> &'static dyn Supertrait<()> {
upcast::<()>(&())
}

const _: &'static dyn Supertrait<()> = foo();
20 changes: 20 additions & 0 deletions tests/ui/coercion/vtable-unsatisfied-supertrait-generics.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
error[E0277]: the trait bound `(): Supertrait<()>` is not satisfied
--> $DIR/vtable-unsatisfied-supertrait-generics.rs:14:22
|
LL | impl<P> Trait<P> for () {}
| ^^ the trait `Supertrait<()>` is not implemented for `()`
|
help: this trait has no implementations, consider adding one
--> $DIR/vtable-unsatisfied-supertrait-generics.rs:8:1
|
LL | trait Supertrait<T> {
| ^^^^^^^^^^^^^^^^^^^
note: required by a bound in `Trait`
--> $DIR/vtable-unsatisfied-supertrait-generics.rs:12:17
|
LL | trait Trait<P>: Supertrait<()> {}
| ^^^^^^^^^^^^^^ required by this bound in `Trait`

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0277`.
16 changes: 16 additions & 0 deletions tests/ui/coercion/vtable-unsatisfied-supertrait.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Regression test for #137190.
// Verify that we don't ICE when building vtable entries
// for a trait whose supertrait is not implemented.

//@ compile-flags: --crate-type lib

trait Supertrait {
fn method(&self) {}
}

trait Trait: Supertrait {}

impl Trait for () {}
//~^ ERROR the trait bound `(): Supertrait` is not satisfied

const _: &dyn Supertrait = &() as &dyn Trait as &dyn Supertrait;
20 changes: 20 additions & 0 deletions tests/ui/coercion/vtable-unsatisfied-supertrait.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
error[E0277]: the trait bound `(): Supertrait` is not satisfied
--> $DIR/vtable-unsatisfied-supertrait.rs:13:16
|
LL | impl Trait for () {}
| ^^ the trait `Supertrait` is not implemented for `()`
|
help: this trait has no implementations, consider adding one
--> $DIR/vtable-unsatisfied-supertrait.rs:7:1
|
LL | trait Supertrait {
| ^^^^^^^^^^^^^^^^
note: required by a bound in `Trait`
--> $DIR/vtable-unsatisfied-supertrait.rs:11:14
|
LL | trait Trait: Supertrait {}
| ^^^^^^^^^^ required by this bound in `Trait`

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0277`.
Loading