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

* Bug fix that prevents downsizing of

Browse Source 
"(x div y) and z" when "x div y" is 64-bit and
    z is 32-bit or less.  Fixes i39646
This commit is contained in:
J. Gareth "Curious Kit" Moreton 2022-05-02 00:50:10 +01:00 committed by FPK
parent 4a8ddc50b3
commit 54aae023ea
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compiler/ncnv.pas
View File

@ -2969,8 +2969,15 @@ implementation
(not(n.nodetype in [modn,divn]) or (not(gotminus1))) (not(n.nodetype in [modn,divn]) or (not(gotminus1)))
) or ) or
((((n.nodetype=andn) and wasoriginallysmallerint(tbinarynode(n).left)) or (
((n.nodetype=andn) and wasoriginallysmallerint(tbinarynode(n).right)))); (n.nodetype=andn) and
(
{ Right node is more likely to be a constant, so check
this one first }
wasoriginallysmallerint(tbinarynode(n).right) or
wasoriginallysmallerint(tbinarynode(n).left)
)
);
end; end;
else else
result:=false; result:=false;
@ -3001,9 +3008,13 @@ implementation
dword1:=dword1+((dword2+dword3) shr 2); dword1:=dword1+((dword2+dword3) shr 2);
while we can remove an extension on the addition, we cannot remove it from the shr while we can remove an extension on the outermost addition, we cannot
remove it from the shr
} }
if (n.nodetype=shrn) and (level<>0) then { Don't downsize into a division operation either, as the numerator can
be much larger than the result and non-linear properties prevent
accurate truncation; fixes #39646 [Kit] }
if (n.nodetype in [shrn,divn,modn]) and (level<>0) then
begin begin
inserttypeconv_internal(n,todef); inserttypeconv_internal(n,todef);
exit; exit;