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

* virtual contructors weren't handled properly if they were called via a class

Browse Source 
variable
This commit is contained in:
florian 2000-07-05 20:39:55 +00:00
parent 8391fba63e
commit 3d7d2eb25d
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compiler/cg386cal.pas
View File

@ -873,9 +873,10 @@ implementation
or or
(po_staticmethod in p^.procdefinition^.procoptions) or (po_staticmethod in p^.procdefinition^.procoptions) or
((p^.procdefinition^.proctypeoption=potype_constructor) and ((p^.procdefinition^.proctypeoption=potype_constructor) and
{ if we call a constructor from anther constructor } { esi contains the vmt if we call a constructor via a class ref }
{ esi contains self } assigned(p^.methodpointer) and
(assigned(p^.methodpointer))) or (p^.methodpointer^.resulttype^.deftype=classrefdef)
) or
{ ESI is loaded earlier } { ESI is loaded earlier }
(po_classmethod in p^.procdefinition^.procoptions) then (po_classmethod in p^.procdefinition^.procoptions) then
begin begin
@ -1433,7 +1434,7 @@ implementation
secondpass(p^.inlinetree); secondpass(p^.inlinetree);
genexitcode(inlineexitcode,0,false,true); genexitcode(inlineexitcode,0,false,true);
exprasmlist^.concatlist(inlineexitcode); exprasmlist^.concatlist(inlineexitcode);
dispose(inlineentrycode,done); dispose(inlineentrycode,done);
dispose(inlineexitcode,done); dispose(inlineexitcode,done);
{$ifdef extdebug} {$ifdef extdebug}
@ -1477,7 +1478,11 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.137 2000-06-29 13:50:30 jonas Revision 1.138 2000-07-05 20:39:55 florian
* virtual contructors weren't handled properly if they were called via a class
variable
Revision 1.137 2000/06/29 13:50:30 jonas
* fixed inline bugs (calling an inlined procedure more than once didn't * fixed inline bugs (calling an inlined procedure more than once didn't
work) work)
@ -1601,4 +1606,4 @@ end.
needs some corections regarding register saving needs some corections regarding register saving
* gettempansistring is again a procedure * gettempansistring is again a procedure
} }