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

* fixed calling of inherited methods from destructors

Browse Source
This commit is contained in:
peter 2000-05-15 19:30:27 +00:00
parent 2ea50df7a6
commit ae9b86f982
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/cg386cal.pas
View File

@ -543,8 +543,9 @@ implementation
{ a class destructor needs a flag } { a class destructor needs a flag }
if pobjectdef(p^.methodpointer^.resulttype)^.is_class and if pobjectdef(p^.methodpointer^.resulttype)^.is_class and
assigned(aktprocsym) and {assigned(aktprocsym) and
(aktprocsym^.definition^.proctypeoption=potype_destructor) then (aktprocsym^.definition^.proctypeoption=potype_destructor)}
(p^.procdefinition^.proctypeoption=potype_destructor) then
begin begin
push_int(0); push_int(0);
emit_reg(A_PUSH,S_L,R_ESI); emit_reg(A_PUSH,S_L,R_ESI);
@ -552,8 +553,9 @@ implementation
if not(is_con_or_destructor and if not(is_con_or_destructor and
pobjectdef(p^.methodpointer^.resulttype)^.is_class and pobjectdef(p^.methodpointer^.resulttype)^.is_class and
assigned(aktprocsym) and {assigned(aktprocsym) and
(aktprocsym^.definition^.proctypeoption in [potype_constructor,potype_destructor]) (aktprocsym^.definition^.proctypeoption in [potype_constructor,potype_destructor])}
(p^.procdefinition^.proctypeoption in [potype_constructor,potype_destructor])
) then ) then
emit_reg(A_PUSH,S_L,R_ESI); emit_reg(A_PUSH,S_L,R_ESI);
{ if an inherited con- or destructor should be } { if an inherited con- or destructor should be }
@ -1427,7 +1429,10 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.132 2000-05-09 14:15:03 pierre Revision 1.133 2000-05-15 19:30:27 peter
* fixed calling of inherited methods from destructors
Revision 1.132 2000/05/09 14:15:03 pierre
* also allow interrupt procvars * also allow interrupt procvars
Revision 1.131 2000/05/09 10:54:03 pierre Revision 1.131 2000/05/09 10:54:03 pierre