Skip to content

Commit b10ee97

Browse files
estebankMark-Simulacrum
authored andcommitted
Do not ICE on invalid input
1 parent 55856d7 commit b10ee97

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -424,10 +424,17 @@ fn virtual_call_violation_for_method<'tcx>(
424424

425425
let param_env = tcx.param_env(method.def_id);
426426

427-
let abi_of_ty = |ty: Ty<'tcx>| -> &Abi {
427+
let abi_of_ty = |ty: Ty<'tcx>| -> Option<&Abi> {
428428
match tcx.layout_of(param_env.and(ty)) {
429-
Ok(layout) => &layout.abi,
430-
Err(err) => bug!("error: {}\n while computing layout for type {:?}", err, ty),
429+
Ok(layout) => Some(&layout.abi),
430+
Err(err) => {
431+
// #78372
432+
tcx.sess.delay_span_bug(
433+
tcx.def_span(method.def_id),
434+
&format!("error: {}\n while computing layout for type {:?}", err, ty),
435+
);
436+
None
437+
}
431438
}
432439
};
433440

@@ -436,7 +443,7 @@ fn virtual_call_violation_for_method<'tcx>(
436443
receiver_for_self_ty(tcx, receiver_ty, tcx.mk_unit(), method.def_id);
437444

438445
match abi_of_ty(unit_receiver_ty) {
439-
&Abi::Scalar(..) => (),
446+
Some(Abi::Scalar(..)) => (),
440447
abi => {
441448
tcx.sess.delay_span_bug(
442449
tcx.def_span(method.def_id),
@@ -456,13 +463,12 @@ fn virtual_call_violation_for_method<'tcx>(
456463
receiver_for_self_ty(tcx, receiver_ty, trait_object_ty, method.def_id);
457464

458465
match abi_of_ty(trait_object_receiver) {
459-
&Abi::ScalarPair(..) => (),
466+
Some(Abi::ScalarPair(..)) => (),
460467
abi => {
461468
tcx.sess.delay_span_bug(
462469
tcx.def_span(method.def_id),
463470
&format!(
464-
"receiver when `Self = {}` should have a ScalarPair ABI; \
465-
found {:?}",
471+
"receiver when `Self = {}` should have a ScalarPair ABI; found {:?}",
466472
trait_object_ty, abi
467473
),
468474
);

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

Lines changed: 14 additions & 0 deletions
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

Lines changed: 62 additions & 0 deletions
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 is it 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)