Rename sarg__ to sarg_t

cranelift/codegen/src/ir/types.rs

@@ -343,7 +343,7 @@ impl Display for Type {
             f.write_str(match *self {
                 IFLAGS => "iflags",
                 FFLAGS => "fflags",
-                SARG__ => "sarg__",
+                SARG_T => "sarg_t",
                 INVALID => panic!("INVALID encountered"),
                 _ => panic!("Unknown Type(0x{:x})", self.0),
             })

cranelift/codegen/src/isa/aarch64/lower_inst.rs

@@ -2152,7 +2152,7 @@ pub(crate) fn lower_insn_to_regs<C: LowerCtx<I = Inst>>(
             panic!("x86-specific opcode in supposedly arch-neutral IR!");
         }
 
-        Opcode::DummySarg => unreachable!(),
+        Opcode::DummySargT => unreachable!(),
 
         Opcode::AvgRound => unimplemented!(),
         Opcode::Iabs => unimplemented!(),

cranelift/codegen/src/isa/x86/abi.rs

@@ -118,7 +118,7 @@ impl ArgAssigner for Args {
             let loc = ArgumentLoc::Stack(self.offset as i32);
             self.offset += size;
             debug_assert!(self.offset <= i32::MAX as u32);
-            return ArgAction::AssignAndChangeType(loc, types::SARG__);
+            return ArgAction::AssignAndChangeType(loc, types::SARG_T);
         }
 
         let ty = arg.value_type;

cranelift/codegen/src/legalizer/boundary.rs

@@ -127,7 +127,7 @@ fn legalize_entry_params(func: &mut Function, entry: Block) {
                 let dummy = pos
                     .func
                     .dfg
-                    .append_block_param(entry, crate::ir::types::SARG__);
+                    .append_block_param(entry, crate::ir::types::SARG_T);
                 pos.func.locations[dummy] = ValueLoc::Stack(ss);
                 abi_arg += 1;
                 continue;
@@ -1127,7 +1127,7 @@ fn spill_call_arguments(pos: &mut FuncCursor, isa: &dyn TargetIsa) -> bool {
 
             let libc_memcpy = import_memcpy(pos.func, pointer_type);
             pos.ins().call(libc_memcpy, &[dest, src, size]);
-            pos.ins().dummy_sarg__()
+            pos.ins().dummy_sarg_t()
         } else {
             // Non struct argument
             pos.ins().spill(arg)