Address review feedback.

2 files changed, 4 insertions, 4 deletions

diff --git a/src/librustc_codegen_ssa/mir/block.rs b/src/librustc_codegen_ssa/mir/block.rs
index 5d25f7022c5..099ba5b39bb 100644
--- a/src/librustc_codegen_ssa/mir/block.rs
+++ b/src/librustc_codegen_ssa/mir/block.rs
@@ -771,14 +771,14 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
         }
 
         let needs_location =
-            instance.map(|i| i.def.requires_caller_location(self.cx.tcx())).unwrap_or_default();
+            instance.map_or(false, |i| i.def.requires_caller_location(self.cx.tcx()));
         if needs_location {
             assert_eq!(
                 fn_abi.args.len(), args.len() + 1,
                 "#[track_caller] fn's must have 1 more argument in their ABI than in their MIR",
             );
             let location = self.get_caller_location(&mut bx, span);
-            let last_arg = &fn_abi.args.last().unwrap();
+            let last_arg = fn_abi.args.last().unwrap();
             self.codegen_argument(&mut bx, location, &mut llargs, last_arg);
         }
 
diff --git a/src/librustc_codegen_ssa/mir/mod.rs b/src/librustc_codegen_ssa/mir/mod.rs
index 5e4da8f2125..33e343de86b 100644
--- a/src/librustc_codegen_ssa/mir/mod.rs
+++ b/src/librustc_codegen_ssa/mir/mod.rs
@@ -435,10 +435,10 @@ fn arg_local_refs<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
             "#[track_caller] fn's must have 1 more argument in their ABI than in their MIR",
         );
 
-        let arg = &fx.fn_abi.args.last().unwrap();
+        let arg = fx.fn_abi.args.last().unwrap();
         match arg.mode {
             PassMode::Direct(_) => (),
-            _ => panic!("caller location must be PassMode::Direct, found {:?}", arg.mode),
+            _ => bug!("caller location must be PassMode::Direct, found {:?}", arg.mode),
         }
 
         fx.caller_location = Some(OperandRef {