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

* when transforming the structure of a node tree involving full boolean

Browse Source 
evaluation flags, also move the full boolean evaluation flags

git-svn-id: trunk@40367 -
This commit is contained in:
Jonas Maebe 2018-11-25 20:56:58 +00:00
parent ee65da4429
commit a7cb99f012
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/optcse.pas
View File

@ -329,7 +329,7 @@ unit optcse;
(is_set(n.resultdef))
) then
while (n.nodetype=tbinarynode(n).left.nodetype) and
{ if node (1) is fully boolean evaluated and node (2) not, we cannot do the swap as is might result in B being evaluated always,
{ if node (1) is fully boolean evaluated and node (2) not, we cannot do the swap as this might result in B being evaluated always,
the other way round is no problem, C is still evaluated only if needed }
(not(is_boolean(n.resultdef)) or not(n.nodetype in [andn,orn]) or doshortbooleval(n) or not(doshortbooleval(tbinarynode(n).left))) and
{ the resulttypes of the operands we'll swap must be equal,
@ -347,6 +347,17 @@ unit optcse;
foreachnodestatic(pm_postprocess,tbinarynode(tbinarynode(n).left).right,@searchsubdomain,@csedomain);
if csedomain then
begin
{ move the full boolean evaluation of (2) to (1), if it was there (so it again applies to A and
what follows) }
if not(doshortbooleval(tbinarynode(n).left)) and
doshortbooleval(n) then
begin
n.localswitches:=n.localswitches+(tbinarynode(n).left.localswitches*[cs_full_boolean_eval]);
exclude(tbinarynode(n).left.localswitches,cs_full_boolean_eval);
tbinarynode(n).left.flags:=tbinarynode(n).left.flags+(n.flags*[nf_short_bool]);
exclude(n.Flags,nf_short_bool);
end;
hp2:=tbinarynode(tbinarynode(n).left).left;
tbinarynode(tbinarynode(n).left).left:=tbinarynode(tbinarynode(n).left).right;
tbinarynode(tbinarynode(n).left).right:=tbinarynode(n).right;