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

* fixed type of reference used to store an ansichar that was converted

Browse Source 
inline to a shortstring

git-svn-id: trunk@31049 -
This commit is contained in:
Jonas Maebe 2015-06-13 22:48:05 +00:00
parent 2cdf969649
commit b9c9422fa7
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/ncgcnv.pas
View File

@ -398,14 +398,20 @@ interface
procedure tcgtypeconvnode.second_char_to_string; procedure tcgtypeconvnode.second_char_to_string;
var
tmpref: treference;
begin begin
location_reset_ref(location,LOC_REFERENCE,OS_NO,2); location_reset_ref(location,LOC_REFERENCE,OS_NO,2);
case tstringdef(resultdef).stringtype of case tstringdef(resultdef).stringtype of
st_shortstring : st_shortstring :
begin begin
tg.gethltemp(current_asmdata.CurrAsmList,cshortstringtype,256,tt_normal,location.reference); tg.gethltemp(current_asmdata.CurrAsmList,cshortstringtype,256,tt_normal,location.reference);
tmpref:=location.reference;
hlcg.g_ptrtypecast_ref(current_asmdata.CurrAsmList,
getpointerdef(cshortstringtype),
getpointerdef(left.resultdef),tmpref);
hlcg.a_load_loc_ref(current_asmdata.CurrAsmList,left.resultdef,left.resultdef,left.location, hlcg.a_load_loc_ref(current_asmdata.CurrAsmList,left.resultdef,left.resultdef,left.location,
location.reference); tmpref);
location_freetemp(current_asmdata.CurrAsmList,left.location); location_freetemp(current_asmdata.CurrAsmList,left.location);
end; end;
{ the rest is removed in the resultdef pass and converted to compilerprocs } { the rest is removed in the resultdef pass and converted to compilerprocs }