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

* fixed r9243: that change should only be applied in case both the

Browse Source 
parasym and the actual parameter  are a shortstring rather than
    when at least one isn't a shortstring

git-svn-id: trunk@9275 -
This commit is contained in:
Jonas Maebe 2007-11-17 19:58:19 +00:00
parent 1445ca1198
commit 8f187bf6e2
1 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
compiler/ncal.pas
View File

@ -693,38 +693,49 @@ implementation
else else
begin begin
check_ranges(left.fileinfo,left,parasym.vardef); check_ranges(left.fileinfo,left,parasym.vardef);
{ truncate shortstring value parameters at the caller side if } inserttypeconv(left,parasym.vardef);
{ they are passed by value (if passed by reference, then the }
{ callee will truncate when copying in the string) }
{ This happens e.g. on x86_64 for small strings }
if (parasym.varspez=vs_value) and
not paramanager.push_addr_param(parasym.varspez,parasym.vardef,
aktcallnode.procdefinition.proccalloption) and
(tstringdef(parasym.vardef).len<tstringdef(left.resultdef).len) then
begin
block:=internalstatements(statements);
{ temp for the new string }
temp:=ctempcreatenode.create(parasym.vardef,parasym.vardef.size,
tt_persistent,true);
addstatement(statements,temp);
{ assign parameter to temp }
addstatement(statements,cassignmentnode.create(ctemprefnode.create(temp),left));
left:=nil;
{ release temp after next use }
addstatement(statements,ctempdeletenode.create_normal_temp(temp));
addstatement(statements,ctemprefnode.create(temp));
typecheckpass(block);
left:=block;
end
else
{ type conversions perform no truncation for constant strings, }
{ which is TP/Delphi compatible }
inserttypeconv(left,parasym.vardef);
end; end;
if codegenerror then if codegenerror then
exit; exit;
end; end;
{ truncate shortstring value parameters at the caller side if }
{ they are passed by value (if passed by reference, then the }
{ callee will truncate when copying in the string) }
{ This happens e.g. on x86_64 for small strings }
if is_shortstring(left.resultdef) and
is_shortstring(parasym.vardef) and
(parasym.varspez=vs_value) and
not paramanager.push_addr_param(parasym.varspez,parasym.vardef,
aktcallnode.procdefinition.proccalloption) and
((is_open_string(left.resultdef) and
(tstringdef(parasym.vardef).len < 255)) or
(not is_open_string(left.resultdef) and
{ when a stringconstn is typeconverted, then only its }
{ def is modified, not the contents (needed because in }
{ Delphi/TP, if you pass a longer string to a const }
{ parameter, then the callee has to see this longer }
{ string) }
(((left.nodetype<>stringconstn) and
(tstringdef(parasym.vardef).len<tstringdef(left.resultdef).len)) or
((left.nodetype=stringconstn) and
(tstringdef(parasym.vardef).len<tstringconstnode(left).len))))) then
begin
block:=internalstatements(statements);
{ temp for the new string }
temp:=ctempcreatenode.create(parasym.vardef,parasym.vardef.size,
tt_persistent,true);
addstatement(statements,temp);
{ assign parameter to temp }
addstatement(statements,cassignmentnode.create(ctemprefnode.create(temp),left));
left:=nil;
{ release temp after next use }
addstatement(statements,ctempdeletenode.create_normal_temp(temp));
addstatement(statements,ctemprefnode.create(temp));
typecheckpass(block);
left:=block;
end;
{ check var strings } { check var strings }
if (cs_strict_var_strings in current_settings.localswitches) and if (cs_strict_var_strings in current_settings.localswitches) and
is_shortstring(left.resultdef) and is_shortstring(left.resultdef) and