paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-11 08:10:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

* fixed handling of static varsyms used for typed constants

Browse Source 
* also print staticvarsyms inside localsymtables of procdefs
    (used for typed constants and variable initialisers)

git-svn-id: branches/jvmbackend@18473 -
This commit is contained in:
Jonas Maebe 2011-08-20 08:02:48 +00:00
parent fa841f8011
commit 1c54d3a758
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/agjasmin.pas
View File

@ -812,8 +812,8 @@ implementation
else
internalerror(2011011204);
end;
if (vissym.owner.symtabletype in [staticsymtable,globalsymtable]) or
(sp_static in vissym.symoptions) then
if (sym.typ=staticvarsym) or
(sp_static in sym.symoptions) then
result:=result+'static ';
result:=result+jvmmangledbasename(sym);
end;
@ -897,7 +897,7 @@ implementation
procedure TJasminAssembler.WriteSymtableVarSyms(st: TSymtable);
var
sym : tsym;
i : longint;
i,j : longint;
begin
if not assigned(st) then
exit;
@ -909,11 +909,19 @@ implementation
fieldvarsym:
begin
WriteFieldSym(tabstractvarsym(sym));
if (sym.typ=staticvarsym) and
assigned(tstaticvarsym(sym).defaultconstsym) then
WriteFieldSym(tabstractvarsym(tstaticvarsym(sym).defaultconstsym));
end;
constsym:
begin
WriteConstSym(tconstsym(sym));
end;
procsym:
begin
for j:=0 to tprocsym(sym).procdeflist.count-1 do
WriteSymtableVarSyms(tprocdef(tprocsym(sym).procdeflist[j]).localst);
end;
end;
end;
end;