Skip to content

Commit e330fe9

Browse files
author
Lukas Markeffsky
committed
don't skip coercions for types with errors
1 parent 6cc4843 commit e330fe9

File tree

7 files changed

+30
-70
lines changed

7 files changed

+30
-70
lines changed

‎compiler/rustc_hir_typeck/src/coercion.rs

-11
Original file line numberDiff line numberDiff line change
@@ -186,17 +186,6 @@ impl<'f, 'tcx> Coerce<'f, 'tcx> {
186186
let b = self.shallow_resolve(b);
187187
debug!("Coerce.tys({:?} => {:?})", a, b);
188188

189-
// Just ignore error types.
190-
if let Err(guar) = (a, b).error_reported() {
191-
// Best-effort try to unify these types -- we're already on the error path,
192-
// so this will have the side-effect of making sure we have no ambiguities
193-
// due to `[type error]` and `_` not coercing together.
194-
let _ = self.commit_if_ok(|_| {
195-
self.at(&self.cause, self.param_env).eq(DefineOpaqueTypes::Yes, a, b)
196-
});
197-
return success(vec![], Ty::new_error(self.fcx.tcx, guar), vec![]);
198-
}
199-
200189
// Coercing from `!` to any type is allowed:
201190
if a.is_never() {
202191
return success(simple(Adjust::NeverToAny)(b), b, vec![]);

‎tests/ui/coercion/type-errors.rs

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Regression test for an ICE: https://github.com/rust-lang/rust/issues/120884
2+
// We still need to properly go through coercions between types with errors instead of
3+
// shortcutting and returning success, because we need the adjustments for building the MIR.
4+
5+
pub fn has_error() -> TypeError {}
6+
//~^ ERROR cannot find type `TypeError` in this scope
7+
8+
pub fn cast() -> *const u8 {
9+
// Casting a function item to a data pointer in valid in HIR, but invalid in MIR.
10+
// We need an adjustment (ReifyFnPointer) to insert a cast from the function item
11+
// to a function pointer as a separate MIR statement.
12+
has_error as *const u8
13+
}
14+
15+
fn main() {}

‎tests/ui/coercion/type-errors.stderr

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
error[E0412]: cannot find type `TypeError` in this scope
2+
--> $DIR/type-errors.rs:5:23
3+
|
4+
LL | pub fn has_error() -> TypeError {}
5+
| ^^^^^^^^^ not found in this scope
6+
7+
error: aborting due to 1 previous error
8+
9+
For more information about this error, try `rustc --explain E0412`.

‎tests/ui/error-codes/E0401.rs

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ fn foo<T>(x: T) {
99
(y: T) { //~ ERROR E0401
1010
}
1111
bfnr(x);
12-
//~^ ERROR type annotations needed
13-
//~| ERROR type annotations needed
1412
}
1513

1614

‎tests/ui/error-codes/E0401.stderr

+3-42
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LL | (y: T) {
2121
| ^ use of generic parameter from outer item
2222

2323
error[E0401]: can't use `Self` from outer item
24-
--> $DIR/E0401.rs:24:25
24+
--> $DIR/E0401.rs:22:25
2525
|
2626
LL | impl<T> Iterator for A<T> {
2727
| ---- `Self` type implicitly declared here, by this `impl`
@@ -32,45 +32,6 @@ LL | fn helper(sel: &Self) -> u8 {
3232
| use of `Self` from outer item
3333
| refer to the type directly here instead
3434

35-
error[E0283]: type annotations needed
36-
--> $DIR/E0401.rs:11:5
37-
|
38-
LL | bfnr(x);
39-
| ^^^^ cannot infer type of the type parameter `V` declared on the function `bfnr`
40-
|
41-
= note: cannot satisfy `_: Baz<_>`
42-
note: required by a bound in `bfnr`
43-
--> $DIR/E0401.rs:4:19
44-
|
45-
LL | fn bfnr<U, V: Baz<U>, W: Fn()>(y: T) {
46-
| ^^^^^^ required by this bound in `bfnr`
47-
help: consider specifying the generic arguments
48-
|
49-
LL | bfnr::<U, V, W>(x);
50-
| +++++++++++
51-
52-
error[E0283]: type annotations needed
53-
--> $DIR/E0401.rs:11:5
54-
|
55-
LL | bfnr(x);
56-
| ^^^^ cannot infer type of the type parameter `W` declared on the function `bfnr`
57-
|
58-
= note: multiple `impl`s satisfying `_: Fn()` found in the following crates: `alloc`, `core`:
59-
- impl<A, F> Fn<A> for &F
60-
where A: Tuple, F: Fn<A>, F: ?Sized;
61-
- impl<Args, F, A> Fn<Args> for Box<F, A>
62-
where Args: Tuple, F: Fn<Args>, A: Allocator, F: ?Sized;
63-
note: required by a bound in `bfnr`
64-
--> $DIR/E0401.rs:4:30
65-
|
66-
LL | fn bfnr<U, V: Baz<U>, W: Fn()>(y: T) {
67-
| ^^^^ required by this bound in `bfnr`
68-
help: consider specifying the generic arguments
69-
|
70-
LL | bfnr::<U, V, W>(x);
71-
| +++++++++++
72-
73-
error: aborting due to 5 previous errors
35+
error: aborting due to 3 previous errors
7436

75-
Some errors have detailed explanations: E0283, E0401.
76-
For more information about an error, try `rustc --explain E0283`.
37+
For more information about this error, try `rustc --explain E0401`.

‎tests/ui/typeck/issue-104510-ice.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ struct W<T: ?Sized>(Oops);
66

77
unsafe fn test() {
88
let j = W(());
9-
let pointer = &j as *const _; //~ ERROR type annotations needed
9+
let pointer = &j as *const _;
1010
core::arch::asm!(
1111
"nop",
1212
in("eax") pointer,

‎tests/ui/typeck/issue-104510-ice.stderr

+2-14
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,6 @@ error[E0412]: cannot find type `Oops` in this scope
44
LL | struct W<T: ?Sized>(Oops);
55
| ^^^^ not found in this scope
66

7-
error[E0282]: type annotations needed for `*const W<T>`
8-
--> $DIR/issue-104510-ice.rs:9:9
9-
|
10-
LL | let pointer = &j as *const _;
11-
| ^^^^^^^
12-
|
13-
help: consider giving `pointer` an explicit type, where the type for type parameter `T` is specified
14-
|
15-
LL | let pointer: *const W<T> = &j as *const _;
16-
| +++++++++++++
17-
18-
error: aborting due to 2 previous errors
7+
error: aborting due to 1 previous error
198

20-
Some errors have detailed explanations: E0282, E0412.
21-
For more information about an error, try `rustc --explain E0282`.
9+
For more information about this error, try `rustc --explain E0412`.

0 commit comments

Comments
 (0)