Browse Source

* fixed the parameter order for thlcgobj.g_load_const_field_by_name()

git-svn-id: trunk@32595 -
Jonas Maebe 9 years ago
parent
commit
a9498b6735
3 changed files with 5 additions and 5 deletions
  1. 2 2
      compiler/hlcgobj.pas
  2. 2 2
      compiler/llvm/nllvmcnv.pas
  3. 1 1
      compiler/ncgcnv.pas

+ 2 - 2
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);
           procedure g_setup_load_field_by_name(list: TAsmList; recdef: trecorddef; const name: TIDString; const recref: treference; out fref: treference; out fielddef: tdef);
          public
          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_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 }
           { routines migrated from ncgutil }
 
 
@@ -3882,7 +3882,7 @@ implementation
     end;
     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
     var
       fref: treference;
       fref: treference;
       fielddef: tdef;
       fielddef: tdef;

+ 2 - 2
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_reset_ref(location,LOC_REFERENCE,def_cgsize(resultdef),href.alignment);
     location.reference:=href;
     location.reference:=href;
     hlcg.g_ptrtypecast_ref(current_asmdata.CurrAsmList,cpointerdef.getreusable(resultdef),cpointerdef.getreusable(methodpointertype),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;
   end;
 
 
 
 

+ 1 - 1
compiler/ncgcnv.pas

@@ -593,7 +593,7 @@ interface
                 { setting the frame pointer to nil is not strictly necessary
                 { setting the frame pointer to nil is not strictly necessary
                   since the global procedure won't use it, but it can help with
                   since the global procedure won't use it, but it can help with
                   debugging }
                   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;
           end;
       end;
       end;