diff options
| author | Oliver Scherer <github35764891676564198441@oli-obk.de> | 2018-10-27 13:34:35 +0200 |
|---|---|---|
| committer | Oliver Scherer <github35764891676564198441@oli-obk.de> | 2018-10-27 13:34:35 +0200 |
| commit | c04893afbb1bccc2ceeccdd7b7f46e5cb5dc126d (patch) | |
| tree | b8f1f97c7acae4d43da68d99514a37041b53c811 /src | |
| parent | 3e6f30ec3e6bda159063fcd126dcb14725fef92d (diff) | |
| download | rust-c04893afbb1bccc2ceeccdd7b7f46e5cb5dc126d.tar.gz rust-c04893afbb1bccc2ceeccdd7b7f46e5cb5dc126d.zip | |
Fix an ICE in the min_const_fn analysis
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_mir/transform/qualify_min_const_fn.rs | 5 | ||||
| -rw-r--r-- | src/test/ui/consts/single_variant_match_ice.rs | 15 | ||||
| -rw-r--r-- | src/test/ui/consts/single_variant_match_ice.stderr | 8 |
3 files changed, 26 insertions, 2 deletions
diff --git a/src/librustc_mir/transform/qualify_min_const_fn.rs b/src/librustc_mir/transform/qualify_min_const_fn.rs index 52c557b83d5..6ab68789c02 100644 --- a/src/librustc_mir/transform/qualify_min_const_fn.rs +++ b/src/librustc_mir/transform/qualify_min_const_fn.rs @@ -317,7 +317,8 @@ fn check_terminator( check_place(tcx, mir, location, span, PlaceMode::Read)?; check_operand(tcx, mir, value, span) }, - TerminatorKind::SwitchInt { .. } => Err(( + + TerminatorKind::FalseEdges { .. } | TerminatorKind::SwitchInt { .. } => Err(( span, "`if`, `match`, `&&` and `||` are not stable in const fn".into(), )), @@ -363,7 +364,7 @@ fn check_terminator( cleanup: _, } => check_operand(tcx, mir, cond, span), - | TerminatorKind::FalseEdges { .. } | TerminatorKind::FalseUnwind { .. } => span_bug!( + | TerminatorKind::FalseUnwind { .. } => span_bug!( terminator.source_info.span, "min_const_fn encountered `{:#?}`", terminator diff --git a/src/test/ui/consts/single_variant_match_ice.rs b/src/test/ui/consts/single_variant_match_ice.rs new file mode 100644 index 00000000000..67a41bc5dc4 --- /dev/null +++ b/src/test/ui/consts/single_variant_match_ice.rs @@ -0,0 +1,15 @@ +enum Foo { + Prob, +} + +impl Foo { + pub const fn as_val(&self) -> u8 { + use self::Foo::*; + + match *self { + Prob => 0x1, //~ ERROR `if`, `match`, `&&` and `||` are not stable in const fn + } + } +} + +fn main() {} diff --git a/src/test/ui/consts/single_variant_match_ice.stderr b/src/test/ui/consts/single_variant_match_ice.stderr new file mode 100644 index 00000000000..a0222b0d489 --- /dev/null +++ b/src/test/ui/consts/single_variant_match_ice.stderr @@ -0,0 +1,8 @@ +error: `if`, `match`, `&&` and `||` are not stable in const fn + --> $DIR/single_variant_match_ice.rs:10:13 + | +LL | Prob => 0x1, //~ ERROR `if`, `match`, `&&` and `||` are not stable in const fn + | ^^^^ + +error: aborting due to previous error + |