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

* fix tcallnode.getcopy. the parameters need to be copied after

Browse Source 
methodpointerinit is copied
This commit is contained in:
peter 2004-05-25 18:51:49 +00:00
parent 5abb93e77d
commit 330a86b7d6
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
compiler/ncal.pas
View File

@ -794,6 +794,10 @@ type
procdefinitionderef.build(procdefinition); procdefinitionderef.build(procdefinition);
if assigned(methodpointer) then if assigned(methodpointer) then
methodpointer.buildderefimpl; methodpointer.buildderefimpl;
if assigned(methodpointerinit) then
methodpointerinit.buildderefimpl;
if assigned(methodpointerdone) then
methodpointerdone.buildderefimpl;
if assigned(_funcretnode) then if assigned(_funcretnode) then
_funcretnode.buildderefimpl; _funcretnode.buildderefimpl;
if assigned(inlinecode) then if assigned(inlinecode) then
@ -812,6 +816,10 @@ type
procdefinition:=tprocdef(procdefinitionderef.resolve); procdefinition:=tprocdef(procdefinitionderef.resolve);
if assigned(methodpointer) then if assigned(methodpointer) then
methodpointer.derefimpl; methodpointer.derefimpl;
if assigned(methodpointerinit) then
methodpointerinit.derefimpl;
if assigned(methodpointerdone) then
methodpointerdone.derefimpl;
if assigned(_funcretnode) then if assigned(_funcretnode) then
_funcretnode.derefimpl; _funcretnode.derefimpl;
if assigned(inlinecode) then if assigned(inlinecode) then
@ -839,21 +847,34 @@ type
var var
n : tcallnode; n : tcallnode;
hp : tparaitem; hp : tparaitem;
oldleft : tnode;
begin begin
{ Need to use a hack here to prevent the parameters from being copied.
The parameters must be copied between methodpointerinit/methodpointerdone because
the can reference methodpointer }
oldleft:=left;
left:=nil;
n:=tcallnode(inherited getcopy); n:=tcallnode(inherited getcopy);
left:=oldleft;
n.symtableprocentry:=symtableprocentry; n.symtableprocentry:=symtableprocentry;
n.symtableproc:=symtableproc; n.symtableproc:=symtableproc;
n.procdefinition:=procdefinition; n.procdefinition:=procdefinition;
n.restype := restype; n.restype := restype;
n.callnodeflags := callnodeflags; n.callnodeflags := callnodeflags;
if assigned(methodpointer) then
n.methodpointer:=methodpointer.getcopy
else
n.methodpointer:=nil;
if assigned(methodpointerinit) then if assigned(methodpointerinit) then
n.methodpointerinit:=methodpointerinit.getcopy n.methodpointerinit:=methodpointerinit.getcopy
else else
n.methodpointerinit:=nil; n.methodpointerinit:=nil;
{ methodpointerinit is copied, now references to the temp will also be copied
correctly. We can now copy the parameters and methodpointer }
if assigned(left) then
n.left:=left.getcopy
else
n.left:=nil;
if assigned(methodpointer) then
n.methodpointer:=methodpointer.getcopy
else
n.methodpointer:=nil;
if assigned(methodpointerdone) then if assigned(methodpointerdone) then
n.methodpointerdone:=methodpointerdone.getcopy n.methodpointerdone:=methodpointerdone.getcopy
else else
@ -2119,7 +2140,11 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.236 2004-05-24 17:31:51 peter Revision 1.237 2004-05-25 18:51:49 peter
* fix tcallnode.getcopy. the parameters need to be copied after
methodpointerinit is copied
Revision 1.236 2004/05/24 17:31:51 peter
* fix passing of array to open array of array (bug 3113) * fix passing of array to open array of array (bug 3113)
Revision 1.235 2004/05/23 18:28:41 peter Revision 1.235 2004/05/23 18:28:41 peter