Skip to content

Commit

Permalink
Fix an ICE when casting a nonexistent const
Browse files Browse the repository at this point in the history
  • Loading branch information
varkor committed May 15, 2018
1 parent eca0da5 commit a4224eb
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/librustc_passes/rvalue_promotion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ fn check_expr<'a, 'tcx>(v: &mut CheckCrateVisitor<'a, 'tcx>, e: &hir::Expr, node
hir::ExprCast(ref from, _) => {
debug!("Checking const cast(id={})", from.id);
match v.tables.cast_kinds().get(from.hir_id) {
None => span_bug!(e.span, "no kind for cast"),
None => v.tcx.sess.delay_span_bug(e.span, "no kind for cast"),
Some(&CastKind::PtrAddrCast) | Some(&CastKind::FnPtrAddrCast) => {
v.promotable = false;
}
Expand Down
15 changes: 15 additions & 0 deletions src/test/ui/issue-50599.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

fn main() {
const N: u32 = 1_000;
const M: usize = (f64::from(N) * std::f64::LOG10_2) as usize; //~ ERROR cannot find value
let mut digits = [0u32; M];
}
15 changes: 15 additions & 0 deletions src/test/ui/issue-50599.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
error[E0425]: cannot find value `LOG10_2` in module `std::f64`
--> $DIR/issue-50599.rs:13:48
|
LL | const M: usize = (f64::from(N) * std::f64::LOG10_2) as usize; //~ ERROR cannot find value
| ^^^^^^^ not found in `std::f64`
help: possible candidates are found in other modules, you can import them into scope
|
LL | use std::f32::consts::LOG10_2;
|
LL | use std::f64::consts::LOG10_2;
|

error: aborting due to previous error

For more information about this error, try `rustc --explain E0425`.

0 comments on commit a4224eb

Please sign in to comment.