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

* changed resulttype and firstpass processing from recursion into loop, based

Browse Source 
on patch/idea by J. Gareth Moreton (as part of his patch in #35857)

git-svn-id: trunk@43004 -
This commit is contained in:
Jonas Maebe 2019-09-15 16:18:14 +00:00
parent f4921daee6
commit 9e7cf37cd6
1 changed files with 95 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
compiler/pass_1.pas
View File

@ -59,22 +59,12 @@ implementation
Global procedures
*****************************************************************************}
procedure typecheckpass_internal(var p : tnode; out node_changed: boolean);
procedure typecheckpass_internal_loop(var p : tnode; out node_changed: boolean);
var
oldcodegenerror : boolean;
oldlocalswitches : tlocalswitches;
oldverbosity : longint;
oldpos : tfileposinfo;
hp : tnode;
begin
node_changed:=false;
if (p.resultdef=nil) then
begin
oldcodegenerror:=codegenerror;
oldpos:=current_filepos;
oldlocalswitches:=current_settings.localswitches;
oldverbosity:=status.verbosity;
codegenerror:=false;
repeat
current_filepos:=p.fileinfo;
current_settings.localswitches:=p.localswitches;
status.verbosity:=p.verbosity;
@ -86,12 +76,9 @@ implementation
p.free;
{ switch to new node }
p:=hp;
{ run typecheckpass }
typecheckpass(p);
end;
current_settings.localswitches:=oldlocalswitches;
current_filepos:=oldpos;
status.verbosity:=oldverbosity;
until not assigned(hp) or
assigned(hp.resultdef);
if codegenerror then
begin
include(p.flags,nf_error);
@ -99,6 +86,26 @@ implementation
if p.resultdef=nil then
p.resultdef:=generrordef;
end;
end;
procedure typecheckpass_internal(var p : tnode; out node_changed: boolean);
var
oldcodegenerror : boolean;
oldlocalswitches : tlocalswitches;
oldverbosity : longint;
oldpos : tfileposinfo;
begin
node_changed:=false;
if (p.resultdef=nil) then
begin
oldcodegenerror:=codegenerror;
oldpos:=current_filepos;
oldlocalswitches:=current_settings.localswitches;
oldverbosity:=status.verbosity;
typecheckpass_internal_loop(p, node_changed);
current_settings.localswitches:=oldlocalswitches;
current_filepos:=oldpos;
status.verbosity:=oldverbosity;
codegenerror:=codegenerror or oldcodegenerror;
end
else
@ -141,6 +148,7 @@ implementation
oldpos : tfileposinfo;
oldverbosity: longint;
hp : tnode;
nodechanged : boolean;
begin
if (nf_pass1_done in p.flags) then
exit;
@ -151,58 +159,34 @@ implementation
oldlocalswitches:=current_settings.localswitches;
oldverbosity:=status.verbosity;
codegenerror:=false;
current_filepos:=p.fileinfo;
current_settings.localswitches:=p.localswitches;
status.verbosity:=p.verbosity;
repeat
{ checks make always a call }
if ([cs_check_range,cs_check_overflow,cs_check_stack] * current_settings.localswitches <> []) then
include(current_procinfo.flags,pi_do_call);
{ determine the resultdef if not done }
if (p.resultdef=nil) then
begin
hp:=p.pass_typecheck;
{ should the node be replaced? }
if assigned(hp) then
begin
p.free;
{ switch to new node }
p:=hp;
{ run typecheckpass }
typecheckpass(p);
end;
if codegenerror then
begin
include(p.flags,nf_error);
{ default to errortype if no type is set yet }
if p.resultdef=nil then
p.resultdef:=generrordef;
end;
codegenerror:=codegenerror or oldcodegenerror;
typecheckpass_internal_loop(p,nodechanged);
end;
hp:=nil;
if not(nf_error in p.flags) then
begin
current_filepos:=p.fileinfo;
current_settings.localswitches:=p.localswitches;
status.verbosity:=p.verbosity;
{ first pass }
hp:=p.pass_1;
{ inlining happens in pass_1 and can cause new }
{ simplify opportunities }
if not assigned(hp) then
hp:=p.simplify(true);
{ should the node be replaced? }
if assigned(hp) then
begin
p.free;
{ switch to new node }
p:=hp;
{ run firstpass }
firstpass(p);
end
else
begin
{ inlining happens in pass_1 and can cause new }
{ simplify opportunities }
hp:=p.simplify(true);
if assigned(hp) then
begin
p.free;
p := hp;
firstpass(p);
end;
end;
if codegenerror then
include(p.flags,nf_error)
@ -214,6 +198,8 @@ implementation
{$endif EXTDEBUG}
end;
end;
until not assigned(hp) or
(nf_pass1_done in hp.flags);
include(p.flags,nf_pass1_done);
codegenerror:=codegenerror or oldcodegenerror;
current_settings.localswitches:=oldlocalswitches;