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

* fixed abstract method accounting for external Objective-C/Java classes:

Browse Source 
in that case if an "override" directive is missing but we interpret
    the declaration as an "override" anyway, make sure to replace the vmtpd
    with the overriding definition or child classes will keep seeing
    the abstract method in the base class and keep decreasing their abstract
    method count below zero
  * only decrease the abstract method count in case we're not processing
    category methods

git-svn-id: branches/jvmbackend@18923 -
This commit is contained in:
Jonas Maebe 2011-08-31 19:20:59 +00:00
parent 1a7c024ad3
commit c163a327d7
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
compiler/nobj.pas
View File

@ -356,16 +356,23 @@ implementation
{ no new entry, but copy the message name if any from { no new entry, but copy the message name if any from
the procdef in the parent class } the procdef in the parent class }
check_msg_str(vmtpd,pd); check_msg_str(vmtpd,pd);
{ in case of Java, copy the real name from the parent, if updatevalues then
since overriding "Destroy" with "destroy" is not begin
going to work very well } { in case of Java, copy the real name from the parent,
if is_java_class_or_interface(_class) and since overriding "Destroy" with "destroy" is not
(pd.procsym.realname<>vmtpd.procsym.realname) then going to work very well }
pd.procsym.realname:=vmtpd.procsym.realname; if is_java_class_or_interface(_class) and
{ in case we are overriding an abstract method, (pd.procsym.realname<>vmtpd.procsym.realname) then
decrease the number of abstract methods in this class } pd.procsym.realname:=vmtpd.procsym.realname;
if (po_abstractmethod in vmtpd.procoptions) then { in case we are overriding an abstract method,
dec(tobjectdef(pd.owner.defowner).abstractcnt); decrease the number of abstract methods in this class }
if (po_abstractmethod in vmtpd.procoptions) then
dec(tobjectdef(pd.owner.defowner).abstractcnt);
if (vmtpd.extnumber<>i) then
internalerror(2011083101);
pd.extnumber:=vmtpd.extnumber;
vmtpd:=pd;
end;
result:=true; result:=true;
exit; exit;
{$ifdef jvm} {$ifdef jvm}
@ -424,15 +431,15 @@ implementation
vmtentryvis:=pd.visibility; vmtentryvis:=pd.visibility;
end; end;
{ in case we are overriding an abstract method,
decrease the number of abstract methods in this class }
if (po_overridingmethod in pd.procoptions) and
(po_abstractmethod in vmtpd.procoptions) then
dec(tobjectdef(pd.owner.defowner).abstractcnt);
{ override old virtual method in VMT } { override old virtual method in VMT }
if updatevalues then if updatevalues then
begin begin
{ in case we are overriding an abstract method,
decrease the number of abstract methods in this class }
if (po_overridingmethod in pd.procoptions) and
(po_abstractmethod in vmtpd.procoptions) then
dec(tobjectdef(pd.owner.defowner).abstractcnt);
if (vmtpd.extnumber<>i) then if (vmtpd.extnumber<>i) then
internalerror(200611084); internalerror(200611084);
pd.extnumber:=vmtpd.extnumber; pd.extnumber:=vmtpd.extnumber;