Skip to content

Commit b510df9

Browse files
rust-timerrust-timer
authored
Unrolled build for #143585
Rollup merge of #143585 - folkertdev:loop-match-suggest-const-block, r=oli-obk `loop_match`: suggest extracting to a `const` item tracking issue: #132306 fixes #143310 fixes #143936
2 parents 051d0e8 + 730d33d commit b510df9

File tree

5 files changed

+297
-4
lines changed

5 files changed

+297
-4
lines changed

‎compiler/rustc_mir_build/messages.ftl‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,16 @@ mir_build_confused = missing patterns are not covered because `{$variable}` is i
8686
8787
mir_build_const_continue_bad_const = could not determine the target branch for this `#[const_continue]`
8888
.label = this value is too generic
89-
.note = the value must be a literal or a monomorphic const
9089
9190
mir_build_const_continue_missing_value = a `#[const_continue]` must break to a label with a value
9291
92+
mir_build_const_continue_not_const = could not determine the target branch for this `#[const_continue]`
93+
.help = try extracting the expression into a `const` item
94+
95+
mir_build_const_continue_not_const_const_block = `const` blocks may use generics, and are not evaluated early enough
96+
mir_build_const_continue_not_const_const_other = this value must be a literal or a monomorphic const
97+
mir_build_const_continue_not_const_constant_parameter = constant parameters may use generics, and are not evaluated early enough
98+
9399
mir_build_const_continue_unknown_jump_target = the target of this `#[const_continue]` is not statically known
94100
.label = this value must be a literal or a monomorphic const
95101

‎compiler/rustc_mir_build/src/builder/scope.rs‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,9 @@ use tracing::{debug, instrument};
100100

101101
use super::matches::BuiltMatchTree;
102102
use crate::builder::{BlockAnd, BlockAndExtension, BlockFrame, Builder, CFG};
103-
use crate::errors::{ConstContinueBadConst, ConstContinueUnknownJumpTarget};
103+
use crate::errors::{
104+
ConstContinueBadConst, ConstContinueNotMonomorphicConst, ConstContinueUnknownJumpTarget,
105+
};
104106

105107
#[derive(Debug)]
106108
pub(crate) struct Scopes<'tcx> {
@@ -867,7 +869,8 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
867869
span_bug!(span, "break value must be a scope")
868870
};
869871

870-
let constant = match &self.thir[value].kind {
872+
let expr = &self.thir[value];
873+
let constant = match &expr.kind {
871874
ExprKind::Adt(box AdtExpr { variant_index, fields, base, .. }) => {
872875
assert!(matches!(base, AdtExprBase::None));
873876
assert!(fields.is_empty());
@@ -887,7 +890,27 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
887890
),
888891
}
889892
}
890-
_ => self.as_constant(&self.thir[value]),
893+
894+
ExprKind::Literal { .. }
895+
| ExprKind::NonHirLiteral { .. }
896+
| ExprKind::ZstLiteral { .. }
897+
| ExprKind::NamedConst { .. } => self.as_constant(&self.thir[value]),
898+
899+
other => {
900+
use crate::errors::ConstContinueNotMonomorphicConstReason as Reason;
901+
902+
let span = expr.span;
903+
let reason = match other {
904+
ExprKind::ConstParam { .. } => Reason::ConstantParameter { span },
905+
ExprKind::ConstBlock { .. } => Reason::ConstBlock { span },
906+
_ => Reason::Other { span },
907+
};
908+
909+
self.tcx
910+
.dcx()
911+
.emit_err(ConstContinueNotMonomorphicConst { span: expr.span, reason });
912+
return block.unit();
913+
}
891914
};
892915

893916
let break_index = self

‎compiler/rustc_mir_build/src/errors.rs‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,6 +1213,38 @@ pub(crate) struct LoopMatchArmWithGuard {
12131213
pub span: Span,
12141214
}
12151215

