Rollup merge of #125705 - oli-obk:const_block_ice, r=compiler-errors
Reintroduce name resolution check for trying to access locals from an inline const fixes #125676 I removed this without replacement in https://github.com/rust-lang/rust/pull/124650 without considering the consequences
This commit is contained in:
commit
c09b89ea32
3 changed files with 22 additions and 0 deletions
|
@ -4505,6 +4505,11 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
|
||||||
self.visit_expr(elem);
|
self.visit_expr(elem);
|
||||||
self.resolve_anon_const(ct, AnonConstKind::ConstArg(IsRepeatExpr::Yes));
|
self.resolve_anon_const(ct, AnonConstKind::ConstArg(IsRepeatExpr::Yes));
|
||||||
}
|
}
|
||||||
|
ExprKind::ConstBlock(ref expr) => {
|
||||||
|
self.resolve_anon_const_manual(false, AnonConstKind::InlineConst, |this| {
|
||||||
|
this.visit_expr(expr)
|
||||||
|
});
|
||||||
|
}
|
||||||
ExprKind::Index(ref elem, ref idx, _) => {
|
ExprKind::Index(ref elem, ref idx, _) => {
|
||||||
self.resolve_expr(elem, Some(expr));
|
self.resolve_expr(elem, Some(expr));
|
||||||
self.visit_expr(idx);
|
self.visit_expr(idx);
|
||||||
|
|
6
tests/ui/inline-const/referencing_local_variables.rs
Normal file
6
tests/ui/inline-const/referencing_local_variables.rs
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
const fn test_me<T>(a: usize) -> usize {
|
||||||
|
const { a }
|
||||||
|
//~^ ERROR: attempt to use a non-constant value in a constant
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {}
|
11
tests/ui/inline-const/referencing_local_variables.stderr
Normal file
11
tests/ui/inline-const/referencing_local_variables.stderr
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
error[E0435]: attempt to use a non-constant value in a constant
|
||||||
|
--> $DIR/referencing_local_variables.rs:2:13
|
||||||
|
|
|
||||||
|
LL | const fn test_me<T>(a: usize) -> usize {
|
||||||
|
| - this would need to be a `const`
|
||||||
|
LL | const { a }
|
||||||
|
| ^
|
||||||
|
|
||||||
|
error: aborting due to 1 previous error
|
||||||
|
|
||||||
|
For more information about this error, try `rustc --explain E0435`.
|
Loading…
Add table
Add a link
Reference in a new issue