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

* fixed internalerror when having to choose between different

Browse Source 
overloads in case there is only one variant parameter and
    one of the candidates has more hidden parameters than the
    other at the start (e.g. function(para):char and
    function(para):shortstring, depending on in which order the
    hidden shortstring result and para are processed, mantis
    #11139)

git-svn-id: trunk@10643 -
This commit is contained in:
Jonas Maebe 2008-04-13 10:21:26 +00:00
parent 81ad9ea6e8
commit 76e23fc54e
3 changed files with 44 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -8135,6 +8135,7 @@ tests/webtbs/tw1104.pp svneol=native#text/plain
tests/webtbs/tw11042.pp svneol=native#text/plain
tests/webtbs/tw11053.pp svneol=native#text/plain
tests/webtbs/tw1111.pp svneol=native#text/plain
tests/webtbs/tw11139.pp svneol=native#text/plain
tests/webtbs/tw1117.pp svneol=native#text/plain
tests/webtbs/tw1122.pp svneol=native#text/plain
tests/webtbs/tw1123.pp svneol=native#text/plain

28
compiler/htypechk.pas
View File

@ -2364,8 +2364,20 @@ implementation
ord(currvcl in conflictvcls)-ord(bestvcl in conflictvcls);
end;
function getfirstrealparaidx(pd: pcandidate): integer;
begin
{ can be different for currpd and bestpd in case of overloaded }
{ functions, e.g. lowercase():char and lowercase():shortstring }
{ (depending on the calling convention and parameter order) }
result:=pd^.firstparaidx;
while (result>=0) and (vo_is_hidden_para in tparavarsym(pd^.data.paras[result]).varoptions) do
dec(result);
if (vo_is_hidden_para in tparavarsym(pd^.data.paras[result]).varoptions) then
internalerror(2006122803);
end;
var
paraidx : integer;
currpara, bestpara: tparavarsym;
currvcl, bestvcl: tvariantequaltype;
begin
@ -2375,18 +2387,8 @@ implementation
< 0 when bestpd is better than currpd
= 0 when both are equal
}
if (currpd^.firstparaidx<>bestpd^.firstparaidx) then
internalerror(2006122801);
paraidx:=currpd^.firstparaidx;
while (paraidx>=0) and (vo_is_hidden_para in tparavarsym(currpd^.data.paras[paraidx]).varoptions) do
if (vo_is_hidden_para in tparavarsym(bestpd^.data.paras[paraidx]).varoptions) then
dec(paraidx)
else
internalerror(2006122802);
if (vo_is_hidden_para in tparavarsym(currpd^.data.paras[paraidx]).varoptions) then
internalerror(2006122803);
currpara:=tparavarsym(currpd^.data.paras[paraidx]);
bestpara:=tparavarsym(bestpd^.data.paras[paraidx]);
currpara:=tparavarsym(currpd^.data.paras[getfirstrealparaidx(currpd)]);
bestpara:=tparavarsym(bestpd^.data.paras[getfirstrealparaidx(bestpd)]);
{ if one of the parameters is a regular variant, fall back to the }
{ default algorithm }

28
tests/webtbs/tw11139.pp Normal file
View File

@ -0,0 +1,28 @@
function f(c: char): char; overload;
begin
halt(1);
end;
function f(const s: shortstring): shortstring; overload;
begin
f:=lowercase(s);
end;
function f(const a: ansistring): ansistring; overload;
begin
halt(3);
end;
Procedure DoIt;
var avar:variant;
txt:String;
Begin
avar:='Hello';
txt:=f(avar);//this line causes the compilation error
if (txt<>'hello') then
halt(4);
end;
begin
doit;
end.