1216+
#[derive(Diagnostic)]
1217+
#[diag(mir_build_const_continue_not_const)]
1218+
#[help]
1219+
pub(crate) struct ConstContinueNotMonomorphicConst {
1220+
#[primary_span]
1221+
pub span: Span,
1222+
1223+
#[subdiagnostic]
1224+
pub reason: ConstContinueNotMonomorphicConstReason,
1225+
}
1226+
1227+
#[derive(Subdiagnostic)]
1228+
pub(crate) enum ConstContinueNotMonomorphicConstReason {
1229+
#[label(mir_build_const_continue_not_const_constant_parameter)]
1230+
ConstantParameter {
1231+
#[primary_span]
1232+
span: Span,
1233+
},
1234+
1235+
#[label(mir_build_const_continue_not_const_const_block)]
1236+
ConstBlock {
1237+
#[primary_span]
1238+
span: Span,
1239+
},
1240+
1241+
#[label(mir_build_const_continue_not_const_const_other)]
1242+
Other {
1243+
#[primary_span]
1244+
span: Span,
1245+
},
1246+
}
1247+
12161248
#[derive(Diagnostic)]
12171249
#[diag(mir_build_const_continue_bad_const)]
12181250
pub(crate) struct ConstContinueBadConst {

‎tests/ui/loop-match/suggest-const-item.rs‎

Lines changed: 174 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,174 @@
1+
#![allow(incomplete_features)]
2+
#![feature(loop_match)]
3+
#![feature(generic_const_items)]
4+
#![crate_type = "lib"]
5+
6+
const fn const_fn() -> i32 {
7+
1
8+
}
9+
10+
#[unsafe(no_mangle)]
11+
fn suggest_const_block<const N: i32>() -> i32 {
12+
let mut state = 0;
13+
#[loop_match]
14+
loop {
15+
state = 'blk: {
16+
match state {
17+
0 => {
18+
#[const_continue]
19+
break 'blk const_fn();
20+
//~^ ERROR could not determine the target branch for this `#[const_continue]`
21+
}
22+
1 => {
23+
#[const_continue]
24+
break 'blk const { const_fn() };
25+
//~^ ERROR could not determine the target branch for this `#[const_continue]`
26+
}
27+
2 => {
28+
#[const_continue]
29+
break 'blk N;
30+
//~^ ERROR could not determine the target branch for this `#[const_continue]`
31+
}
32+
_ => {
33+
#[const_continue]
34+
break 'blk 1 + 1;
35+
//~^ ERROR could not determine the target branch for this `#[const_continue]`
36+
}
37+
}
38+
}
39+
}
40+
state
41+
}
42+
43+
struct S;
44+
45+
impl S {
46+
const M: usize = 42;
47+
48+
fn g() {
49+
let mut state = 0;
50+
#[loop_match]
51+
loop {
52+
state = 'blk: {
53+
match state {
54+
0 => {
55+
#[const_continue]
56+
break 'blk Self::M;
57+
}
58+
_ => panic!(),
59+
}
60+
}
61+
}
62+
}
63+
}
64+
65+
trait T {
66+
const N: usize;
67+
68+
fn f() {
69+
let mut state = 0;
70+
#[loop_match]
71+
loop {
72+
state = 'blk: {
73+
match state {
74+
0 => {
75+
#[const_continue]
76+
break 'blk Self::N;
77+
//~^ ERROR could not determine the target branch for this `#[const_continue]`
78+
}
79+
_ => panic!(),
80+
}
81+
}
82+
}
83+
}
84+
}
85+
86+
impl T for S {
87+
const N: usize = 1;
88+
}
89+
90+
impl S {
91+
fn h() {
92+
let mut state = 0;
93+
#[loop_match]
94+
loop {
95+
state = 'blk: {
96+
match state {
97+
0 => {
98+
#[const_continue]
99+
break 'blk Self::N;
100+
}
101+
_ => panic!(),
102+
}
103+
}
104+
}
105+
}
106+
}
107+
108+
trait T2<U> {
109+
const L: u32;
110+
111+
fn p() {
112+
let mut state = 0;
113+
#[loop_match]
114+
loop {
115+
state = 'blk: {
116+
match state {
117+
0 => {
118+
#[const_continue]
119+
break 'blk Self::L;
120+
//~^ ERROR could not determine the target branch for this `#[const_continue]`
121+
}
122+
_ => panic!(),
123+
}
124+
}
125+
}
126+
}
127+
}
128+
129+
const SIZE_OF<T>: usize = size_of::<T>();
130+
131+
fn q<T>() {
132+
let mut state = 0;
133+
#[loop_match]
134+
loop {
135+
state = 'blk: {
136+
match state {
137+
0 => {
138+
#[const_continue]
139+
break 'blk SIZE_OF::<T>;
140+
//~^ ERROR could not determine the target branch for this `#[const_continue]`
141+
}
142+
_ => panic!(),
143+
}
144+
}
145+
}
146+
}
147+
148+
trait Trait<T> {
149+
const X: usize = 9000;
150+
const Y: usize = size_of::<T>();
151+
}
152+
153+
impl<T> Trait<T> for () {}
154+
155+
fn r<T>() {
156+
let mut state = 0;
157+
#[loop_match]
158+
loop {
159+
state = 'blk: {
160+
match state {
161+
0 => {
162+
#[const_continue]
163+
break 'blk <() as Trait<T>>::X;
164+
}
165+
1 => {
166+
#[const_continue]
167+
break 'blk <() as Trait<T>>::Y;
168+
//~^ ERROR could not determine the target branch for this `#[const_continue]`
169+
}
170+
_ => panic!(),
171+
}
172+
}
173+
}
174+
}

