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

* also process procsyms when adding a symtable as they may be generic dummy symbols as well

Browse Source 
git-svn-id: trunk@39231 -
This commit is contained in:
svenbarth 2018-06-15 13:49:16 +00:00
parent 5510b13975
commit 8423fd7632
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/symdef.pas
View File

@ -1475,10 +1475,13 @@ implementation
last one in the list } last one in the list }
for i:=0 to st.symlist.count-1 do for i:=0 to st.symlist.count-1 do
begin begin
if not (st.symlist[i] is ttypesym) then
continue;
def:=ttypesym(st.SymList[i]).typedef;
sym:=tsym(st.symlist[i]); sym:=tsym(st.symlist[i]);
if not (sym.typ in [typesym,procsym]) then
continue;
if sym.typ=typesym then
def:=ttypesym(st.SymList[i]).typedef
else
def:=nil;
if is_objectpascal_helper(def) then if is_objectpascal_helper(def) then
begin begin
s:=generate_objectpascal_helper_key(tobjectdef(def).extendeddef); s:=generate_objectpascal_helper_key(tobjectdef(def).extendeddef);
@ -1496,7 +1499,8 @@ implementation
if addgenerics then if addgenerics then
add_generic_dummysym(sym); add_generic_dummysym(sym);
{ add nested helpers as well } { add nested helpers as well }
if (def.typ in [recorddef,objectdef]) and if assigned(def) and
(def.typ in [recorddef,objectdef]) and
(sto_has_helper in tabstractrecorddef(def).symtable.tableoptions) then (sto_has_helper in tabstractrecorddef(def).symtable.tableoptions) then
add_helpers_and_generics(tabstractrecorddef(def).symtable,false); add_helpers_and_generics(tabstractrecorddef(def).symtable,false);
end; end;