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

* do not limit the number of interfaces per class, resolves #40268

Browse Source
This commit is contained in:
florian 2024-04-20 22:05:18 +02:00
parent 9ee1821622
commit 902c93f3c3
2 changed files with 1280 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
compiler/nobj.pas
View File

@ -668,17 +668,10 @@ implementation
weight: longint; weight: longint;
compintf: longint; compintf: longint;
end; end;
{ Max 1000 interface in the class header interfaces it's enough imho }
tcompintfs = array[0..1000] of tcompintfentry;
pcompintfs = ^tcompintfs;
tequals = array[0..1000] of longint;
pequals = ^tequals;
timpls = array[0..1000] of longint;
pimpls = ^timpls;
var var
aequals: pequals; aequals: array of longint;
compats: pcompintfs; compats: array of tcompintfentry;
impls: pimpls; impls: array of longint;
ImplIntfCount, ImplIntfCount,
w,i,j,k: longint; w,i,j,k: longint;
ImplIntfI, ImplIntfI,
@ -687,14 +680,12 @@ implementation
cji: boolean; cji: boolean;
begin begin
ImplIntfCount:=_class.ImplementedInterfaces.count; ImplIntfCount:=_class.ImplementedInterfaces.count;
if ImplIntfCount>=High(tequals) then SetLength(compats,ImplIntfCount);
Internalerror(200006135); SetLength(aequals,ImplIntfCount);
getmem(compats,sizeof(tcompintfentry)*ImplIntfCount); SetLength(impls,ImplIntfCount);
getmem(aequals,sizeof(longint)*ImplIntfCount); filldword(compats[0],(sizeof(tcompintfentry) div sizeof(dword))*ImplIntfCount,dword(-1));
getmem(impls,sizeof(longint)*ImplIntfCount); filldword(aequals[0],ImplIntfCount,dword(-1));
filldword(compats^,(sizeof(tcompintfentry) div sizeof(dword))*ImplIntfCount,dword(-1)); filldword(impls[0],ImplIntfCount,dword(-1));
filldword(aequals^,ImplIntfCount,dword(-1));
filldword(impls^,ImplIntfCount,dword(-1));
{ ismergepossible is a containing relation { ismergepossible is a containing relation
meaning of ismergepossible(a,b,w) = meaning of ismergepossible(a,b,w) =
if implementorfunction map of a is contained implementorfunction map of b if implementorfunction map of a is contained implementorfunction map of b
@ -712,32 +703,32 @@ implementation
if cij and cji then { i equal j } if cij and cji then { i equal j }
begin begin
{ get minimum index of equal } { get minimum index of equal }
if aequals^[j]=-1 then if aequals[j]=-1 then
aequals^[j]:=i; aequals[j]:=i;
end end
else if cij then else if cij then
begin begin
{ get minimum index of maximum weight } { get minimum index of maximum weight }
if compats^[i].weight<w then if compats[i].weight<w then
begin begin
compats^[i].weight:=w; compats[i].weight:=w;
compats^[i].compintf:=j; compats[i].compintf:=j;
end; end;
end end
else if cji then else if cji then
begin begin
{ get minimum index of maximum weight } { get minimum index of maximum weight }
if (compats^[j].weight<w) then if (compats[j].weight<w) then
begin begin
compats^[j].weight:=w; compats[j].weight:=w;
compats^[j].compintf:=i; compats[j].compintf:=i;
end; end;
end; end;
end; end;
end; end;
{ Reset, no replacements by default } { Reset, no replacements by default }
for i:=0 to ImplIntfCount-1 do for i:=0 to ImplIntfCount-1 do
impls^[i]:=i; impls[i]:=i;
{ Replace vtbls when equal or compat, repeat { Replace vtbls when equal or compat, repeat
until there are no replacements possible anymore. This is until there are no replacements possible anymore. This is
needed for the cases like: needed for the cases like:
@ -748,10 +739,10 @@ implementation
k:=0; k:=0;
for i:=0 to ImplIntfCount-1 do for i:=0 to ImplIntfCount-1 do
begin begin
if compats^[impls^[i]].compintf<>-1 then if compats[impls[i]].compintf<>-1 then
impls^[i]:=compats^[impls^[i]].compintf impls[i]:=compats[impls[i]].compintf
else if aequals^[impls^[i]]<>-1 then else if aequals[impls[i]]<>-1 then
impls^[i]:=aequals^[impls^[i]] impls[i]:=aequals[impls[i]]
else else
inc(k); inc(k);
end; end;
@ -760,11 +751,8 @@ implementation
for i:=0 to ImplIntfCount-1 do for i:=0 to ImplIntfCount-1 do
begin begin
ImplIntfI:=TImplementedInterface(_class.ImplementedInterfaces[i]); ImplIntfI:=TImplementedInterface(_class.ImplementedInterfaces[i]);
ImplIntfI.VtblImplIntf:=TImplementedInterface(_class.ImplementedInterfaces[impls^[i]]); ImplIntfI.VtblImplIntf:=TImplementedInterface(_class.ImplementedInterfaces[impls[i]]);
end; end;
freemem(compats);
freemem(aequals);
freemem(impls);
end; end;

1257
tests/webtbs/tw40258.pp Normal file
View File

File diff suppressed because it is too large Load Diff