diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2022-11-10 10:47:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-10 10:47:41 -0500 |
| commit | 77fde5d49a8d5244e032ee7956589fd7f28cf0eb (patch) | |
| tree | 17c7c1679c7f832b3598279a3ad9740360ac429d | |
| parent | c6595ea22a5f05b3595a6ce3ea582e0a70e677f2 (diff) | |
| parent | 31157def1aa9c57424d605ac36a3704b3d26b4ff (diff) | |
| download | rust-77fde5d49a8d5244e032ee7956589fd7f28cf0eb.tar.gz rust-77fde5d49a8d5244e032ee7956589fd7f28cf0eb.zip | |
Rollup merge of #104233 - compiler-errors:issue-104209, r=lcnr
Don't ICE when encountering `ConstKind::Error` in `RequiredConstsVisitor` Fixes #104209
| -rw-r--r-- | compiler/rustc_mir_transform/src/required_consts.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/consts/invalid-const-in-body.rs | 6 | ||||
| -rw-r--r-- | src/test/ui/consts/invalid-const-in-body.stderr | 8 |
3 files changed, 15 insertions, 1 deletions
diff --git a/compiler/rustc_mir_transform/src/required_consts.rs b/compiler/rustc_mir_transform/src/required_consts.rs index cc75947d9dd..0ea8f2ba93f 100644 --- a/compiler/rustc_mir_transform/src/required_consts.rs +++ b/compiler/rustc_mir_transform/src/required_consts.rs @@ -17,7 +17,7 @@ impl<'tcx> Visitor<'tcx> for RequiredConstsVisitor<'_, 'tcx> { let literal = constant.literal; match literal { ConstantKind::Ty(c) => match c.kind() { - ConstKind::Param(_) => {} + ConstKind::Param(_) | ConstKind::Error(_) => {} _ => bug!("only ConstKind::Param should be encountered here, got {:#?}", c), }, ConstantKind::Unevaluated(..) => self.required_consts.push(*constant), diff --git a/src/test/ui/consts/invalid-const-in-body.rs b/src/test/ui/consts/invalid-const-in-body.rs new file mode 100644 index 00000000000..f0fa3bb7bd1 --- /dev/null +++ b/src/test/ui/consts/invalid-const-in-body.rs @@ -0,0 +1,6 @@ +fn f() -> impl Sized { + 2.0E + //~^ ERROR expected at least one digit in exponent +} + +fn main() {} diff --git a/src/test/ui/consts/invalid-const-in-body.stderr b/src/test/ui/consts/invalid-const-in-body.stderr new file mode 100644 index 00000000000..3be65835946 --- /dev/null +++ b/src/test/ui/consts/invalid-const-in-body.stderr @@ -0,0 +1,8 @@ +error: expected at least one digit in exponent + --> $DIR/invalid-const-in-body.rs:2:5 + | +LL | 2.0E + | ^^^^ + +error: aborting due to previous error + |