paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-05 05:58:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

* added is_normal_fieldvarsym() helper and use it

Browse Source 
o fixes several places where there was a check whether something is a
     fieldvarsym, but not whether it's an instance rather than a class field

git-svn-id: trunk@43786 -
This commit is contained in:
Jonas Maebe 2019-12-24 22:12:44 +00:00
parent 6d51c69dbe
commit 1a9e246c29
12 changed files with 44 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/aasmcnst.pas
View File

@ -512,7 +512,7 @@ implementation
cutils,
verbose,globals,systems,widestr,
fmodule,
symtable,defutil;
symtable,symutil,defutil;
{****************************************************************************
taggregateinformation
@ -589,8 +589,7 @@ implementation
repeat
inc(i);
sym:=tsym(tabstractrecorddef(def).symtable.symlist[i]);
until (sym.typ=fieldvarsym) and
not(sp_static in sym.symoptions);
until is_normal_fieldvarsym(sym);
curfield:=tfieldvarsym(sym);
nextoffset:=curfield.fieldoffset;
curindex:=i;
@ -2086,7 +2085,7 @@ implementation
begin
sym:=search_struct_member_no_helper(tabstractrecorddef(curdef),fields[i]);
if not assigned(sym) or
(sym.typ<>fieldvarsym) or
not is_normal_fieldvarsym(sym) or
((i<>high(fields)) and
not(tfieldvarsym(sym).vardef.typ in [objectdef,recorddef])) then
internalerror(2015071505);

4
compiler/arm/cpupara.pas
View File

@ -59,7 +59,7 @@ unit cpupara;
uses
verbose,systems,cutils,
defutil,symsym,symcpu,symtable,
defutil,symsym,symcpu,symtable,symutil,
{ PowerPC uses procinfo as well in cpupara, so this should not hurt }
procinfo;
@ -294,7 +294,7 @@ unit cpupara;
for i:=0 to trecorddef(def).symtable.SymList.count-1 do
begin
sym:=tsym(trecorddef(def).symtable.SymList[i]);
if sym.typ<>fieldvarsym then
if not is_normal_fieldvarsym(sym) then
continue;
{ bitfield -> ignore }
if (trecordsymtable(trecorddef(def).symtable).usefieldalignment=bit_alignment) and

4
compiler/armgen/armpara.pas
View File

@ -43,7 +43,7 @@ type
implementation
uses
symconst,symdef,symsym,defutil;
symconst,symdef,symsym,symutil,defutil;
function tarmgenparamanager.is_hfa(p: tdef; out basedef: tdef): boolean;
@ -106,7 +106,7 @@ implementation
for i:=0 to tabstractrecorddef(p).symtable.symlist.count-1 do
begin
sym:=tsym(tabstractrecorddef(p).symtable.symlist[i]);
if sym.typ<>fieldvarsym then
if not is_normal_fieldvarsym(sym) then
continue;
if not is_hfa_internal(tfieldvarsym(sym).vardef,basedef,elecount) then
exit

11
compiler/browcol.pas
View File

@ -1560,15 +1560,10 @@ end;
Symbol^.Flags:=(Symbol^.Flags or sfPointer);
Symbol^.RelatedTypeID:=Ptrint(tpointerdef(vardef).pointeddef);
end;
if typ=fieldvarsym then
MemInfo.Addr:=tfieldvarsym(sym).fieldoffset
if tabstractnormalvarsym(sym).localloc.loc=LOC_REFERENCE then
MemInfo.Addr:=tabstractnormalvarsym(sym).localloc.reference.offset
else
begin
if tabstractnormalvarsym(sym).localloc.loc=LOC_REFERENCE then
MemInfo.Addr:=tabstractnormalvarsym(sym).localloc.reference.offset
else
MemInfo.Addr:=0;
end;
MemInfo.Addr:=0;
if assigned(vardef) and (vardef.typ=arraydef) then
begin
if tarraydef(vardef).highrange<tarraydef(vardef).lowrange then

9
compiler/dbgstabs.pas
View File

@ -158,7 +158,8 @@ implementation
defutil, cgutils, parabase,
cpuinfo,cpubase,cpupi,paramgr,
aasmbase,procinfo,
finput,fmodule,ppu;
finput,fmodule,ppu,
symutil;
const
@ -428,8 +429,7 @@ implementation
if (tsym(p).visibility=vis_hidden) then
exit;
{ static variables from objects are like global objects }
if (Tsym(p).typ=fieldvarsym) and
not(sp_static in Tsym(p).symoptions) then
if is_normal_fieldvarsym(Tsym(p)) then
begin
case tsym(p).visibility of
vis_private,
@ -557,8 +557,7 @@ implementation
procedure TDebugInfoStabs.field_write_defs(p:TObject;arg:pointer);
begin
if (Tsym(p).typ=fieldvarsym) and
not(sp_static in Tsym(p).symoptions) then
if is_normal_fieldvarsym(Tsym(p)) then
appenddef(TAsmList(arg),tfieldvarsym(p).vardef);
end;

4
compiler/htypechk.pas
View File

@ -216,7 +216,7 @@ implementation
uses
systems,constexp,globals,
cutils,verbose,
symtable,
symtable,symutil,
defutil,defcmp,
nbas,ncnv,nld,nmem,ncal,nmat,ninl,nutils,procinfo,
pgenutil
@ -3652,7 +3652,7 @@ implementation
for i:=0 to def.symtable.symlist.count-1 do
begin
sym:=tsym(def.symtable.symlist[i]);
if (sym.typ<>fieldvarsym) or (sp_static in sym.symoptions) then
if not is_normal_fieldvarsym(sym) then
continue;
if not is_valid_for_default(tfieldvarsym(sym).vardef) then
begin

9
compiler/ncgrtti.pas
View File

@ -90,7 +90,7 @@ implementation
globals,verbose,systems,
node,ncal,ncon,
fmodule, procinfo,
symtable,
symtable,symutil,
aasmtai,aasmdata,
defutil,
paramgr
@ -599,8 +599,7 @@ implementation
for i:=0 to st.SymList.Count-1 do
begin
sym:=tsym(st.SymList[i]);
if (tsym(sym).typ=fieldvarsym) and
not(sp_static in tsym(sym).symoptions) and
if is_normal_fieldvarsym(sym) and
(
(rt=fullrtti) or
tfieldvarsym(sym).vardef.needs_inittable
@ -638,8 +637,7 @@ implementation
for i:=0 to st.SymList.Count-1 do
begin
sym:=tsym(st.SymList[i]);
if (tsym(sym).typ=fieldvarsym) and
not(sp_static in tsym(sym).symoptions) and
if is_normal_fieldvarsym(sym) and
(
(rt=fullrtti) or
tfieldvarsym(sym).vardef.needs_inittable
@ -783,6 +781,7 @@ implementation
tcb.emit_tai(Tai_const.Create_int_codeptr(unsetvalue),codeptruinttype);
typvalue:=3;
end
{ also for accessing class fields }
else if propaccesslist.firstsym^.sym.typ=fieldvarsym then
begin
address:=0;

5
compiler/powerpc64/symcpu.pas
View File

@ -181,7 +181,7 @@ const
implementation
uses
symconst, defutil, defcmp;
symconst, symutil, defutil, defcmp;
{ tcpurecorddef }
@ -195,8 +195,7 @@ implementation
result:=false;
for i:=0 to symtable.SymList.Count-1 do
begin
if (tsym(symtable.symlist[i]).typ=fieldvarsym) and
not(sp_static in tsym(symtable.symlist[i]).symoptions) then
if is_normal_fieldvarsym(tsym(symtable.symlist[i])) then
begin
checkdef:=tfieldvarsym(symtable.symlist[i]).vardef;
repeat

22
compiler/symtable.pas
View File

@ -1556,8 +1556,7 @@ implementation
for i:=0 to SymList.count-1 do
begin
sym:=tsym(symlist[i]);
if (sym.typ=fieldvarsym) and
not(sp_static in sym.symoptions) and
if is_normal_fieldvarsym(sym) and
(tfieldvarsym(sym).fieldoffset>=offset) then
begin
result:=tfieldvarsym(sym);
@ -1638,8 +1637,7 @@ implementation
{ record has one field? }
for i:=0 to currentsymlist.Count-1 do
begin
if (tsym(currentsymlist[i]).typ=fieldvarsym) and
not(sp_static in tsym(currentsymlist[i]).symoptions) then
if is_normal_fieldvarsym(tsym(currentsymlist[i])) then
begin
if result then
begin
@ -1696,7 +1694,7 @@ implementation
sublist : tfplist;
i : longint;
begin
if sym.typ<>fieldvarsym then
if not is_normal_fieldvarsym(sym) then
exit;
if not is_record(fsym.vardef) and not is_object(fsym.vardef) and not is_cppclass(fsym.vardef) then
exit;
@ -1872,7 +1870,7 @@ implementation
for i:=0 to unionst.SymList.Count-1 do
begin
sym:=TSym(unionst.SymList[i]);
if sym.typ<>fieldvarsym then
if not is_normal_fieldvarsym(sym) then
internalerror(200601272);
if tfieldvarsym(sym).fieldoffset=0 then
include(tfieldvarsym(sym).varoptions,vo_is_first_field);
@ -2156,8 +2154,7 @@ implementation
i:=0;
while (i<equivst.symlist.count) do
begin
if (tsym(equivst.symlist[i]).typ<>fieldvarsym) or
(sp_static in tsym(equivst.symlist[i]).symoptions) then
if not is_normal_fieldvarsym(tsym(equivst.symlist[i])) then
begin
inc(i);
continue;
@ -2215,8 +2212,7 @@ implementation
begin
inc(i);
while (i<equivst.symlist.count) and
((tsym(equivst.symlist[i]).typ<>fieldvarsym) or
(sp_static in tsym(equivst.symlist[i]).symoptions) or
(not is_normal_fieldvarsym(tsym(equivst.symlist[i])) or
(tfieldvarsym(equivst.symlist[i]).fieldoffset>sym.fieldoffset)) do
inc(i);
continue;
@ -2243,8 +2239,7 @@ implementation
lastvaroffsetprocessed:=-1;
while (i<equivcount) do
begin
if (tsym(equivst.symlist[i]).typ<>fieldvarsym) or
(sp_static in tsym(equivst.symlist[i]).symoptions) then
if not is_normal_fieldvarsym(tsym(equivst.symlist[i])) then
begin
inc(i);
continue;
@ -2285,8 +2280,7 @@ implementation
i:=0;
while (i < equivcount) do
begin
if (tsym(equivst.symlist[i]).typ<>fieldvarsym) or
(sp_static in tsym(equivst.symlist[i]).symoptions) then
if not is_normal_fieldvarsym(tsym(equivst.symlist[i])) then
begin
inc(i);
continue;

10
compiler/symutil.pas
View File

@ -36,6 +36,8 @@ interface
procedure maybe_guarantee_record_typesym(var def: tdef; st: tsymtable);
function is_normal_fieldvarsym(sym: tsym): boolean; inline;
implementation
@ -143,5 +145,13 @@ implementation
end;
function is_normal_fieldvarsym(sym: tsym): boolean; inline;
begin
result:=
(sym.typ=fieldvarsym) and
not(sp_static in sym.symoptions);
end;
end.

5
compiler/x86/rax86int.pas
View File

@ -126,7 +126,7 @@ Unit Rax86int;
aasmtai,
{$endif i8086}
{ symtable }
symconst,symbase,symtype,symsym,symdef,
symconst,symbase,symtype,symsym,symutil,symdef,
{$ifdef i8086}
symcpu,
{$endif i8086}
@ -1620,8 +1620,7 @@ Unit Rax86int;
end;
if (actasmtoken=AS_DOT) or
(assigned(sym) and
(sym.typ = fieldvarsym) and
not(sp_static in sym.symoptions)) then
is_normal_fieldvarsym(sym)) then
begin
BuildRecordOffsetSize(tempstr,l,size,hs,needvmtofs,hastypecast);
if hs <> '' then

4
compiler/x86_64/cpupara.pas
View File

@ -56,7 +56,7 @@ unit cpupara;
cutils,verbose,
systems,
globals,defutil,
symtable,
symtable,symutil,
cpupi,
cgx86,cgobj,cgcpu;
@ -760,7 +760,7 @@ unit cpupara;
(* Merge the fields of the structure. *)
for i:=0 to tabstractrecorddef(def).symtable.symlist.count-1 do
begin
if tsym(tabstractrecorddef(def).symtable.symlist[i]).typ<>fieldvarsym then
if not is_normal_fieldvarsym(tsym(tabstractrecorddef(def).symtable.symlist[i])) then
continue;
vs:=tfieldvarsym(tabstractrecorddef(def).symtable.symlist[i]);
checkalignment:=true;