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

* extended r45555 to take care of chars as well

Browse Source 
git-svn-id: trunk@45565 -
This commit is contained in:
florian 2020-06-02 20:58:44 +00:00
parent 788797d078
commit 6d3b74f96e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/nadd.pas
View File

@ -1267,9 +1267,11 @@ implementation
(not might_have_sideeffects(left)) and
(not might_have_sideeffects(right)) and
(is_constintnode(taddnode(left).left) or is_constintnode(taddnode(left).right) or
is_constpointernode(taddnode(left).left) or is_constpointernode(taddnode(left).right)) and
is_constpointernode(taddnode(left).left) or is_constpointernode(taddnode(left).right) or
is_constcharnode(taddnode(left).left) or is_constcharnode(taddnode(left).right)) and
(is_constintnode(taddnode(right).left) or is_constintnode(taddnode(right).right) or
is_constpointernode(taddnode(right).left) or is_constpointernode(taddnode(right).right)) then
is_constpointernode(taddnode(right).left) or is_constpointernode(taddnode(right).right) or
is_constcharnode(taddnode(right).left) or is_constcharnode(taddnode(right).right)) then
begin
if is_constnode(taddnode(left).left) then
begin
@ -1296,6 +1298,8 @@ implementation
if not(is_integer(v1p^.resultdef)) or not(is_integer(v2p^.resultdef)) then
begin
case v1p^.resultdef.size of
1:
inttype:=u8inttype;
2:
inttype:=u16inttype;
4: