Skip to content

Commit 9183270

Browse files
borsbors
committed
Auto merge of rust-lang#137233 - compiler-errors:sized, r=<try>
Unconditionally check sizedness of body in typeck to taint typeck results Puts the sized check back into typeck (duplicated -- we still have it in wfcheck) so that we properly taint bodies. These duplicated diagnostics will all be deduplicated with `-Zdeduplicate-diagnostics`, so it's just UI test fallout and not an actual regression in user-facing diagnostics. We could perhaps do this without duplicating all the diagnostics if we put this check into something like mir build 🤔 Ideally CTFE would just be more fallible to non-WF code but 🤷 Fixes rust-lang#137186
2 parents 5986ff0 + a0dbaf2 commit 9183270

File tree

56 files changed

+799
-160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+799
-160
lines changed

‎compiler/rustc_hir_analysis/src/check/wfcheck.rs

+11-3
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,13 @@ fn check_associated_item(
11101110
let ty = tcx.type_of(item.def_id).instantiate_identity();
11111111
let ty = wfcx.normalize(span, Some(WellFormedLoc::Ty(item_id)), ty);
11121112
wfcx.register_wf_obligation(span, loc, ty.into());
1113-
check_sized_if_body(wfcx, item.def_id.expect_local(), ty, Some(span));
1113+
check_sized_if_body(
1114+
wfcx,
1115+
item.def_id.expect_local(),
1116+
ty,
1117+
Some(span),
1118+
ObligationCauseCode::SizedConstOrStatic,
1119+
);
11141120
Ok(())
11151121
}
11161122
ty::AssocKind::Fn => {
@@ -1356,7 +1362,7 @@ fn check_item_type(
13561362
traits::ObligationCause::new(
13571363
ty_span,
13581364
wfcx.body_def_id,
1359-
ObligationCauseCode::WellFormed(None),
1365+
ObligationCauseCode::SizedConstOrStatic,
13601366
),
13611367
wfcx.param_env,
13621368
item_ty,
@@ -1700,6 +1706,7 @@ fn check_fn_or_method<'tcx>(
17001706
hir::FnRetTy::Return(ty) => Some(ty.span),
17011707
hir::FnRetTy::DefaultReturn(_) => None,
17021708
},
1709+
ObligationCauseCode::SizedReturnType,
17031710
);
17041711
}
17051712

@@ -1708,13 +1715,14 @@ fn check_sized_if_body<'tcx>(
17081715
def_id: LocalDefId,
17091716
ty: Ty<'tcx>,
17101717
maybe_span: Option<Span>,
1718+
code: ObligationCauseCode<'tcx>,
17111719
) {
17121720
let tcx = wfcx.tcx();
17131721
if let Some(body) = tcx.hir_maybe_body_owned_by(def_id) {
17141722
let span = maybe_span.unwrap_or(body.value.span);
17151723

17161724
wfcx.register_bound(
1717-
ObligationCause::new(span, def_id, traits::ObligationCauseCode::SizedReturnType),
1725+
ObligationCause::new(span, def_id, code),
17181726
wfcx.param_env,
17191727
ty,
17201728
tcx.require_lang_item(LangItem::Sized, Some(span)),

‎compiler/rustc_hir_typeck/src/check.rs

+10-13
Original file line numberDiff line numberDiff line change
@@ -113,19 +113,16 @@ pub(super) fn check_fn<'a, 'tcx>(
113113

114114
fcx.typeck_results.borrow_mut().liberated_fn_sigs_mut().insert(fn_id, fn_sig);
115115

116-
// We checked the root's ret ty during wfcheck, but not the child.
117-
if fcx.tcx.is_typeck_child(fn_def_id.to_def_id()) {
118-
let return_or_body_span = match decl.output {
119-
hir::FnRetTy::DefaultReturn(_) => body.value.span,
120-
hir::FnRetTy::Return(ty) => ty.span,
121-
};
122-
123-
fcx.require_type_is_sized(
124-
declared_ret_ty,
125-
return_or_body_span,
126-
ObligationCauseCode::SizedReturnType,
127-
);
128-
}
116+
let return_or_body_span = match decl.output {
117+
hir::FnRetTy::DefaultReturn(_) => body.value.span,
118+
hir::FnRetTy::Return(ty) => ty.span,
119+
};
120+
121+
fcx.require_type_is_sized(
122+
declared_ret_ty,
123+
return_or_body_span,
124+
ObligationCauseCode::SizedReturnType,
125+
);
129126

130127
fcx.is_whole_body.set(true);
131128
fcx.check_return_or_body_tail(body.value, false);

‎compiler/rustc_hir_typeck/src/expr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1810,7 +1810,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
18101810
crate::GatherLocalsVisitor::new(&fcx).visit_body(body);
18111811

18121812
let ty = fcx.check_expr_with_expectation(body.value, expected);
1813-
fcx.require_type_is_sized(ty, body.value.span, ObligationCauseCode::ConstSized);
1813+
fcx.require_type_is_sized(ty, body.value.span, ObligationCauseCode::SizedConstOrStatic);
18141814
fcx.write_ty(block.hir_id, ty);
18151815
ty
18161816
}

‎compiler/rustc_hir_typeck/src/lib.rs

+5
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,11 @@ fn typeck_with_inspect<'tcx>(
185185

186186
let wf_code = ObligationCauseCode::WellFormed(Some(WellFormedLoc::Ty(def_id)));
187187
fcx.register_wf_obligation(expected_type.into(), body.value.span, wf_code);
188+
fcx.require_type_is_sized(
189+
expected_type,
190+
node.ty().map_or(body.value.span, |ty| ty.span),
191+
ObligationCauseCode::SizedConstOrStatic,
192+
);
188193

189194
// Gather locals in statics (because of block expressions).
190195
GatherLocalsVisitor::new(&fcx).visit_body(body);

‎compiler/rustc_middle/src/traits/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ pub enum ObligationCauseCode<'tcx> {
273273
},
274274

275275
/// Constant expressions must be sized.
276-
ConstSized,
276+
SizedConstOrStatic,
277277

278278
/// `static` items must have `Sync` type.
279279
SharedStatic,

‎compiler/rustc_trait_selection/src/error_reporting/traits/suggestions.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3125,8 +3125,8 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
31253125
Applicability::MachineApplicable,
31263126
);
31273127
}
3128-
ObligationCauseCode::ConstSized => {
3129-
err.note("constant expressions must have a statically known size");
3128+
ObligationCauseCode::SizedConstOrStatic => {
3129+
err.note("statics and constants must have a statically known size");
31303130
}
31313131
ObligationCauseCode::InlineAsmSized => {
31323132
err.note("all inline asm arguments must have a statically known size");

‎tests/ui/associated-consts/issue-58022.rs

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ impl Bar<[u8]> {
1212

1313
fn new(slice: &[u8; Self::SIZE]) -> Self {
1414
//~^ ERROR: the size for values of type `[u8]` cannot be known at compilation time
15+
//~| ERROR: the size for values of type `[u8]` cannot be known at compilation time
1516
Foo(Box::new(*slice))
1617
//~^ ERROR: expected function, tuple struct or tuple variant, found trait `Foo`
1718
}

‎tests/ui/associated-consts/issue-58022.stderr

+17-2
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,28 @@ LL |
2121
LL | fn new(slice: &[u8; Foo::SIZE]) -> Self;
2222
| ^^^^^^^^^ cannot refer to the associated constant of trait
2323

24+
error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
25+
--> $DIR/issue-58022.rs:13:41
26+
|
27+
LL | fn new(slice: &[u8; Self::SIZE]) -> Self {
28+
| ^^^^ doesn't have a size known at compile-time
29+
|
30+
= help: within `Bar<[u8]>`, the trait `Sized` is not implemented for `[u8]`
31+
note: required because it appears within the type `Bar<[u8]>`
32+
--> $DIR/issue-58022.rs:8:12
33+
|
34+
LL | pub struct Bar<T: ?Sized>(T);
35+
| ^^^
36+
= note: the return type of a function must have a statically known size
37+
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
38+
2439
error[E0423]: expected function, tuple struct or tuple variant, found trait `Foo`
25-
--> $DIR/issue-58022.rs:15:9
40+
--> $DIR/issue-58022.rs:16:9
2641
|
2742
LL | Foo(Box::new(*slice))
2843
| ^^^ not a function, tuple struct or tuple variant
2944

30-
error: aborting due to 3 previous errors
45+
error: aborting due to 4 previous errors
3146

3247
Some errors have detailed explanations: E0277, E0423, E0790.
3348
For more information about an error, try `rustc --explain E0277`.

‎tests/ui/consts/const-slice-array-deref.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const ONE: [u16] = [1];
22
//~^ ERROR the size for values of type `[u16]` cannot be known at compilation time
3+
//~| ERROR the size for values of type `[u16]` cannot be known at compilation time
34
//~| ERROR mismatched types
45

56
const TWO: &'static u16 = &ONE[0];

‎tests/ui/consts/const-slice-array-deref.stderr

+13-2
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,31 @@ LL | const ONE: [u16] = [1];
55
| ^^^^^ doesn't have a size known at compile-time
66
|
77
= help: the trait `Sized` is not implemented for `[u16]`
8+
= note: statics and constants must have a statically known size
89

910
error[E0308]: mismatched types
1011
--> $DIR/const-slice-array-deref.rs:1:20
1112
|
1213
LL | const ONE: [u16] = [1];
1314
| ^^^ expected `[u16]`, found `[u16; 1]`
1415

16+
error[E0277]: the size for values of type `[u16]` cannot be known at compilation time
17+
--> $DIR/const-slice-array-deref.rs:1:12
18+
|
19+
LL | const ONE: [u16] = [1];
20+
| ^^^^^ doesn't have a size known at compile-time
21+
|
22+
= help: the trait `Sized` is not implemented for `[u16]`
23+
= note: statics and constants must have a statically known size
24+
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
25+
1526
error[E0161]: cannot move a value of type `[u16]`
16-
--> $DIR/const-slice-array-deref.rs:5:28
27+
--> $DIR/const-slice-array-deref.rs:6:28
1728
|
1829
LL | const TWO: &'static u16 = &ONE[0];
1930
| ^^^ the size of `[u16]` cannot be statically determined
2031

21-
error: aborting due to 3 previous errors
32+
error: aborting due to 4 previous errors
2233

2334
Some errors have detailed explanations: E0161, E0277, E0308.
2435
For more information about an error, try `rustc --explain E0161`.

‎tests/ui/consts/const-unsized.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ use std::fmt::Debug;
22

33
const CONST_0: dyn Debug + Sync = *(&0 as &(dyn Debug + Sync));
44
//~^ ERROR the size for values of type
5-
//~| ERROR cannot move out of a shared reference
5+
//~| ERROR the size for values of type
66

77
const CONST_FOO: str = *"foo";
88
//~^ ERROR the size for values of type
9-
//~| ERROR cannot move out of a shared reference
9+
//~| ERROR the size for values of type
1010

1111
static STATIC_1: dyn Debug + Sync = *(&1 as &(dyn Debug + Sync));
1212
//~^ ERROR the size for values of type
13-
//~| ERROR cannot move out of a shared reference
13+
//~| ERROR the size for values of type
1414

1515
static STATIC_BAR: str = *"bar";
1616
//~^ ERROR the size for values of type
17-
//~| ERROR cannot move out of a shared reference
17+
//~| ERROR the size for values of type
1818

1919
fn main() {
2020
println!("{:?} {:?} {:?} {:?}", &CONST_0, &CONST_FOO, &STATIC_1, &STATIC_BAR);

‎tests/ui/consts/const-unsized.stderr

+42-22
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@ LL | const CONST_0: dyn Debug + Sync = *(&0 as &(dyn Debug + Sync));
55
| ^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
66
|
77
= help: the trait `Sized` is not implemented for `(dyn Debug + Sync + 'static)`
8+
= note: statics and constants must have a statically known size
9+
10+
error[E0277]: the size for values of type `(dyn Debug + Sync + 'static)` cannot be known at compilation time
11+
--> $DIR/const-unsized.rs:3:16
12+
|
13+
LL | const CONST_0: dyn Debug + Sync = *(&0 as &(dyn Debug + Sync));
14+
| ^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
15+
|
16+
= help: the trait `Sized` is not implemented for `(dyn Debug + Sync + 'static)`
17+
= note: statics and constants must have a statically known size
18+
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
819

920
error[E0277]: the size for values of type `str` cannot be known at compilation time
1021
--> $DIR/const-unsized.rs:7:18
@@ -13,6 +24,26 @@ LL | const CONST_FOO: str = *"foo";
1324
| ^^^ doesn't have a size known at compile-time
1425
|
1526
= help: the trait `Sized` is not implemented for `str`
27+
= note: statics and constants must have a statically known size
28+
29+
error[E0277]: the size for values of type `str` cannot be known at compilation time
30+
--> $DIR/const-unsized.rs:7:18
31+
|
32+
LL | const CONST_FOO: str = *"foo";
33+
| ^^^ doesn't have a size known at compile-time
34+
|
35+
= help: the trait `Sized` is not implemented for `str`
36+
= note: statics and constants must have a statically known size
37+
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
38+
39+
error[E0277]: the size for values of type `(dyn Debug + Sync + 'static)` cannot be known at compilation time
40+
--> $DIR/const-unsized.rs:11:18
41+
|
42+
LL | static STATIC_1: dyn Debug + Sync = *(&1 as &(dyn Debug + Sync));
43+
| ^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
44+
|
45+
= help: the trait `Sized` is not implemented for `(dyn Debug + Sync + 'static)`
46+
= note: statics and constants must have a statically known size
1647

1748
error[E0277]: the size for values of type `(dyn Debug + Sync + 'static)` cannot be known at compilation time
1849
--> $DIR/const-unsized.rs:11:18
@@ -21,6 +52,8 @@ LL | static STATIC_1: dyn Debug + Sync = *(&1 as &(dyn Debug + Sync));
2152
| ^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
2253
|
2354
= help: the trait `Sized` is not implemented for `(dyn Debug + Sync + 'static)`
55+
= note: statics and constants must have a statically known size
56+
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
2457

2558
error[E0277]: the size for values of type `str` cannot be known at compilation time
2659
--> $DIR/const-unsized.rs:15:20
@@ -29,30 +62,17 @@ LL | static STATIC_BAR: str = *"bar";
2962
| ^^^ doesn't have a size known at compile-time
3063
|
3164
= help: the trait `Sized` is not implemented for `str`
65+
= note: statics and constants must have a statically known size
3266

33-
error[E0507]: cannot move out of a shared reference
34-
--> $DIR/const-unsized.rs:3:35
35-
|
36-
LL | const CONST_0: dyn Debug + Sync = *(&0 as &(dyn Debug + Sync));
37-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ move occurs because value has type `dyn Debug + Sync`, which does not implement the `Copy` trait
38-
39-
error[E0507]: cannot move out of a shared reference
40-
--> $DIR/const-unsized.rs:7:24
41-
|
42-
LL | const CONST_FOO: str = *"foo";
43-
| ^^^^^^ move occurs because value has type `str`, which does not implement the `Copy` trait
44-
45-
error[E0507]: cannot move out of a shared reference
46-
--> $DIR/const-unsized.rs:11:37
47-
|
48-
LL | static STATIC_1: dyn Debug + Sync = *(&1 as &(dyn Debug + Sync));
49-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ move occurs because value has type `dyn Debug + Sync`, which does not implement the `Copy` trait
50-
51-
error[E0507]: cannot move out of a shared reference
52-
--> $DIR/const-unsized.rs:15:26
67+
error[E0277]: the size for values of type `str` cannot be known at compilation time
68+
--> $DIR/const-unsized.rs:15:20
5369
|
5470
LL | static STATIC_BAR: str = *"bar";
55-
| ^^^^^^ move occurs because value has type `str`, which does not implement the `Copy` trait
71+
| ^^^ doesn't have a size known at compile-time
72+
|
73+
= help: the trait `Sized` is not implemented for `str`
74+
= note: statics and constants must have a statically known size
75+
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
5676

5777
error[E0161]: cannot move a value of type `str`
5878
--> $DIR/const-unsized.rs:20:48
@@ -68,5 +88,5 @@ LL | println!("{:?} {:?} {:?} {:?}", &CONST_0, &CONST_FOO, &STATIC_1, &STATI
6888

6989
error: aborting due to 10 previous errors
7090

71-
Some errors have detailed explanations: E0161, E0277, E0507.
91+
Some errors have detailed explanations: E0161, E0277.
7292
For more information about an error, try `rustc --explain E0161`.

‎tests/ui/consts/const_refs_to_static-ice-121413.rs

+2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ const REF_INTERIOR_MUT: &usize = {
99
//~^ ERROR failed to resolve: use of undeclared type `AtomicUsize`
1010
//~| WARN trait objects without an explicit `dyn` are deprecated
1111
//~| ERROR the size for values of type `(dyn Sync + 'static)` cannot be known at compilation time
12+
//~| ERROR the size for values of type `(dyn Sync + 'static)` cannot be known at compilation time
1213
//~| WARN this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
1314
//~| HELP if this is a dyn-compatible trait, use `dyn`
1415
//~| HELP the trait `Sized` is not implemented for `(dyn Sync + 'static)`
16+
//~| HELP the trait `Sized` is not implemented for `(dyn Sync + 'static)`
1517
unsafe { &*(&FOO as *const _ as *const usize) }
1618
};
1719
pub fn main() {}

‎tests/ui/consts/const_refs_to_static-ice-121413.stderr

+12-1
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,19 @@ LL | static FOO: Sync = AtomicUsize::new(0);
3030
| ^^^^ doesn't have a size known at compile-time
3131
|
3232
= help: the trait `Sized` is not implemented for `(dyn Sync + 'static)`
33+
= note: statics and constants must have a statically known size
3334

34-
error: aborting due to 2 previous errors; 1 warning emitted
35+
error[E0277]: the size for values of type `(dyn Sync + 'static)` cannot be known at compilation time
36+
--> $DIR/const_refs_to_static-ice-121413.rs:8:17
37+
|
38+
LL | static FOO: Sync = AtomicUsize::new(0);
39+
| ^^^^ doesn't have a size known at compile-time
40+
|
41+
= help: the trait `Sized` is not implemented for `(dyn Sync + 'static)`
42+
= note: statics and constants must have a statically known size
43+
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
44+
45+
error: aborting due to 3 previous errors; 1 warning emitted
3546

3647
Some errors have detailed explanations: E0277, E0433.
3748
For more information about an error, try `rustc --explain E0277`.

‎tests/ui/consts/unsized.rs

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
static S: str = todo!();
2+
//~^ ERROR the size for values of type `str` cannot be known at compilation time
3+
//~| ERROR the size for values of type `str` cannot be known at compilation time
4+
5+
const A: str = todo!();
6+
//~^ ERROR the size for values of type `str` cannot be known at compilation time
7+
//~| ERROR the size for values of type `str` cannot be known at compilation time
8+
9+
fn main() {}

0 commit comments

Comments
 (0)