Improve abi ir comments a bit

src/abi/comments.rs

@@ -5,20 +5,19 @@ use rustc::mir;
 use crate::prelude::*;
 use crate::abi::pass_mode::*;
 
-pub fn add_local_header_comment(fx: &mut FunctionCx<impl Backend>) {
+pub fn add_args_header_comment(fx: &mut FunctionCx<impl Backend>) {
     fx.add_global_comment(format!(
-        "msg   loc.idx    param    pass mode                            ssa flags  ty"
+        "kind  loc.idx   param    pass mode                            ty"
     ));
 }
 
 pub fn add_arg_comment<'tcx>(
     fx: &mut FunctionCx<'_, 'tcx, impl Backend>,
-    msg: &str,
+    kind: &str,
     local: mir::Local,
     local_field: Option<usize>,
     params: EmptySinglePair<Value>,
     pass_mode: PassMode,
-    ssa: crate::analyze::Flags,
     ty: Ty<'tcx>,
 ) {
     let local_field = if let Some(local_field) = local_field {
@@ -33,17 +32,23 @@ pub fn add_arg_comment<'tcx>(
     };
     let pass_mode = format!("{:?}", pass_mode);
     fx.add_global_comment(format!(
-        "{msg:5}{local:>3}{local_field:<5} {params:10} {pass_mode:36} {ssa:10} {ty:?}",
+        "{kind:5}{local:>3}{local_field:<5} {params:10} {pass_mode:36} {ty:?}",
-        msg = msg,
+        kind = kind,
         local = format!("{:?}", local),
         local_field = local_field,
         params = params,
         pass_mode = pass_mode,
-        ssa = format!("{:?}", ssa),
         ty = ty,
     ));
 }
 
+pub fn add_locals_header_comment(fx: &mut FunctionCx<impl Backend>) {
+    fx.add_global_comment(String::new());
+    fx.add_global_comment(format!(
+        "kind  local ty                   size  align (abi,pref)"
+    ));
+}
+
 pub fn add_local_place_comments<'tcx>(
     fx: &mut FunctionCx<'_, 'tcx, impl Backend>,
     place: CPlace<'tcx>,
@@ -62,9 +67,9 @@ pub fn add_local_place_comments<'tcx>(
         CPlaceInner::Var(var) => {
             assert_eq!(local, var);
             fx.add_global_comment(format!(
-                "ssa   {:?}: {:?} size={} align={}, {}",
+                "ssa   {:5} {:20} {:4}b {}, {}",
-                local,
+                format!("{:?}", local),
-                ty,
+                format!("{:?}", ty),
                 size.bytes(),
                 align.abi.bytes(),
                 align.pref.bytes(),
@@ -82,9 +87,9 @@ pub fn add_local_place_comments<'tcx>(
             ),
         ),
         CPlaceInner::NoPlace => fx.add_global_comment(format!(
-            "zst   {:?}: {:?} size={} align={}, {}",
+            "zst   {:5} {:20} {:4}b {}, {}",
-            local,
+            format!("{:?}", local),
-            ty,
+            format!("{:?}", ty),
             size.bytes(),
             align.abi.bytes(),
             align.pref.bytes(),

src/abi/mod.rs

@@ -220,11 +220,10 @@ pub fn codegen_fn_prelude(
     let ssa_analyzed = crate::analyze::analyze(fx);
 
     #[cfg(debug_assertions)]
-    self::comments::add_local_header_comment(fx);
+    self::comments::add_args_header_comment(fx);
 
     self::returning::codegen_return_param(fx, &ssa_analyzed, start_ebb);
 
-
     // None means pass_mode == NoPass
     enum ArgKind<'tcx> {
         Normal(Option<CValue<'tcx>>),
@@ -257,7 +256,6 @@ pub fn codegen_fn_prelude(
                         local,
                         Some(i),
                         arg_ty,
-                        ssa_analyzed[&local],
                     );
                     params.push(param);
                 }
@@ -265,7 +263,7 @@ pub fn codegen_fn_prelude(
                 (local, ArgKind::Spread(params), arg_ty)
             } else {
                 let param =
-                    cvalue_for_param(fx, start_ebb, local, None, arg_ty, ssa_analyzed[&local]);
+                    cvalue_for_param(fx, start_ebb, local, None, arg_ty);
                 (local, ArgKind::Normal(param), arg_ty)
             }
         })
@@ -273,6 +271,9 @@ pub fn codegen_fn_prelude(
 
     fx.bcx.switch_to_block(start_ebb);
 
+    #[cfg(debug_assertions)]
+    self::comments::add_locals_header_comment(fx);
+
     for (local, arg_kind, ty) in func_params {
         let layout = fx.layout_of(ty);
 

src/abi/pass_mode.rs

@@ -132,7 +132,6 @@ pub fn cvalue_for_param<'tcx>(
     local: mir::Local,
     local_field: Option<usize>,
     arg_ty: Ty<'tcx>,
-    ssa_flags: crate::analyze::Flags,
 ) -> Option<CValue<'tcx>> {
     let layout = fx.layout_of(arg_ty);
     let pass_mode = get_pass_mode(fx.tcx, fx.layout_of(arg_ty));
@@ -152,7 +151,6 @@ pub fn cvalue_for_param<'tcx>(
         local_field,
         ebb_params,
         pass_mode,
-        ssa_flags,
         arg_ty,
     );
 

src/abi/returning.rs

@@ -44,7 +44,6 @@ pub fn codegen_return_param(
         None,
         ret_param,
         output_pass_mode,
-        ssa_analyzed[&RETURN_PLACE],
         ret_layout.ty,
     );
 }