paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2026-02-25 03:48:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

* fix #41072: proc_to_procvar_equal_internal() might be passed a procvar in case of "procvar := @<anon func>", reject that as incompatible

Browse Source 
+ added test
This commit is contained in:
Sven/Sarah Barth 2024-12-25 22:30:30 +01:00
parent 065a81b72c
commit aa0ccd8b59
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/defcmp.pas
View File

@ -2637,9 +2637,12 @@ implementation
compatible with the target }
if po_anonymous in def1.procoptions then
begin
if def1.typ<>procdef then
internalerror(2021052602);
captured:=tprocdef(def1).capturedsyms;
captured:=nil;
if def1.typ=procdef then
captured:=tprocdef(def1).capturedsyms
{ def1.typ=procvardef can happen if someone uses procvar := @<anon func> }
else if def1.typ<>procvardef then
internalerror(2021052601);
{ a function reference can capture anything, but they're
rather expensive, so cheaper overloads are preferred }
dstisfuncref:=assigned(def2.owner) and
@ -2656,7 +2659,9 @@ implementation
- nested procvar }
if not assigned(captured) or (captured.count=0) then
begin
if po_methodpointer in def2.procoptions then
if def1.typ=procvardef then
eq:=te_incompatible
else if po_methodpointer in def2.procoptions then
eq:=te_convert_l2
else if po_delphi_nested_cc in def2.procoptions then
eq:=te_convert_l4

13
tests/webtbf/tw41072.pp Normal file
View File

@ -0,0 +1,13 @@
{ %FAIL }
program tw41072;
{$mode objfpc}
{$modeswitch anonymousfunctions}
var
P: TProcedure;
begin
P:=@procedure begin end;
end.