diff options
| author | Gary Guo <gary@garyguo.net> | 2021-08-14 18:28:21 +0100 |
|---|---|---|
| committer | Gary Guo <gary@garyguo.net> | 2021-08-16 19:33:47 +0100 |
| commit | 53a7cdd9a3bd7997730ab800c43f5d1160e670f9 (patch) | |
| tree | bd21ddae883a16d1b1b47c393d41c26568a36bd3 | |
| parent | 2bd17c1d43bba43412cc2f051323a279d6751e43 (diff) | |
| download | rust-53a7cdd9a3bd7997730ab800c43f5d1160e670f9.tar.gz rust-53a7cdd9a3bd7997730ab800c43f5d1160e670f9.zip | |
Forbid inline const block referencing params from being used in patterns
| -rw-r--r-- | compiler/rustc_mir_build/src/thir/pattern/mod.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/compiler/rustc_mir_build/src/thir/pattern/mod.rs b/compiler/rustc_mir_build/src/thir/pattern/mod.rs index dd265d881e6..2a4ec2804bc 100644 --- a/compiler/rustc_mir_build/src/thir/pattern/mod.rs +++ b/compiler/rustc_mir_build/src/thir/pattern/mod.rs @@ -21,7 +21,7 @@ use rustc_middle::mir::UserTypeProjection; use rustc_middle::mir::{BorrowKind, Field, Mutability}; use rustc_middle::thir::{Ascription, BindingMode, FieldPat, Pat, PatKind, PatRange, PatTyProj}; use rustc_middle::ty::subst::{GenericArg, SubstsRef}; -use rustc_middle::ty::{self, AdtDef, DefIdTree, Region, Ty, TyCtxt, UserType}; +use rustc_middle::ty::{self, AdtDef, ConstKind, DefIdTree, Region, Ty, TyCtxt, UserType}; use rustc_span::{Span, Symbol}; use std::cmp::Ordering; @@ -545,6 +545,11 @@ impl<'a, 'tcx> PatCtxt<'a, 'tcx> { hir::ExprKind::ConstBlock(ref anon_const) => { let anon_const_def_id = self.tcx.hir().local_def_id(anon_const.hir_id); let value = ty::Const::from_anon_const(self.tcx, anon_const_def_id); + if matches!(value.val, ConstKind::Param(_)) { + let span = self.tcx.hir().span(anon_const.hir_id); + self.errors.push(PatternError::ConstParamInPattern(span)); + return PatKind::Wild; + } return *self.const_to_pat(value, expr.hir_id, expr.span, false).kind; } hir::ExprKind::Lit(ref lit) => (lit, false), |
