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

* class destructors fixed, class instances weren't disposed correctly

Browse Source
This commit is contained in:
florian 1999-02-02 11:04:36 +00:00
parent 769b8d8711
commit 491c20797c
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
compiler/cg386cal.pas
View File

@ -562,6 +562,17 @@ implementation
else else
{ this is a member call, so ESI isn't modfied } { this is a member call, so ESI isn't modfied }
loadesi:=false; loadesi:=false;
{ a class destructor needs a flag }
if pobjectdef(p^.methodpointer^.resulttype)^.isclass and
assigned(aktprocsym) and
((aktprocsym^.definition^.options and
(podestructor))<>0) then
begin
push_int(0);
exprasmlist^.concat(new(pai386,op_reg(A_PUSH,S_L,R_ESI)));
end;
if not(is_con_or_destructor and if not(is_con_or_destructor and
pobjectdef(p^.methodpointer^.resulttype)^.isclass and pobjectdef(p^.methodpointer^.resulttype)^.isclass and
assigned(aktprocsym) and assigned(aktprocsym) and
@ -581,8 +592,13 @@ implementation
CGMessage(cg_w_member_cd_call_from_method); CGMessage(cg_w_member_cd_call_from_method);
end; end;
if is_con_or_destructor then { class destructors get there flag below }
push_int(0) if is_con_or_destructor and
not(pobjectdef(p^.methodpointer^.resulttype)^.isclass and
assigned(aktprocsym) and
((aktprocsym^.definition^.options and
(podestructor))<>0)) then
push_int(0);
end; end;
hnewn: hnewn:
begin begin
@ -654,8 +670,14 @@ implementation
exprasmlist^.concat(new(pai386,op_ref_reg(A_MOV,S_L,r,R_ESI))); exprasmlist^.concat(new(pai386,op_ref_reg(A_MOV,S_L,r,R_ESI)));
end; end;
{ direct call to destructor: don't remove data! }
if ((p^.procdefinition^.options and podestructor)<>0) and
(p^.methodpointer^.resulttype^.deftype=objectdef) and
(pobjectdef(p^.methodpointer^.resulttype)^.isclass) then
exprasmlist^.concat(new(pai386,op_const(A_PUSH,S_L,1)));
{ direct call to class constructor, don't allocate memory } { direct call to class constructor, don't allocate memory }
if is_con_or_destructor and if ((p^.procdefinition^.options and poconstructor)<>0) and
(p^.methodpointer^.resulttype^.deftype=objectdef) and (p^.methodpointer^.resulttype^.deftype=objectdef) and
(pobjectdef(p^.methodpointer^.resulttype)^.isclass) then (pobjectdef(p^.methodpointer^.resulttype)^.isclass) then
exprasmlist^.concat(new(pai386,op_const(A_PUSH,S_L,0))) exprasmlist^.concat(new(pai386,op_const(A_PUSH,S_L,0)))
@ -1236,7 +1258,10 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.60 1999-01-28 23:56:44 florian Revision 1.61 1999-02-02 11:04:36 florian
* class destructors fixed, class instances weren't disposed correctly
Revision 1.60 1999/01/28 23:56:44 florian
* the reference in the result location of a function call wasn't resetted => * the reference in the result location of a function call wasn't resetted =>
problem with unallowed far pointer, is solved now problem with unallowed far pointer, is solved now

3
compiler/readme
View File

@ -18,3 +18,6 @@ Changes in the syntax or semantic of FPC:
on previously accepted code (PM) on previously accepted code (PM)
01/02/99: c styled comments are supported (/* ... */), mainly 01/02/99: c styled comments are supported (/* ... */), mainly
for the Sibyl sources of Medigo (FK) for the Sibyl sources of Medigo (FK)
02/02/99: class destructors take now two parameters: flag
if the helper routine should free the instance and
self pointer (FK)