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

* previously, we preferred pchar->shortstring to pchar->ansistring in

Browse Source 
case of {$h-}. Now this is no longer done because it caused
    pchar->ansistring and pchar->unicodestring to have the same
    overload preference, which regularly caused problems with the
    added unicodestring overloads in the RTL in the cpstrrtl branch.
  * fixed tw3328.pp (it was missing a {$mode delphi}), which failed
    before this patch but compiles new
  + extra variants of that test for the compiler changes

git-svn-id: trunk@25164 -
This commit is contained in:
Jonas Maebe 2013-07-24 09:39:34 +00:00
parent 7e137889ff
commit 35b771e421
5 changed files with 72 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -13671,6 +13671,8 @@ tests/webtbs/tw3320.pp svneol=native#text/plain
tests/webtbs/tw3324.pp svneol=native#text/plain
tests/webtbs/tw3327.pp svneol=native#text/plain
tests/webtbs/tw3328.pp svneol=native#text/plain
tests/webtbs/tw3328a.pp svneol=native#text/plain
tests/webtbs/tw3328b.pp svneol=native#text/plain
tests/webtbs/tw3334.pp svneol=native#text/plain
tests/webtbs/tw3340.pp svneol=native#text/plain
tests/webtbs/tw3348.pp svneol=native#text/plain

20
compiler/defcmp.pas
View File

@ -659,15 +659,17 @@ implementation
if is_pchar(def_from) then
begin
doconv:=tc_pchar_2_string;
{ prefer ansistrings because pchars can overflow shortstrings, }
{ but only if ansistrings are the default (JM) }
if (is_shortstring(def_to) and
not(cs_refcountedstrings in current_settings.localswitches)) or
(is_ansistring(def_to) and
(cs_refcountedstrings in current_settings.localswitches)) then
eq:=te_convert_l1
{ prefer ansistrings/unicodestrings because pchars
can overflow shortstrings; don't use l1/l2/l3
because then pchar -> ansistring has the same
preference as conststring -> pchar, and this
breaks webtbs/tw3328.pp }
if is_ansistring(def_to) then
eq:=te_convert_l2
else if is_wide_or_unicode_string(def_to) then
eq:=te_convert_l3
else
eq:=te_convert_l2;
eq:=te_convert_l4
end
else if is_pwidechar(def_from) then
begin
@ -675,6 +677,8 @@ implementation
if is_wide_or_unicode_string(def_to) then
eq:=te_convert_l1
else
{ shortstring and ansistring can both result in
data loss, so don't prefer one over the other }
eq:=te_convert_l3;
end;
end;

2
tests/webtbs/tw3328.pp
View File

@ -3,6 +3,8 @@
{ e-mail: chrivers@iversen-net.dk }
program fpcdelphi;
{$mode delphi}
var
err : boolean;

29
tests/webtbs/tw3328a.pp Normal file
View File

@ -0,0 +1,29 @@
{ Source provided for Free Pascal Bug Report 3328 }
{ Submitted by "Christian Iversen" on 2004-09-21 }
{ e-mail: chrivers@iversen-net.dk }
program fpcdelphi;
{$mode delphi}
var
err : boolean;
Function A(Const S2: AnsiString): Integer; Overload;
Begin
writeln('ansistring overload');
err:=false;
End;
Function A(Const S2: UnicodeString): Integer; Overload;
Begin
writeln('unicodestring overload');
End;
Var
X : PAnsiChar;
Begin
err:=true;
A(X);
if err then
halt(1);
End.

27
tests/webtbs/tw3328b.pp Normal file
View File

@ -0,0 +1,27 @@
{ Source provided for Free Pascal Bug Report 3328 }
{ Submitted by "Christian Iversen" on 2004-09-21 }
{ e-mail: chrivers@iversen-net.dk }
program fpcdelphi;
var
err : boolean;
Function A(Const S2: AnsiString): Integer; Overload;
Begin
writeln('ansistring overload');
err:=false;
End;
Function A(Const S2: UnicodeString): Integer; Overload;
Begin
writeln('unicodestring overload');
End;
Var
X : PAnsiChar;
Begin
err:=true;
A(X);
if err then
halt(1);
End.