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

* do not fold constants if the resulttypes do not match, improved fix for #tw26587

Browse Source 
git-svn-id: trunk@44165 -
This commit is contained in:
florian 2020-02-13 20:34:27 +00:00
parent 3a5eb0ec59
commit 251b18b966
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/nadd.pas
View File

@ -481,10 +481,6 @@ implementation
result:=getcopy;
result.resultdef:=nil;
do_typecheckpass(result);
{ If the size of the new result after typecheckpass is smaller than
the size of the original result, use the original (bigger) size. }
if result.resultdef.size < resultdef.size then
result.resultdef:=resultdef;
end;
@ -747,7 +743,10 @@ implementation
/ \
const2 val
}
else if left.nodetype=nodetype then
else if (left.nodetype=nodetype) and
{ there might be a mul operation e.g. longint*longint => int64 in this case
we cannot do this optimziation, see e.g. tests/webtbs/tw36587.pp on arm }
(compare_defs(resultdef,left.resultdef,nothingn)=te_exact) then
begin
if is_constintnode(taddnode(left).left) then
begin
@ -835,7 +834,10 @@ implementation
/ \
const2 val
}
else if right.nodetype=nodetype then
else if (right.nodetype=nodetype) and
{ there might be a mul operation e.g. longint*longint => int64 in this case
we cannot do this optimziation, see e.g. tests/webtbs/tw36587.pp on arm }
(compare_defs(resultdef,right.resultdef,nothingn)=te_exact) then
begin
if is_constintnode(taddnode(right).left) then
begin