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

Get rid of some global variables.

Browse Source
This commit is contained in:
Rika Ichinose 2022-01-13 10:26:02 +03:00 committed by florian
parent 6dd0a1c078
commit 92771760b7
2 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/optdfa.pas
View File

@ -675,12 +675,6 @@ unit optdfa;
inherited destroy;
end;
var
{ we have to pass the address of SearchNode in a call inside of SearchNode:
@SearchNode does not work because the compiler thinks we take the address of the result
so store the address from outside }
SearchNodeProcPointer : function(var n: tnode; arg: pointer): foreachnoderesult;
type
{ helper structure to be able to pass more than one variable to the iterator function }
TSearchNodeInfo = record
@ -775,8 +769,8 @@ unit optdfa;
begin
{ take care of short boolean evaluation: if the expression to be search is found in left,
we do not need to search right }
if foreachnodestatic(pm_postprocess,taddnode(n).left,SearchNodeProcPointer,arg) or
foreachnodestatic(pm_postprocess,taddnode(n).right,SearchNodeProcPointer,arg) then
if foreachnodestatic(pm_postprocess,taddnode(n).left,@optdfa.SearchNode,arg) or
foreachnodestatic(pm_postprocess,taddnode(n).right,@optdfa.SearchNode,arg) then
result:=fen_norecurse_true
else
result:=fen_norecurse_false;
@ -809,8 +803,8 @@ unit optdfa;
{ don't warn about the method pointer }
AddFilepos(hpt.fileinfo);
if not(foreachnodestatic(pm_postprocess,tcallnode(n).left,SearchNodeProcPointer,arg)) then
foreachnodestatic(pm_postprocess,tcallnode(n).right,SearchNodeProcPointer,arg);
if not(foreachnodestatic(pm_postprocess,tcallnode(n).left,@optdfa.SearchNode,arg)) then
foreachnodestatic(pm_postprocess,tcallnode(n).right,@optdfa.SearchNode,arg);
result:=fen_norecurse_true
end;
end;
@ -1005,6 +999,4 @@ unit optdfa;
end;
begin
SearchNodeProcPointer:=@SearchNode;
end.

36
compiler/optutils.pas
View File

@ -402,37 +402,34 @@ unit optutils;
BreakContinueStack.Done;
end;
var
defsum : TDFASet;
function adddef(var n: tnode; arg: pointer): foreachnoderesult;
var
defsum : PDFASet absolute arg;
begin
if assigned(n.optinfo) then
begin
DFASetIncludeSet(defsum,n.optinfo^.def);
DFASetIncludeSet(defsum^,n.optinfo^.def);
{ for nodes itself do not necessarily expose the definition of the counter as
the counter might be undefined after the for loop, so include here the counter
explicitly }
if (n.nodetype=forn) and assigned(tfornode(n).left.optinfo) then
DFASetInclude(defsum,tfornode(n).left.optinfo^.index);
DFASetInclude(defsum^,tfornode(n).left.optinfo^.index);
end;
Result:=fen_false;
end;
procedure CalcDefSum(p : tnode);
var
defsum : PDFASet;
begin
p.allocoptinfo;
if not assigned(p.optinfo^.defsum) then
begin
defsum:=nil;
foreachnodestatic(pm_postprocess,p,@adddef,nil);
p.optinfo^.defsum:=defsum;
end;
defsum:=@p.optinfo^.defsum;
if not assigned(defsum^) then
foreachnodestatic(pm_postprocess,p,@adddef,defsum);
end;
var
usesum : TDFASet;
function SetExecutionWeight(var n: tnode; arg: pointer): foreachnoderesult;
var
@ -481,22 +478,23 @@ unit optutils;
function adduse(var n: tnode; arg: pointer): foreachnoderesult;
var
usesum : PDFASet absolute arg;
begin
if assigned(n.optinfo) then
DFASetIncludeSet(usesum,n.optinfo^.use);
DFASetIncludeSet(usesum^,n.optinfo^.use);
Result:=fen_false;
end;
procedure CalcUseSum(p : tnode);
var
usesum : PDFASet;
begin
p.allocoptinfo;
if not assigned(p.optinfo^.usesum) then
begin
usesum:=nil;
foreachnodestatic(pm_postprocess,p,@adduse,nil);
p.optinfo^.usesum:=usesum;
end;
usesum:=@p.optinfo^.usesum;
if not assigned(usesum^) then
foreachnodestatic(pm_postprocess,p,@adduse,usesum);
end;