@@ -132,7 +132,7 @@ impl<'a, 'tcx> TerminatorCodegenHelper<'tcx> {
132
132
llargs : & [ Bx :: Value ] ,
133
133
destination : Option < ( ReturnDest < ' tcx , Bx :: Value > , mir:: BasicBlock ) > ,
134
134
cleanup : Option < mir:: BasicBlock > ,
135
- argument_tmps : & [ PlaceRef < ' tcx , <Bx as BackendTypes >:: Value > ] ,
135
+ copied_constant_arguments : & [ PlaceRef < ' tcx , <Bx as BackendTypes >:: Value > ] ,
136
136
) {
137
137
// If there is a cleanup block and the function we're calling can unwind, then
138
138
// do an invoke, otherwise do a call.
@@ -173,7 +173,7 @@ impl<'a, 'tcx> TerminatorCodegenHelper<'tcx> {
173
173
if let Some ( ( ret_dest, target) ) = destination {
174
174
bx. switch_to_block ( fx. llbb ( target) ) ;
175
175
fx. set_debug_loc ( bx, self . terminator . source_info ) ;
176
- for tmp in argument_tmps {
176
+ for tmp in copied_constant_arguments {
177
177
bx. lifetime_end ( tmp. llval , tmp. layout . size ) ;
178
178
}
179
179
fx. store_return ( bx, ret_dest, & fn_abi. ret , invokeret) ;
@@ -190,7 +190,7 @@ impl<'a, 'tcx> TerminatorCodegenHelper<'tcx> {
190
190
}
191
191
192
192
if let Some ( ( ret_dest, target) ) = destination {
193
- for tmp in argument_tmps {
193
+ for tmp in copied_constant_arguments {
194
194
bx. lifetime_end ( tmp. llval , tmp. layout . size ) ;
195
195
}
196
196
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> {
795
795
( args, None )
796
796
} ;
797
797
798
- let mut argument_tmps = vec ! [ ] ;
798
+ let mut copied_constant_arguments = vec ! [ ] ;
799
799
' make_args: for ( i, arg) in first_args. iter ( ) . enumerate ( ) {
800
800
let mut op = self . codegen_operand ( & mut bx, arg) ;
801
801
@@ -864,7 +864,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
864
864
bx. lifetime_start ( tmp. llval , tmp. layout . size ) ;
865
865
op. val . store ( & mut bx, tmp) ;
866
866
op. val = Ref ( tmp. llval , None , tmp. align ) ;
867
- argument_tmps . push ( tmp) ;
867
+ copied_constant_arguments . push ( tmp) ;
868
868
}
869
869
_ => { }
870
870
}
@@ -937,7 +937,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
937
937
& llargs,
938
938
target. as_ref ( ) . map ( |& target| ( ret_dest, target) ) ,
939
939
cleanup,
940
- & argument_tmps ,
940
+ & copied_constant_arguments ,
941
941
) ;
942
942
943
943
bx. switch_to_block ( bb_fail) ;
@@ -955,7 +955,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
955
955
& llargs,
956
956
target. as_ref ( ) . map ( |& target| ( ret_dest, target) ) ,
957
957
cleanup,
958
- & argument_tmps ,
958
+ & copied_constant_arguments ,
959
959
) ;
960
960
}
961
961
0 commit comments