Skip to content

Commit 5bce1c4

Browse files
compiler-errorscompiler-errors
committed
Check normalized call signature for WF in mir typeck
1 parent c401f09 commit 5bce1c4

File tree

7 files changed

+142
-6
lines changed

7 files changed

+142
-6
lines changed

‎compiler/rustc_borrowck/src/type_check/mod.rs

+20-4
Original file line numberDiff line numberDiff line change
@@ -1421,7 +1421,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
14211421
return;
14221422
}
14231423
};
1424-
let (sig, map) = tcx.instantiate_bound_regions(sig, |br| {
1424+
let (unnormalized_sig, map) = tcx.instantiate_bound_regions(sig, |br| {
14251425
use crate::renumber::RegionCtxt;
14261426

14271427
let region_ctxt_fn = || {
@@ -1443,7 +1443,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
14431443
region_ctxt_fn,
14441444
)
14451445
});
1446-
debug!(?sig);
1446+
debug!(?unnormalized_sig);
14471447
// IMPORTANT: We have to prove well formed for the function signature before
14481448
// we normalize it, as otherwise types like `<&'a &'b () as Trait>::Assoc`
14491449
// get normalized away, causing us to ignore the `'b: 'a` bound used by the function.
@@ -1453,15 +1453,31 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
14531453
//
14541454
// See #91068 for an example.
14551455
self.prove_predicates(
1456-
sig.inputs_and_output.iter().map(|ty| {
1456+
unnormalized_sig.inputs_and_output.iter().map(|ty| {
14571457
ty::Binder::dummy(ty::PredicateKind::Clause(ty::ClauseKind::WellFormed(
14581458
ty.into(),
14591459
)))
14601460
}),
14611461
term_location.to_locations(),
14621462
ConstraintCategory::Boring,
14631463
);
1464-
let sig = self.normalize(sig, term_location);
1464+
1465+
let sig = self.normalize(unnormalized_sig, term_location);
1466+
// HACK(#114936): `WF(sig)` does not imply `WF(normalized(sig))`
1467+
// with built-in `Fn` implementations, since the impl may not be
1468+
// well-formed itself.
1469+
if sig != unnormalized_sig {
1470+
self.prove_predicates(
1471+
sig.inputs_and_output.iter().map(|ty| {
1472+
ty::Binder::dummy(ty::PredicateKind::Clause(
1473+
ty::ClauseKind::WellFormed(ty.into()),
1474+
))
1475+
}),
1476+
term_location.to_locations(),
1477+
ConstraintCategory::Boring,
1478+
);
1479+
}
1480+
14651481
self.check_call_dest(body, term, &sig, *destination, *target, term_location);
14661482

14671483
// The ordinary liveness rules will ensure that all

‎tests/ui/higher-ranked/trait-bounds/issue-59311.rs

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ where
1818
//~^ ERROR: higher-ranked lifetime error
1919
//~| ERROR: higher-ranked lifetime error
2020
//~| ERROR: higher-ranked lifetime error
21+
//~| ERROR: higher-ranked lifetime error
2122
}
2223

2324
fn main() {}

‎tests/ui/higher-ranked/trait-bounds/issue-59311.stderr

+10-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@ LL | v.t(|| {});
1515
= note: could not prove `{closure@$DIR/issue-59311.rs:17:9: 17:11} well-formed`
1616
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
1717

18+
error: higher-ranked lifetime error
19+
--> $DIR/issue-59311.rs:17:5
20+
|
21+
LL | v.t(|| {});
22+
| ^^^^^^^^^^
23+
|
24+
= note: could not prove `{closure@$DIR/issue-59311.rs:17:9: 17:11} well-formed`
25+
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
26+
1827
error: higher-ranked lifetime error
1928
--> $DIR/issue-59311.rs:17:9
2029
|
@@ -23,5 +32,5 @@ LL | v.t(|| {});
2332
|
2433
= note: could not prove `for<'a> &'a V: 'b`
2534

26-
error: aborting due to 3 previous errors
35+
error: aborting due to 4 previous errors
2736

‎tests/ui/nll/check-normalized-sig-for-wf.rs

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// <https://github.com/rust-lang/rust/issues/114936>
2+
fn whoops(
3+
s: String,
4+
f: impl for<'s> FnOnce(&'s str) -> (&'static str, [&'static &'s (); 0]),
5+
) -> &'static str
6+
{
7+
f(&s).0
8+
//~^ ERROR `s` does not live long enough
9+
}
10+
11+
// <https://github.com/rust-lang/rust/issues/118876>
12+
fn extend<T>(input: &T) -> &'static T {
13+
struct Bounded<'a, 'b: 'static, T>(&'a T, [&'b (); 0]);
14+
let n: Box<dyn FnOnce(&T) -> Bounded<'static, '_, T>> = Box::new(|x| Bounded(x, []));
15+
n(input).0
16+
//~^ ERROR borrowed data escapes outside of function
17+
}
18+
19+
// <https://github.com/rust-lang/rust/issues/118876>
20+
fn extend_mut<'a, T>(input: &'a mut T) -> &'static mut T {
21+
struct Bounded<'a, 'b: 'static, T>(&'a mut T, [&'b (); 0]);
22+
let mut n: Box<dyn FnMut(&mut T) -> Bounded<'static, '_, T>> = Box::new(|x| Bounded(x, []));
23+
n(input).0
24+
//~^ ERROR borrowed data escapes outside of function
25+
}
26+
27+
fn main() {}

‎tests/ui/nll/check-normalized-sig-for-wf.stderr

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
error[E0597]: `s` does not live long enough
2+
--> $DIR/check-normalized-sig-for-wf.rs:7:7
3+
|
4+
LL | s: String,
5+
| - binding `s` declared here
6+
...
7+
LL | f(&s).0
8+
| --^^-
9+
| | |
10+
| | borrowed value does not live long enough
11+
| argument requires that `s` is borrowed for `'static`
12+
LL |
13+
LL | }
14+
| - `s` dropped here while still borrowed
15+
16+
error[E0521]: borrowed data escapes outside of function
17+
--> $DIR/check-normalized-sig-for-wf.rs:15:5
18+
|
19+
LL | fn extend<T>(input: &T) -> &'static T {
20+
| ----- - let's call the lifetime of this reference `'1`
21+
| |
22+
| `input` is a reference that is only valid in the function body
23+
...
24+
LL | n(input).0
25+
| ^^^^^^^^
26+
| |
27+
| `input` escapes the function body here
28+
| argument requires that `'1` must outlive `'static`
29+
30+
error[E0521]: borrowed data escapes outside of function
31+
--> $DIR/check-normalized-sig-for-wf.rs:23:5
32+
|
33+
LL | fn extend_mut<'a, T>(input: &'a mut T) -> &'static mut T {
34+
| -- ----- `input` is a reference that is only valid in the function body
35+
| |
36+
| lifetime `'a` defined here
37+
...
38+
LL | n(input).0
39+
| ^^^^^^^^
40+
| |
41+
| `input` escapes the function body here
42+
| argument requires that `'a` must outlive `'static`
43+
44+
error: aborting due to 3 previous errors
45+
46+
Some errors have detailed explanations: E0521, E0597.
47+
For more information about an error, try `rustc --explain E0521`.

‎tests/ui/nll/missing-universe-cause-issue-114907.rs

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ fn main() {
3333
accept(callback);
3434
//~^ ERROR mismatched types
3535
//~| ERROR mismatched types
36+
//~| ERROR mismatched types
37+
//~| ERROR implementation of `FnOnce` is not general enough
3638
//~| ERROR implementation of `FnOnce` is not general enough
3739
//~| ERROR implementation of `FnOnce` is not general enough
3840
//~| ERROR higher-ranked subtype error

‎tests/ui/nll/missing-universe-cause-issue-114907.stderr

+35-1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,40 @@ help: consider specifying the type of the closure parameters
6363
LL | let callback = |_: &_| {};
6464
| ~~~~~~~
6565

66+
error: implementation of `FnOnce` is not general enough
67+
--> $DIR/missing-universe-cause-issue-114907.rs:33:5
68+
|
69+
LL | accept(callback);
70+
| ^^^^^^^^^^^^^^^^ implementation of `FnOnce` is not general enough
71+
|
72+
= note: closure with signature `fn(&'2 ())` must implement `FnOnce<(&'1 (),)>`, for any lifetime `'1`...
73+
= note: ...but it actually implements `FnOnce<(&'2 (),)>`, for some specific lifetime `'2`
74+
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
75+
76+
error[E0308]: mismatched types
77+
--> $DIR/missing-universe-cause-issue-114907.rs:33:5
78+
|
79+
LL | accept(callback);
80+
| ^^^^^^^^^^^^^^^^ one type is more general than the other
81+
|
82+
= note: expected trait `for<'a> FnOnce(&'a ())`
83+
found trait `FnOnce(&())`
84+
note: this closure does not fulfill the lifetime requirements
85+
--> $DIR/missing-universe-cause-issue-114907.rs:32:20
86+
|
87+
LL | let callback = |_| {};
88+
| ^^^
89+
note: the lifetime requirement is introduced here
90+
--> $DIR/missing-universe-cause-issue-114907.rs:20:21
91+
|
92+
LL | struct Handshake<R: Role> {
93+
| ^^^^
94+
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
95+
help: consider specifying the type of the closure parameters
96+
|
97+
LL | let callback = |_: &_| {};
98+
| ~~~~~~~
99+
66100
error: higher-ranked subtype error
67101
--> $DIR/missing-universe-cause-issue-114907.rs:33:21
68102
|
@@ -77,6 +111,6 @@ LL | accept(callback);
77111
|
78112
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
79113

80-
error: aborting due to 6 previous errors
114+
error: aborting due to 8 previous errors
81115

82116
For more information about this error, try `rustc --explain E0308`.

0 commit comments

Comments
 (0)