‎tests/ui/loop-match/suggest-const-item.stderr‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
error: could not determine the target branch for this `#[const_continue]`
2+
--> $DIR/suggest-const-item.rs:19:32
3+
|
4+
LL | break 'blk const_fn();
5+
| ^^^^^^^^^^ this value must be a literal or a monomorphic const
6+
|
7+
= help: try extracting the expression into a `const` item
8+
9+
error: could not determine the target branch for this `#[const_continue]`
10+
--> $DIR/suggest-const-item.rs:24:32
11+
|
12+
LL | break 'blk const { const_fn() };
13+
| ^^^^^^^^^^^^^^^^^^^^ `const` blocks may use generics, and are not evaluated early enough
14+
|
15+
= help: try extracting the expression into a `const` item
16+
17+
error: could not determine the target branch for this `#[const_continue]`
18+
--> $DIR/suggest-const-item.rs:29:32
19+
|
20+
LL | break 'blk N;
21+
| ^ constant parameters may use generics, and are not evaluated early enough
22+
|
23+
= help: try extracting the expression into a `const` item
24+
25+
error: could not determine the target branch for this `#[const_continue]`
26+
--> $DIR/suggest-const-item.rs:34:32
27+
|
28+
LL | break 'blk 1 + 1;
29+
| ^^^^^ this value must be a literal or a monomorphic const
30+
|
31+
= help: try extracting the expression into a `const` item
32+
33+
error: could not determine the target branch for this `#[const_continue]`
34+
--> $DIR/suggest-const-item.rs:76:36
35+
|
36+
LL | break 'blk Self::N;
37+
| ^^^^^^^ this value is too generic
38+
39+
error: could not determine the target branch for this `#[const_continue]`
40+
--> $DIR/suggest-const-item.rs:119:36
41+
|
42+
LL | break 'blk Self::L;
43+
| ^^^^^^^ this value is too generic
44+
45+
error: could not determine the target branch for this `#[const_continue]`
46+
--> $DIR/suggest-const-item.rs:139:32
47+
|
48+
LL | break 'blk SIZE_OF::<T>;
49+
| ^^^^^^^^^^^^ this value is too generic
50+
51+
error: could not determine the target branch for this `#[const_continue]`
52+
--> $DIR/suggest-const-item.rs:167:32
53+
|
54+
LL | break 'blk <() as Trait<T>>::Y;
55+
| ^^^^^^^^^^^^^^^^^^^ this value is too generic
56+
57+
error: aborting due to 8 previous errors
58+

0 commit comments

Comments
 (0)