Skip to content

Commit 8f529ab

Browse files
committed
Improved naming for copied constant arguments vector.
1 parent a174d65 commit 8f529ab

File tree

1 file changed

+7
-7
lines changed
  • compiler/rustc_codegen_ssa/src/mir

1 file changed

+7
-7
lines changed

compiler/rustc_codegen_ssa/src/mir/block.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ impl<'a, 'tcx> TerminatorCodegenHelper<'tcx> {
132132
llargs: &[Bx::Value],
133133
destination: Option<(ReturnDest<'tcx, Bx::Value>, mir::BasicBlock)>,
134134
cleanup: Option<mir::BasicBlock>,
135-
argument_tmps: &[PlaceRef<'tcx, <Bx as BackendTypes>::Value>],
135+
copied_constant_arguments: &[PlaceRef<'tcx, <Bx as BackendTypes>::Value>],
136136
) {
137137
// If there is a cleanup block and the function we're calling can unwind, then
138138
// do an invoke, otherwise do a call.
@@ -173,7 +173,7 @@ impl<'a, 'tcx> TerminatorCodegenHelper<'tcx> {
173173
if let Some((ret_dest, target)) = destination {
174174
bx.switch_to_block(fx.llbb(target));
175175
fx.set_debug_loc(bx, self.terminator.source_info);
176-
for tmp in argument_tmps {
176+
for tmp in copied_constant_arguments {
177177
bx.lifetime_end(tmp.llval, tmp.layout.size);
178178
}
179179
fx.store_return(bx, ret_dest, &fn_abi.ret, invokeret);
@@ -190,7 +190,7 @@ impl<'a, 'tcx> TerminatorCodegenHelper<'tcx> {
190190
}
191191

192192
if let Some((ret_dest, target)) = destination {
193-
for tmp in argument_tmps {
193+
for tmp in copied_constant_arguments {
194194
bx.lifetime_end(tmp.llval, tmp.layout.size);
195195
}
196196
fx.store_return(bx, ret_dest, &fn_abi.ret, llret);
@@ -795,7 +795,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
795795
(args, None)
796796
};
797797

798-
let mut argument_tmps = vec![];
798+
let mut copied_constant_arguments = vec![];
799799
'make_args: for (i, arg) in first_args.iter().enumerate() {
800800
let mut op = self.codegen_operand(&mut bx, arg);
801801

@@ -864,7 +864,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
864864
bx.lifetime_start(tmp.llval, tmp.layout.size);
865865
op.val.store(&mut bx, tmp);
866866
op.val = Ref(tmp.llval, None, tmp.align);
867-
argument_tmps.push(tmp);
867+
copied_constant_arguments.push(tmp);
868868
}
869869
_ => {}
870870
}
@@ -937,7 +937,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
937937
&llargs,
938938
target.as_ref().map(|&target| (ret_dest, target)),
939939
cleanup,
940-
&argument_tmps,
940+
&copied_constant_arguments,
941941
);
942942

943943
bx.switch_to_block(bb_fail);
@@ -955,7 +955,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
955955
&llargs,
956956
target.as_ref().map(|&target| (ret_dest, target)),
957957
cleanup,
958-
&argument_tmps,
958+
&copied_constant_arguments,
959959
);
960960
}
961961

0 commit comments

Comments
 (0)