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

* fix #39681: also handle the result type of a specialized procvar when checking for a possible implicit specialization

Browse Source 
+ added test
This commit is contained in:
Sven/Sarah Barth 2022-04-21 22:09:43 +02:00
parent c0fa45dc92
commit 76753438ed
2 changed files with 63 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
compiler/pgenutil.pas
View File

@ -923,6 +923,30 @@ uses
}
function handle_procvars(genericparams:tfphashlist;callerparams:tfplist;target_def:tdef;caller_def:tdef):boolean;
var
newparams : tfphashlist;
procedure handle_generic_param(targetparadef,callerparadef:tdef);
var
key : string;
index : integer;
begin
if not assigned(callerparadef.typesym) then
internalerror(2021020908);
key:=generic_param_hash(targetparadef);
{ the generic param must not already be used }
index:=genericparams.findindexof(key);
if index<0 then
begin
{ add the type to the list }
index:=newparams.findindexof(key);
if index<0 then
newparams.add(key,callerparadef.typesym);
end;
end;
var
i,j : integer;
paravar : tparavarsym;
@ -930,9 +954,6 @@ uses
caller_proc : tprocvardef;
target_proc_para,
caller_proc_para : tparavarsym;
newparams : tfphashlist;
key : string;
index : integer;
valid_params : integer;
begin
result := false;
@ -977,28 +998,27 @@ uses
{ find the generic param name in the generic def parameters }
j:=target_proc.genericdef.genericparas.findindexof(paravar.vardef.typesym.name);
target_def:=ttypesym(target_proc.genericparas[j]).typedef;
caller_def:=caller_proc_para.vardef;
if not assigned(caller_def.typesym) then
internalerror(2021020908);
key:=generic_param_hash(target_def);
{ the generic param must not already be used }
index:=genericparams.findindexof(key);
if index<0 then
begin
{ add the type to the list }
index:=newparams.findindexof(key);
if index<0 then
newparams.add(key,caller_def.typesym);
end;
handle_generic_param(ttypesym(target_proc.genericparas[j]).typedef,caller_proc_para.vardef);
end;
inc(valid_params);
end;
if assigned(target_proc.returndef) and not is_void(target_proc.returndef) then
begin
{ or check for exact? }
if compare_defs(caller_proc.returndef,target_proc.returndef,nothingn)<te_equal then
begin
newparams.free;
exit(false);
end;
if sp_generic_para in target_proc.returndef.typesym.symoptions then
begin
handle_generic_param(target_proc.returndef,caller_proc.returndef);
end;
end;
{ if the count of valid params matches the target then
transfer the temporary params to the actual params }
result:=valid_params=target_proc.paras.count;

23
tests/webtbs/tw39681.pp Normal file
View File

@ -0,0 +1,23 @@
{ %NORUN }
program tw39681;
{$mode objfpc}{$H+}
{$ModeSwitch implicitfunctionspecialization}
type
generic TFunc<TResult> = function: TResult;
generic procedure Bar<T>(f: specialize TFunc<T>);
begin
end;
function Foo: Integer;
begin
end;
begin
specialize Bar<Integer>(@Foo); // works
Bar(@Foo); // Error
end.