@@ -4823,23 +4823,11 @@ fn mk_standard_basic_blocks(llfn: ValueRef) ->
4823
4823
// - trans_args
4824
4824
fn new_fn_ctxt_w_id ( cx : @local_ctxt , sp : span , llfndecl : ValueRef ,
4825
4825
id : ast:: node_id ) -> @fn_ctxt {
4826
- let llretptr: ValueRef = llvm:: LLVMGetParam ( llfndecl, 0 u) ;
4827
- let lltaskptr: ValueRef = llvm:: LLVMGetParam ( llfndecl, 1 u) ;
4828
- let llenv: ValueRef = llvm:: LLVMGetParam ( llfndecl, 2 u) ;
4829
- let llargs: hashmap < ast:: node_id , ValueRef > = new_int_hash :: < ValueRef > ( ) ;
4830
- let llobjfields: hashmap < ast:: node_id , ValueRef > =
4831
- new_int_hash :: < ValueRef > ( ) ;
4832
- let lllocals: hashmap < ast:: node_id , ValueRef > =
4833
- new_int_hash :: < ValueRef > ( ) ;
4834
- let llupvars: hashmap < ast:: node_id , ValueRef > =
4835
- new_int_hash :: < ValueRef > ( ) ;
4836
- let derived_tydescs =
4837
- map:: mk_hashmap :: < ty:: t , derived_tydesc_info > ( ty:: hash_ty, ty:: eq_ty) ;
4838
4826
let llbbs = mk_standard_basic_blocks ( llfndecl) ;
4839
4827
ret @{ llfn : llfndecl,
4840
- lltaskptr : lltaskptr ,
4841
- llenv : llenv ,
4842
- llretptr : llretptr ,
4828
+ lltaskptr : llvm :: LLVMGetParam ( llfndecl , 1 u ) ,
4829
+ llenv : llvm :: LLVMGetParam ( llfndecl , 2 u ) ,
4830
+ llretptr : llvm :: LLVMGetParam ( llfndecl , 0 u ) ,
4843
4831
mutable llstaticallocas : llbbs. sa ,
4844
4832
mutable llcopyargs : llbbs. ca ,
4845
4833
mutable llderivedtydescs_first : llbbs. dt ,
@@ -4850,12 +4838,12 @@ fn new_fn_ctxt_w_id(cx: @local_ctxt, sp: span, llfndecl: ValueRef,
4850
4838
mutable llself: none :: < val_self_pair > ,
4851
4839
mutable lliterbody : none :: < ValueRef > ,
4852
4840
mutable iterbodyty : none :: < ty:: t > ,
4853
- llargs : llargs ,
4854
- llobjfields : llobjfields ,
4855
- lllocals : lllocals ,
4856
- llupvars : llupvars ,
4841
+ llargs : new_int_hash :: < ValueRef > ( ) ,
4842
+ llobjfields : new_int_hash :: < ValueRef > ( ) ,
4843
+ lllocals : new_int_hash :: < ValueRef > ( ) ,
4844
+ llupvars : new_int_hash :: < ValueRef > ( ) ,
4857
4845
mutable lltydescs : [ ] ,
4858
- derived_tydescs : derived_tydescs ,
4846
+ derived_tydescs : map :: mk_hashmap ( ty :: hash_ty , ty :: eq_ty ) ,
4859
4847
id : id,
4860
4848
sp : sp,
4861
4849
lcx : cx} ;
0 commit comments