Clif ir comment improvements

Author: bjorn3

src/abi/mod.rs

@@ -187,11 +187,10 @@ impl<'tcx> FunctionCx<'_, '_, 'tcx> {
         let func_ref = self.module.declare_func_in_func(func_id, &mut self.bcx.func);
         if self.clif_comments.enabled() {
             self.add_comment(func_ref, format!("{:?}", name));
+            let inst = self.bcx.func.layout.last_inst(self.bcx.current_block().unwrap()).unwrap();
+            self.add_comment(inst, format!("lib_call {}", name));
         }
         let call_inst = self.bcx.ins().call(func_ref, args);
-        if self.clif_comments.enabled() {
-            self.add_comment(call_inst, format!("lib_call {}", name));
-        }
         let results = self.bcx.inst_results(call_inst);
         assert!(results.len() <= 2, "{}", results.len());
         results

src/base.rs

@@ -559,11 +559,7 @@ fn codegen_fn_body(fx: &mut FunctionCx<'_, '_, '_>, start_block: Block) {
     }
 }
 
-fn codegen_stmt<'tcx>(
-    fx: &mut FunctionCx<'_, '_, 'tcx>,
-    #[allow(unused_variables)] cur_block: Block,
-    stmt: &Statement<'tcx>,
-) {
+fn codegen_stmt<'tcx>(fx: &mut FunctionCx<'_, '_, 'tcx>, cur_block: Block, stmt: &Statement<'tcx>) {
     let _print_guard = crate::PrintOnPanic(|| format!("stmt {:?}", stmt));
 
     fx.set_debug_loc(stmt.source_info);

src/value_and_place.rs

@@ -592,13 +592,9 @@ impl<'tcx> CPlace<'tcx> {
         assert_eq!(self.layout().size, from.layout().size);
 
         if fx.clif_comments.enabled() {
-            use cranelift_codegen::cursor::{Cursor, CursorPosition};
-            let cur_block = match fx.bcx.cursor().position() {
-                CursorPosition::After(block) => block,
-                _ => unreachable!(),
-            };
+            let inst = fx.bcx.func.layout.last_inst(fx.bcx.current_block().unwrap()).unwrap();
             fx.add_comment(
-                fx.bcx.func.layout.last_inst(cur_block).unwrap(),
+                inst,
                 format!(
                     "{}: {:?}: {:?} <- {:?}: {:?}",
                     method,