Merge r43631 to fixes branch

------------------------------------------------------------------------
--- Merging r43631 into '.':
U    compiler/nadd.pas
--- Recording mergeinfo for merge of r43631 into '.':
 U   .

git-svn-id: branches/fixes_3_2@43633 -
This commit is contained in:
pierre 2019-12-02 23:20:40 +00:00
parent 12e34bcef5
commit 3da4ccfb3e

View File

@ -1197,7 +1197,6 @@ implementation
b : boolean;
lt,rt : tnodetype;
ot : tnodetype;
i64 : int64;
{$ifdef state_tracking}
factval : Tnode;
change : boolean;
@ -2457,7 +2456,6 @@ implementation
hp:=nil;
if s64currencytype.typ=floatdef then
begin
move(trealconstnode(right).value_currency,i64,sizeof(i64));
{ if left is a currency integer constant, we can get rid of the factor 10000 }
{ int64(...) causes a cast on currency, so it is the currency value multiplied by 10000 }
if (left.nodetype=realconstn) and (is_currency(left.resultdef)) and (not(nf_is_currency in left.flags)) and ((trunc(trealconstnode(left).value_real) mod 10000)=0) then