Skip to content

Commit 7770df0

Browse files
oli-obkoli-obk
committed
Always evaluate free constants and statics, even if previous errors occurred
1 parent fa9f77f commit 7770df0

File tree

73 files changed

+647
-578
lines changed

Some content is hidden

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

73 files changed

+647
-578
lines changed

‎compiler/rustc_const_eval/src/transform/check_consts/check.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ impl<'mir, 'tcx> Checker<'mir, 'tcx> {
249249
let secondary_errors = mem::take(&mut self.secondary_errors);
250250
if self.error_emitted.is_none() {
251251
for error in secondary_errors {
252-
error.emit();
252+
self.error_emitted = Some(error.emit());
253253
}
254254
} else {
255255
assert!(self.tcx.dcx().has_errors().is_some());

‎compiler/rustc_hir_analysis/src/lib.rs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,17 @@ pub fn check_crate(tcx: TyCtxt<'_>) -> Result<(), ErrorGuaranteed> {
196196
collect::test_opaque_hidden_types(tcx)?;
197197
}
198198

199+
// Make sure we evaluate all static and (non-associated) const items, even if unused.
200+
// If any of these fail to evaluate, we do not want this crate to pass compilation.
201+
tcx.hir().par_body_owners(|item_def_id| {
202+
let def_kind = tcx.def_kind(item_def_id);
203+
match def_kind {
204+
DefKind::Static(_) => tcx.ensure().eval_static_initializer(item_def_id),
205+
DefKind::Const => tcx.ensure().const_eval_poly(item_def_id.into()),
206+
_ => (),
207+
}
208+
});
209+
199210
// Freeze definitions as we don't add new ones at this point. This improves performance by
200211
// allowing lock-free access to them.
201212
tcx.untracked().definitions.freeze();

‎compiler/rustc_lint/src/builtin.rs

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1542,32 +1542,6 @@ impl<'tcx> LateLintPass<'tcx> for TypeAliasBounds {
15421542
}
15431543
}
15441544

1545-
declare_lint_pass!(
1546-
/// Lint constants that are erroneous.
1547-
/// Without this lint, we might not get any diagnostic if the constant is
1548-
/// unused within this crate, even though downstream crates can't use it
1549-
/// without producing an error.
1550-
UnusedBrokenConst => []
1551-
);
1552-
1553-
impl<'tcx> LateLintPass<'tcx> for UnusedBrokenConst {
1554-
fn check_item(&mut self, cx: &LateContext<'_>, it: &hir::Item<'_>) {
1555-
match it.kind {
1556-
hir::ItemKind::Const(_, _, body_id) => {
1557-
let def_id = cx.tcx.hir().body_owner_def_id(body_id).to_def_id();
1558-
// trigger the query once for all constants since that will already report the errors
1559-
// FIXME(generic_const_items): Does this work properly with generic const items?
1560-
cx.tcx.ensure().const_eval_poly(def_id);
1561-
}
1562-
hir::ItemKind::Static(_, _, body_id) => {
1563-
let def_id = cx.tcx.hir().body_owner_def_id(body_id).to_def_id();
1564-
cx.tcx.ensure().eval_static_initializer(def_id);
1565-
}
1566-
_ => {}
1567-
}
1568-
}
1569-
}
1570-
15711545
declare_lint! {
15721546
/// The `trivial_bounds` lint detects trait bounds that don't depend on
15731547
/// any type parameters.

‎compiler/rustc_lint/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,6 @@ late_lint_methods!(
212212
ExplicitOutlivesRequirements: ExplicitOutlivesRequirements,
213213
InvalidValue: InvalidValue,
214214
DerefNullPtr: DerefNullPtr,
215-
// May Depend on constants elsewhere
216-
UnusedBrokenConst: UnusedBrokenConst,
217215
UnstableFeatures: UnstableFeatures,
218216
UngatedAsyncFnTrackCaller: UngatedAsyncFnTrackCaller,
219217
ArrayIntoIter: ArrayIntoIter::default(),

‎src/tools/clippy/tests/ui-toml/suppress_lint_in_const/test.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313

1414
const ARR: [i32; 2] = [1, 2];
1515
const REF: &i32 = &ARR[idx()]; // Ok, should not produce stderr, since `suppress-restriction-lint-in-const` is set true.
16-
const REF_ERR: &i32 = &ARR[idx4()]; // Ok, let rustc handle const contexts.
17-
//~^ ERROR: failed
1816

1917
const fn idx() -> usize {
2018
1
@@ -35,9 +33,6 @@ fn main() {
3533
x[const { idx() }]; // Ok, should not produce stderr.
3634
x[const { idx4() }]; // Ok, let rustc's `unconditional_panic` lint handle `usize` indexing on arrays.
3735
const { &ARR[idx()] }; // Ok, should not produce stderr, since `suppress-restriction-lint-in-const` is set true.
38-
const { &ARR[idx4()] }; // Ok, should not produce stderr, since `suppress-restriction-lint-in-const` is set true.
39-
//
40-
//~^^ ERROR: failed
4136

4237
let y = &x;
4338
y[0]; // Ok, referencing shouldn't affect this lint. See the issue 6021

‎src/tools/clippy/tests/ui-toml/suppress_lint_in_const/test.stderr

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
1-
error[E0080]: evaluation of `main::{constant#3}` failed
2-
--> $DIR/test.rs:38:14
3-
|
4-
LL | const { &ARR[idx4()] }; // Ok, should not produce stderr, since `suppress-restriction-lint-in-const` is set true.
5-
| ^^^^^^^^^^^ index out of bounds: the length is 2 but the index is 4
6-
7-
note: erroneous constant encountered
8-
--> $DIR/test.rs:38:5
9-
|
10-
LL | const { &ARR[idx4()] }; // Ok, should not produce stderr, since `suppress-restriction-lint-in-const` is set true.
11-
| ^^^^^^^^^^^^^^^^^^^^^^
12-
131
error: indexing may panic
14-
--> $DIR/test.rs:29:5
2+
--> $DIR/test.rs:27:5
153
|
164
LL | x[index];
175
| ^^^^^^^^
@@ -21,51 +9,44 @@ LL | x[index];
219
= help: to override `-D warnings` add `#[allow(clippy::indexing_slicing)]`
2210

2311
error: indexing may panic
24-
--> $DIR/test.rs:47:5
12+
--> $DIR/test.rs:42:5
2513
|
2614
LL | v[0];
2715
| ^^^^
2816
|
2917
= help: consider using `.get(n)` or `.get_mut(n)` instead
3018

3119
error: indexing may panic
32-
--> $DIR/test.rs:48:5
20+
--> $DIR/test.rs:43:5
3321
|
3422
LL | v[10];
3523
| ^^^^^
3624
|
3725
= help: consider using `.get(n)` or `.get_mut(n)` instead
3826

3927
error: indexing may panic
40-
--> $DIR/test.rs:49:5
28+
--> $DIR/test.rs:44:5
4129
|
4230
LL | v[1 << 3];
4331
| ^^^^^^^^^
4432
|
4533
= help: consider using `.get(n)` or `.get_mut(n)` instead
4634

4735
error: indexing may panic
48-
--> $DIR/test.rs:55:5
36+
--> $DIR/test.rs:50:5
4937
|
5038
LL | v[N];
5139
| ^^^^
5240
|
5341
= help: consider using `.get(n)` or `.get_mut(n)` instead
5442

5543
error: indexing may panic
56-
--> $DIR/test.rs:56:5
44+
--> $DIR/test.rs:51:5
5745
|
5846
LL | v[M];
5947
| ^^^^
6048
|
6149
= help: consider using `.get(n)` or `.get_mut(n)` instead
6250

63-
error[E0080]: evaluation of constant value failed
64-
--> $DIR/test.rs:16:24
65-
|
66-
LL | const REF_ERR: &i32 = &ARR[idx4()]; // Ok, let rustc handle const contexts.
67-
| ^^^^^^^^^^^ index out of bounds: the length is 2 but the index is 4
68-
69-
error: aborting due to 8 previous errors
51+
error: aborting due to 6 previous errors
7052

71-
For more information about this error, try `rustc --explain E0080`.

‎src/tools/clippy/tests/ui/indexing_slicing_index.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
const ARR: [i32; 2] = [1, 2];
1414
const REF: &i32 = &ARR[idx()]; // This should be linted, since `suppress-restriction-lint-in-const` default is false.
1515
//~^ ERROR: indexing may panic
16-
const REF_ERR: &i32 = &ARR[idx4()]; // Ok, let rustc handle const contexts.
17-
//~^ ERROR: indexing may panic
1816

1917
const fn idx() -> usize {
2018
1

‎src/tools/clippy/tests/ui/indexing_slicing_index.stderr

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,28 @@ LL | const REF: &i32 = &ARR[idx()]; // This should be linted, since `suppress-re
99
= note: `-D clippy::indexing-slicing` implied by `-D warnings`
1010
= help: to override `-D warnings` add `#[allow(clippy::indexing_slicing)]`
1111

12-
error: indexing may panic
13-
--> $DIR/indexing_slicing_index.rs:16:24
14-
|
15-
LL | const REF_ERR: &i32 = &ARR[idx4()]; // Ok, let rustc handle const contexts.
16-
| ^^^^^^^^^^^
17-
|
18-
= help: consider using `.get(n)` or `.get_mut(n)` instead
19-
= note: the suggestion might not be applicable in constant blocks
20-
2112
error[E0080]: evaluation of `main::{constant#3}` failed
22-
--> $DIR/indexing_slicing_index.rs:48:14
13+
--> $DIR/indexing_slicing_index.rs:46:14
2314
|
2415
LL | const { &ARR[idx4()] };
2516
| ^^^^^^^^^^^ index out of bounds: the length is 2 but the index is 4
2617

2718
note: erroneous constant encountered
28-
--> $DIR/indexing_slicing_index.rs:48:5
19+
--> $DIR/indexing_slicing_index.rs:46:5
2920
|
3021
LL | const { &ARR[idx4()] };
3122
| ^^^^^^^^^^^^^^^^^^^^^^
3223

3324
error: indexing may panic
34-
--> $DIR/indexing_slicing_index.rs:29:5
25+
--> $DIR/indexing_slicing_index.rs:27:5
3526
|
3627
LL | x[index];
3728
| ^^^^^^^^
3829
|
3930
= help: consider using `.get(n)` or `.get_mut(n)` instead
4031

4132
error: index is out of bounds
42-
--> $DIR/indexing_slicing_index.rs:32:5
33+
--> $DIR/indexing_slicing_index.rs:30:5
4334
|
4435
LL | x[4];
4536
| ^^^^
@@ -48,13 +39,13 @@ LL | x[4];
4839
= help: to override `-D warnings` add `#[allow(clippy::out_of_bounds_indexing)]`
4940

5041
error: index is out of bounds
51-
--> $DIR/indexing_slicing_index.rs:34:5
42+
--> $DIR/indexing_slicing_index.rs:32:5
5243
|
5344
LL | x[1 << 3];
5445
| ^^^^^^^^^
5546

5647
error: indexing may panic
57-
--> $DIR/indexing_slicing_index.rs:45:14
48+
--> $DIR/indexing_slicing_index.rs:43:14
5849
|
5950
LL | const { &ARR[idx()] };
6051
| ^^^^^^^^^^
@@ -63,7 +54,7 @@ LL | const { &ARR[idx()] };
6354
= note: the suggestion might not be applicable in constant blocks
6455

6556
error: indexing may panic
66-
--> $DIR/indexing_slicing_index.rs:48:14
57+
--> $DIR/indexing_slicing_index.rs:46:14
6758
|
6859
LL | const { &ARR[idx4()] };
6960
| ^^^^^^^^^^^
@@ -72,69 +63,63 @@ LL | const { &ARR[idx4()] };
7263
= note: the suggestion might not be applicable in constant blocks
7364

7465
error: index is out of bounds
75-
--> $DIR/indexing_slicing_index.rs:55:5
66+
--> $DIR/indexing_slicing_index.rs:53:5
7667
|
7768
LL | y[4];
7869
| ^^^^
7970

8071
error: indexing may panic
81-
--> $DIR/indexing_slicing_index.rs:58:5
72+
--> $DIR/indexing_slicing_index.rs:56:5
8273
|
8374
LL | v[0];
8475
| ^^^^
8576
|
8677
= help: consider using `.get(n)` or `.get_mut(n)` instead
8778

8879
error: indexing may panic
89-
--> $DIR/indexing_slicing_index.rs:60:5
80+
--> $DIR/indexing_slicing_index.rs:58:5
9081
|
9182
LL | v[10];
9283
| ^^^^^
9384
|
9485
= help: consider using `.get(n)` or `.get_mut(n)` instead
9586

9687
error: indexing may panic
97-
--> $DIR/indexing_slicing_index.rs:62:5
88+
--> $DIR/indexing_slicing_index.rs:60:5
9889
|
9990
LL | v[1 << 3];
10091
| ^^^^^^^^^
10192
|
10293
= help: consider using `.get(n)` or `.get_mut(n)` instead
10394

10495
error: index is out of bounds
105-
--> $DIR/indexing_slicing_index.rs:70:5
96+
--> $DIR/indexing_slicing_index.rs:68:5
10697
|
10798
LL | x[N];
10899
| ^^^^
109100

110101
error: indexing may panic
111-
--> $DIR/indexing_slicing_index.rs:73:5
102+
--> $DIR/indexing_slicing_index.rs:71:5
112103
|
113104
LL | v[N];
114105
| ^^^^
115106
|
116107
= help: consider using `.get(n)` or `.get_mut(n)` instead
117108

118109
error: indexing may panic
119-
--> $DIR/indexing_slicing_index.rs:75:5
110+
--> $DIR/indexing_slicing_index.rs:73:5
120111
|
121112
LL | v[M];
122113
| ^^^^
123114
|
124115
= help: consider using `.get(n)` or `.get_mut(n)` instead
125116

126117
error: index is out of bounds
127-
--> $DIR/indexing_slicing_index.rs:79:13
118+
--> $DIR/indexing_slicing_index.rs:77:13
128119
|
129120
LL | let _ = x[4];
130121
| ^^^^
131122

132-
error[E0080]: evaluation of constant value failed
133-
--> $DIR/indexing_slicing_index.rs:16:24
134-
|
135-
LL | const REF_ERR: &i32 = &ARR[idx4()]; // Ok, let rustc handle const contexts.
136-
| ^^^^^^^^^^^ index out of bounds: the length is 2 but the index is 4
137-
138-
error: aborting due to 17 previous errors
123+
error: aborting due to 15 previous errors
139124

140125
For more information about this error, try `rustc --explain E0080`.

‎src/tools/miri/tests/fail/stacked_borrows/static_memory_modification.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ static X: usize = 5;
33
#[allow(mutable_transmutes)]
44
fn main() {
55
let _x = unsafe {
6-
std::mem::transmute::<&usize, &mut usize>(&X) //~ ERROR: writing to alloc1 which is read-only
6+
std::mem::transmute::<&usize, &mut usize>(&X) //~ ERROR: writing to alloc2 which is read-only
77
};
88
}

‎tests/mir-opt/dataflow-const-prop/enum.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ fn statics() {
6262

6363
static RC: &E = &E::V2(4);
6464

65-
// CHECK: [[t:_.*]] = const {alloc2: &&E};
65+
// CHECK: [[t:_.*]] = const {alloc5: &&E};
6666
// CHECK: [[e2]] = (*[[t]]);
6767
let e2 = RC;
6868

‎tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ trait Foo {
44
const BAR: u32;
55
}
66

7-
const IMPL_REF_BAR: u32 = GlobalImplRef::BAR;
7+
const IMPL_REF_BAR: u32 = GlobalImplRef::BAR; //~ ERROR E0391
88

99
struct GlobalImplRef;
1010

1111
impl GlobalImplRef {
12-
const BAR: u32 = IMPL_REF_BAR; //~ ERROR E0391
12+
const BAR: u32 = IMPL_REF_BAR;
1313
}
1414

1515
fn main() {}

‎tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.stderr

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
error[E0391]: cycle detected when elaborating drops for `<impl at $DIR/issue-24949-assoc-const-static-recursion-impl.rs:11:1: 11:19>::BAR`
2-
--> $DIR/issue-24949-assoc-const-static-recursion-impl.rs:12:22
3-
|
4-
LL | const BAR: u32 = IMPL_REF_BAR;
5-
| ^^^^^^^^^^^^
6-
|
7-
note: ...which requires simplifying constant for the type system `IMPL_REF_BAR`...
1+
error[E0391]: cycle detected when simplifying constant for the type system `IMPL_REF_BAR`
82
--> $DIR/issue-24949-assoc-const-static-recursion-impl.rs:7:1
93
|
104
LL | const IMPL_REF_BAR: u32 = GlobalImplRef::BAR;
115
| ^^^^^^^^^^^^^^^^^^^^^^^
6+
|
127
note: ...which requires const-evaluating + checking `IMPL_REF_BAR`...
138
--> $DIR/issue-24949-assoc-const-static-recursion-impl.rs:7:27
149
|
@@ -29,7 +24,12 @@ note: ...which requires caching mir of `<impl at $DIR/issue-24949-assoc-const-st
2924
|
3025
LL | const BAR: u32 = IMPL_REF_BAR;
3126
| ^^^^^^^^^^^^^^
32-
= note: ...which again requires elaborating drops for `<impl at $DIR/issue-24949-assoc-const-static-recursion-impl.rs:11:1: 11:19>::BAR`, completing the cycle
27+
note: ...which requires elaborating drops for `<impl at $DIR/issue-24949-assoc-const-static-recursion-impl.rs:11:1: 11:19>::BAR`...
28+
--> $DIR/issue-24949-assoc-const-static-recursion-impl.rs:12:22
29+
|
30+
LL | const BAR: u32 = IMPL_REF_BAR;
31+
| ^^^^^^^^^^^^
32+
= note: ...which again requires simplifying constant for the type system `IMPL_REF_BAR`, completing the cycle
3333
= note: cycle used when running analysis passes on this crate
3434
= note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
3535

0 commit comments

Comments
 (0)