diff --git a/compiler/hlcgobj.pas b/compiler/hlcgobj.pas index 5e5e5001f0..b2494b9b42 100644 --- a/compiler/hlcgobj.pas +++ b/compiler/hlcgobj.pas @@ -552,7 +552,7 @@ unit hlcgobj; procedure g_setup_load_field_by_name(list: TAsmList; recdef: trecorddef; const name: TIDString; const recref: treference; out fref: treference; out fielddef: tdef); public procedure g_load_reg_field_by_name(list: TAsmList; regsize: tdef; recdef: trecorddef; reg: tregister; const name: TIDString; const recref: treference); - procedure g_load_const_field_by_name(list: TAsmList; recdef: trecorddef; const name: TIDString; a: tcgint; const recref: treference); + procedure g_load_const_field_by_name(list: TAsmList; recdef: trecorddef; a: tcgint; const name: TIDString; const recref: treference); { routines migrated from ncgutil } @@ -3882,7 +3882,7 @@ implementation end; - procedure thlcgobj.g_load_const_field_by_name(list: TAsmList; recdef: trecorddef; const name: TIDString; a: tcgint; const recref: treference); + procedure thlcgobj.g_load_const_field_by_name(list: TAsmList; recdef: trecorddef; a: tcgint; const name: TIDString; const recref: treference); var fref: treference; fielddef: tdef; diff --git a/compiler/llvm/nllvmcnv.pas b/compiler/llvm/nllvmcnv.pas index 2b0542f2b8..eaab2decf4 100644 --- a/compiler/llvm/nllvmcnv.pas +++ b/compiler/llvm/nllvmcnv.pas @@ -179,8 +179,8 @@ procedure tllvmtypeconvnode.second_nil_to_methodprocvar; location_reset_ref(location,LOC_REFERENCE,def_cgsize(resultdef),href.alignment); location.reference:=href; hlcg.g_ptrtypecast_ref(current_asmdata.CurrAsmList,cpointerdef.getreusable(resultdef),cpointerdef.getreusable(methodpointertype),href); - hlcg.g_load_const_field_by_name(current_asmdata.CurrAsmList,trecorddef(methodpointertype),'proc',0,href); - hlcg.g_load_const_field_by_name(current_asmdata.CurrAsmList,trecorddef(methodpointertype),'self',0,href); + hlcg.g_load_const_field_by_name(current_asmdata.CurrAsmList,trecorddef(methodpointertype),0,'proc',href); + hlcg.g_load_const_field_by_name(current_asmdata.CurrAsmList,trecorddef(methodpointertype),0,'self',href); end; diff --git a/compiler/ncgcnv.pas b/compiler/ncgcnv.pas index 678b45451f..e8215b31b5 100644 --- a/compiler/ncgcnv.pas +++ b/compiler/ncgcnv.pas @@ -593,7 +593,7 @@ interface { setting the frame pointer to nil is not strictly necessary since the global procedure won't use it, but it can help with debugging } - hlcg.g_load_const_field_by_name(current_asmdata.CurrAsmList,trecorddef(procvarrectype),procvarselfname,0,href); + hlcg.g_load_const_field_by_name(current_asmdata.CurrAsmList,trecorddef(procvarrectype),0,procvarselfname,href); end; end; end;