From 21554b96aff27d2d4ac2742bc4b00b52982933ca Mon Sep 17 00:00:00 2001
From: Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>
Date: Mon, 29 Jan 2018 10:18:49 +0100
Subject: [PATCH] Fix ICE in const prop

---
 src/librustc_mir/transform/const_prop.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/librustc_mir/transform/const_prop.rs b/src/librustc_mir/transform/const_prop.rs
index 8cbb2afae397..3b9b758baf21 100644
--- a/src/librustc_mir/transform/const_prop.rs
+++ b/src/librustc_mir/transform/const_prop.rs
@@ -480,7 +480,7 @@ impl<'b, 'a, 'tcx> Visitor<'tcx> for OptimizationFinder<'b, 'a, 'tcx> {
         &mut self,
         block: BasicBlock,
         kind: &TerminatorKind<'tcx>,
-        location: Location,
+        _location: Location,
     ) {
         match kind {
             TerminatorKind::SwitchInt { discr: value, .. } |
@@ -503,7 +503,9 @@ impl<'b, 'a, 'tcx> Visitor<'tcx> for OptimizationFinder<'b, 'a, 'tcx> {
                     if let TerminatorKind::Assert { expected, msg, .. } = kind {
                         if Value::ByVal(PrimVal::from_bool(*expected)) != value.0 {
                             let span = self.mir[block]
-                                .statements[location.statement_index]
+                                .terminator
+                                .as_ref()
+                                .unwrap()
                                 .source_info
                                 .span;
                             let node_id = self