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

* fixed crashes on platforms using parentfpstructs with generic routines

Browse Source 
that contain nested functions (when specialised, procedures don't have
    the main function of the unit/program as parent procinfo)

git-svn-id: trunk@42063 -
This commit is contained in:
Jonas Maebe 2019-05-14 19:19:14 +00:00
parent 167ca93d25
commit cf9596421b
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/ncgnstld.pas
View File

@ -91,7 +91,9 @@ implementation
nestedvars: tsym; nestedvars: tsym;
begin begin
result:=inherited pass_typecheck; result:=inherited pass_typecheck;
if assigned(result) then if assigned(result) or
(assigned(current_procinfo) and
(df_generic in current_procinfo.procdef.defoptions)) then
exit; exit;
case symtableentry.typ of case symtableentry.typ of
paravarsym, paravarsym,

25
compiler/ncgnstmm.pas
View File

@ -60,10 +60,15 @@ implementation
nextpi : tprocinfo; nextpi : tprocinfo;
begin begin
result:=inherited; result:=inherited;
if assigned(result) then if assigned(result) or
(assigned(current_procinfo) and
(df_generic in current_procinfo.procdef.defoptions)) then
exit; exit;
currpi:=current_procinfo.parent; currpi:=current_procinfo.parent;
while (currpi.procdef.parast.symtablelevel>=parentpd.parast.symtablelevel) do { current_procinfo.parent is not assigned for specialised generic routines in the
top-level scope }
while assigned(currpi) and
(currpi.procdef.parast.symtablelevel>=parentpd.parast.symtablelevel) do
begin begin
if not assigned(currpi.procdef.parentfpstruct) then if not assigned(currpi.procdef.parentfpstruct) then
build_parentfpstruct(currpi.procdef); build_parentfpstruct(currpi.procdef);
@ -72,13 +77,17 @@ implementation
{ mark all parent parentfp parameters for inclusion in the struct that { mark all parent parentfp parameters for inclusion in the struct that
holds all locals accessed from nested routines } holds all locals accessed from nested routines }
currpi:=current_procinfo.parent; currpi:=current_procinfo.parent;
nextpi:=currpi.parent; if assigned(currpi) then
while (currpi.procdef.parast.symtablelevel>parentpd.parast.symtablelevel) do
begin begin
hsym:=tparavarsym(currpi.procdef.parast.Find('parentfp')); nextpi:=currpi.parent;
maybe_add_sym_to_parentfpstruct(currpi.procdef,hsym,nextpi.procdef.parentfpstructptrtype,false); while assigned(currpi) and
currpi:=nextpi; (currpi.procdef.parast.symtablelevel>parentpd.parast.symtablelevel) do
nextpi:=nextpi.parent; begin
hsym:=tparavarsym(currpi.procdef.parast.Find('parentfp'));
maybe_add_sym_to_parentfpstruct(currpi.procdef,hsym,nextpi.procdef.parentfpstructptrtype,false);
currpi:=nextpi;
nextpi:=nextpi.parent;
end;
end; end;
end; end;

8
compiler/symdef.pas
View File

@ -3402,7 +3402,13 @@ implementation
begin begin
inherited create(pointerdef,def); inherited create(pointerdef,def);
has_pointer_math:=cs_pointermath in current_settings.localswitches; has_pointer_math:=cs_pointermath in current_settings.localswitches;
if df_specialization in tstoreddef(def).defoptions then if (df_specialization in tstoreddef(def).defoptions)
{$ifndef genericdef_for_nested}
{ currently, nested procdefs of generic routines get df_specialisation,
but no genericdef }
and assigned(tstoreddef(def).genericdef)
{$endif}
then
genericdef:=cpointerdef.getreusable(tstoreddef(def).genericdef); genericdef:=cpointerdef.getreusable(tstoreddef(def).genericdef);
end; end;