bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

use PatKind::error when an ADT const value has violation

Browse source
This commit is contained in:
bohan 2023-10-15 19:20:06 +08:00
parent b0fedc07ce
commit 223674a824
3 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_mir_build/src/thir/pattern/const_to_pat.rs
View file

@ -198,6 +198,14 @@ impl<'tcx> ConstToPat<'tcx> {
// We errored. Signal that in the pattern, so that follow up errors can be silenced.
let kind = PatKind::Error(e);
return Box::new(Pat { span: self.span, ty: cv.ty(), kind });
} else if let ty::Adt(..) = cv.ty().kind() && matches!(cv, mir::Const::Val(..)) {
// This branch is only entered when the current `cv` is `mir::Const::Val`.
// This is because `mir::Const::ty` has already been handled by `Self::recur`
// and the invalid types may be ignored.
let err = TypeNotStructural { span: self.span, non_sm_ty };
let e = self.tcx().sess.emit_err(err);
let kind = PatKind::Error(e);
return Box::new(Pat { span: self.span, ty: cv.ty(), kind });
} else if !self.saw_const_match_lint.get() {
if let Some(mir_structural_match_violation) = mir_structural_match_violation {
match non_sm_ty.kind() {