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

* fix for web bug #3210

Browse Source
This commit is contained in:
Jonas Maebe 2004-07-14 14:38:35 +00:00
parent c7c5594bcd
commit 1f338ade0d
1 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
compiler/ninl.pas
View File

@ -2035,6 +2035,9 @@ implementation
var var
hp,hpp : tnode; hp,hpp : tnode;
shiftconst: longint; shiftconst: longint;
tempnode: ttempcreatenode;
newstatement: tstatementnode;
newblock: tblocknode;
begin begin
result:=nil; result:=nil;
@ -2160,6 +2163,7 @@ implementation
) then ) then
{ convert to simple add (JM) } { convert to simple add (JM) }
begin begin
newblock := internalstatements(newstatement);
{ extra parameter? } { extra parameter? }
if assigned(tcallparanode(left).right) then if assigned(tcallparanode(left).right) then
begin begin
@ -2172,18 +2176,37 @@ implementation
else else
{ no, create constant 1 } { no, create constant 1 }
hpp := cordconstnode.create(1,tcallparanode(left).left.resulttype,false); hpp := cordconstnode.create(1,tcallparanode(left).left.resulttype,false);
{ make sure we don't call functions part of the left node twice (and generally }
{ optimize the code generation) }
if (tcallparanode(left).left.nodetype <> loadn) or
(vo_is_thread_var in tvarsym(tloadnode(tcallparanode(left).left).symtableentry).varoptions) then
begin
tempnode := ctempcreatenode.create_reg(voidpointertype,voidpointertype.def.size,tt_persistent);
addstatement(newstatement,tempnode);
addstatement(newstatement,cassignmentnode.create(ctemprefnode.create(tempnode),
caddrnode.create(tcallparanode(left).left.getcopy)));
hp := cderefnode.create(ctemprefnode.create(tempnode));
inserttypeconv_explicit(hp,tcallparanode(left).left.resulttype);
end
else
begin
hp := tcallparanode(left).left.getcopy;
tempnode := nil;
end;
{ addition/substraction depending on inc/dec } { addition/substraction depending on inc/dec }
if inlinenumber = in_inc_x then if inlinenumber = in_inc_x then
hp := caddnode.create(addn,tcallparanode(left).left.getcopy,hpp) hpp := caddnode.create(addn,hp,hpp)
else else
hp := caddnode.create(subn,tcallparanode(left).left.getcopy,hpp); hpp := caddnode.create(subn,hp,hpp);
{ assign result of addition } { assign result of addition }
hpp := cassignmentnode.create(tcallparanode(left).left,hp); addstatement(newstatement,cassignmentnode.create(hp.getcopy,hpp));
tcallparanode(left).left := nil; { deallocate the temp }
if assigned(tempnode) then
addstatement(newstatement,ctempdeletenode.create(tempnode));
{ firstpass it } { firstpass it }
firstpass(hpp); firstpass(newblock);
{ return new node } { return new node }
result := hpp; result := newblock;
end end
else if (left.resulttype.def.deftype in [enumdef,pointerdef]) or else if (left.resulttype.def.deftype in [enumdef,pointerdef]) or
is_ordinal(left.resulttype.def) then is_ordinal(left.resulttype.def) then
@ -2400,7 +2423,10 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.138 2004-06-20 08:55:29 florian Revision 1.139 2004-07-14 14:38:35 jonas
* fix for web bug 3210
Revision 1.138 2004/06/20 08:55:29 florian
* logs truncated * logs truncated
Revision 1.137 2004/06/18 15:16:46 peter Revision 1.137 2004/06/18 15:16:46 peter