|
|
|
@ -25,7 +25,7 @@ let objc_getter tenv proc_desc location self_with_typ (fieldname, field_typ, _)
|
|
|
|
|
| {Typ.desc= Tstruct (CStruct _ as struct_name)} ->
|
|
|
|
|
let ret_param = Exp.Lvar (Pvar.get_ret_param_pvar (Procdesc.get_proc_name proc_desc)) in
|
|
|
|
|
Sil.Load {id= id_field; e= ret_param; root_typ= field_typ; typ= field_typ; loc= location}
|
|
|
|
|
:: CStructCopy.struct_copy tenv location (Exp.Var id_field) field_exp ~typ:field_typ
|
|
|
|
|
:: CStructUtils.struct_copy tenv location (Exp.Var id_field) field_exp ~typ:field_typ
|
|
|
|
|
~struct_name
|
|
|
|
|
| _ ->
|
|
|
|
|
let load_field_instr =
|
|
|
|
@ -46,7 +46,7 @@ let objc_setter tenv location self_with_typ (var, var_typ) (fieldname, field_typ
|
|
|
|
|
let store_instrs =
|
|
|
|
|
match field_typ with
|
|
|
|
|
| {Typ.desc= Tstruct (CStruct _ as struct_name)} ->
|
|
|
|
|
CStructCopy.struct_copy tenv location field_exp (Exp.Lvar var) ~typ:field_typ ~struct_name
|
|
|
|
|
CStructUtils.struct_copy tenv location field_exp (Exp.Lvar var) ~typ:field_typ ~struct_name
|
|
|
|
|
| _ ->
|
|
|
|
|
let id_field = Ident.create_fresh Ident.knormal in
|
|
|
|
|
let load_var_instr =
|
|
|
|
|