Auto merge of #39411 - tamird:match-arm-statics-ICE, r=alexcrichton

statics in match arm: compile with -g

Resubmission of #29700.

r? @alexcrichton

2 files changed, 2 insertions, 2 deletions

diff --git a/src/librustc_trans/debuginfo/utils.rs b/src/librustc_trans/debuginfo/utils.rs
index 3ee2497009f..8d634c0e292 100644
--- a/src/librustc_trans/debuginfo/utils.rs
+++ b/src/librustc_trans/debuginfo/utils.rs
@@ -60,8 +60,7 @@ pub fn bytes_to_bits(bytes: u64) -> u64 {
 #[inline]
 pub fn debug_context<'a, 'tcx>(cx: &'a CrateContext<'a, 'tcx>)
                            -> &'a CrateDebugContext<'tcx> {
-    let debug_context: &'a CrateDebugContext<'tcx> = cx.dbg_cx().as_ref().unwrap();
-    debug_context
+    cx.dbg_cx().as_ref().unwrap()
 }
 
 #[inline]
diff --git a/src/test/run-pass/match-arm-statics.rs b/src/test/run-pass/match-arm-statics.rs
index 9700ed24795..78a37f51837 100644
--- a/src/test/run-pass/match-arm-statics.rs
+++ b/src/test/run-pass/match-arm-statics.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -g
 
 #[derive(PartialEq, Eq)]
 struct NewBool(bool);