Skip to content

Commit cd259db

Browse files
committed
Do not ICE on invalid input
1 parent 9f6c670 commit cd259db

File tree

3 files changed

+89
-7
lines changed

3 files changed

+89
-7
lines changed

compiler/rustc_trait_selection/src/traits/object_safety.rs

+13-7
Original file line numberDiff line numberDiff line change
@@ -463,10 +463,17 @@ fn virtual_call_violation_for_method<'tcx>(
463463

464464
let param_env = tcx.param_env(method.def_id);
465465

466-
let abi_of_ty = |ty: Ty<'tcx>| -> &Abi {
466+
let abi_of_ty = |ty: Ty<'tcx>| -> Option<&Abi> {
467467
match tcx.layout_of(param_env.and(ty)) {
468-
Ok(layout) => &layout.abi,
469-
Err(err) => bug!("error: {}\n while computing layout for type {:?}", err, ty),
468+
Ok(layout) => Some(&layout.abi),
469+
Err(err) => {
470+
// #78372
471+
tcx.sess.delay_span_bug(
472+
tcx.def_span(method.def_id),
473+
&format!("error: {}\n while computing layout for type {:?}", err, ty),
474+
);
475+
None
476+
}
470477
}
471478
};
472479

@@ -475,7 +482,7 @@ fn virtual_call_violation_for_method<'tcx>(
475482
receiver_for_self_ty(tcx, receiver_ty, tcx.mk_unit(), method.def_id);
476483

477484
match abi_of_ty(unit_receiver_ty) {
478-
&Abi::Scalar(..) => (),
485+
Some(Abi::Scalar(..)) => (),
479486
abi => {
480487
tcx.sess.delay_span_bug(
481488
tcx.def_span(method.def_id),
@@ -495,13 +502,12 @@ fn virtual_call_violation_for_method<'tcx>(
495502
receiver_for_self_ty(tcx, receiver_ty, trait_object_ty, method.def_id);
496503

497504
match abi_of_ty(trait_object_receiver) {
498-
&Abi::ScalarPair(..) => (),
505+
Some(Abi::ScalarPair(..)) => (),
499506
abi => {
500507
tcx.sess.delay_span_bug(
501508
tcx.def_span(method.def_id),
502509
&format!(
503-
"receiver when `Self = {}` should have a ScalarPair ABI; \
504-
found {:?}",
510+
"receiver when `Self = {}` should have a ScalarPair ABI; found {:?}",
505511
trait_object_ty, abi
506512
),
507513
);

src/test/ui/issues/issue-78372.rs

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
use std::ops::DispatchFromDyn; //~ ERROR use of unstable library feature 'dispatch_from_dyn'
2+
struct Smaht<T, MISC>(PhantomData); //~ ERROR cannot find type `PhantomData` in this scope
3+
impl<T> DispatchFromDyn<Smaht<U, MISC>> for T {} //~ ERROR cannot find type `U` in this scope
4+
//~^ ERROR cannot find type `MISC` in this scope
5+
//~| ERROR use of unstable library feature 'dispatch_from_dyn'
6+
//~| ERROR the trait `DispatchFromDyn` may only be implemented for a coercion between structures
7+
//~| ERROR type parameter `T` must be covered by another type when it appears before the first
8+
trait Foo: X<u32> {}
9+
trait X<T> {
10+
fn foo(self: Smaht<Self, T>);
11+
}
12+
trait Marker {}
13+
impl Marker for dyn Foo {}
14+
fn main() {}

src/test/ui/issues/issue-78372.stderr

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
error[E0412]: cannot find type `PhantomData` in this scope
2+
--> $DIR/issue-78372.rs:2:23
3+
|
4+
LL | struct Smaht<T, MISC>(PhantomData);
5+
| ^^^^^^^^^^^ not found in this scope
6+
|
7+
help: consider importing this struct
8+
|
9+
LL | use std::marker::PhantomData;
10+
|
11+
12+
error[E0412]: cannot find type `U` in this scope
13+
--> $DIR/issue-78372.rs:3:31
14+
|
15+
LL | impl<T> DispatchFromDyn<Smaht<U, MISC>> for T {}
16+
| - ^ help: a type parameter with a similar name exists: `T`
17+
| |
18+
| similarly named type parameter `T` defined here
19+
20+
error[E0412]: cannot find type `MISC` in this scope
21+
--> $DIR/issue-78372.rs:3:34
22+
|
23+
LL | impl<T> DispatchFromDyn<Smaht<U, MISC>> for T {}
24+
| - ^^^^ not found in this scope
25+
| |
26+
| help: you might be missing a type parameter: `, MISC`
27+
28+
error[E0658]: use of unstable library feature 'dispatch_from_dyn'
29+
--> $DIR/issue-78372.rs:1:5
30+
|
31+
LL | use std::ops::DispatchFromDyn;
32+
| ^^^^^^^^^^^^^^^^^^^^^^^^^
33+
|
34+
= help: add `#![feature(dispatch_from_dyn)]` to the crate attributes to enable
35+
36+
error[E0658]: use of unstable library feature 'dispatch_from_dyn'
37+
--> $DIR/issue-78372.rs:3:9
38+
|
39+
LL | impl<T> DispatchFromDyn<Smaht<U, MISC>> for T {}
40+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
41+
|
42+
= help: add `#![feature(dispatch_from_dyn)]` to the crate attributes to enable
43+
44+
error[E0378]: the trait `DispatchFromDyn` may only be implemented for a coercion between structures
45+
--> $DIR/issue-78372.rs:3:1
46+
|
47+
LL | impl<T> DispatchFromDyn<Smaht<U, MISC>> for T {}
48+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
49+
50+
error[E0210]: type parameter `T` must be covered by another type when it appears before the first local type (`Smaht<[type error], [type error]>`)
51+
--> $DIR/issue-78372.rs:3:6
52+
|
53+
LL | impl<T> DispatchFromDyn<Smaht<U, MISC>> for T {}
54+
| ^ type parameter `T` must be covered by another type when it appears before the first local type (`Smaht<[type error], [type error]>`)
55+
|
56+
= note: implementing a foreign trait is only possible if at least one of the types for which it is implemented is local, and no uncovered type parameters appear before that first local type
57+
= note: in this case, 'before' refers to the following order: `impl<..> ForeignTrait<T1, ..., Tn> for T0`, where `T0` is the first and `Tn` is the last
58+
59+
error: aborting due to 7 previous errors
60+
61+
Some errors have detailed explanations: E0210, E0378, E0412, E0658.
62+
For more information about an error, try `rustc --explain E0210`.

0 commit comments

Comments
 (0)