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

* set types correctly for char -> shortstring conversions, resolves #32686

Browse Source 
git-svn-id: trunk@37585 -
This commit is contained in:
florian 2017-11-12 22:14:23 +00:00
parent b086b10adf
commit f22a6629c1
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/ncnv.pas
View File

@ -1183,6 +1183,7 @@ implementation
sa : ansistring;
cw : tcompilerwidechar;
l : SizeUInt;
exprtype : tdef;
begin
result:=nil;
if (left.nodetype=ordconstn) and
@ -1284,16 +1285,22 @@ implementation
end
else
begin
{ use at least u16inttype }
{$ifdef cpu8bitalu}
exprtype:=u16inttype;
{$else cpu8bitalu}
exprtype:=uinttype;
{$endif cpu8bitalu}
{ create word(byte(char) shl 8 or 1) for litte endian machines }
{ and word(byte(char) or 256) for big endian machines }
left := ctypeconvnode.create_internal(left,u8inttype);
left := ctypeconvnode.create_internal(left,exprtype);
if (target_info.endian = endian_little) then
left := caddnode.create(orn,
cshlshrnode.create(shln,left,cordconstnode.create(8,s32inttype,false)),
cordconstnode.create(1,s32inttype,false))
cshlshrnode.create(shln,left,cordconstnode.create(8,exprtype,false)),
cordconstnode.create(1,exprtype,false))
else
left := caddnode.create(orn,left,
cordconstnode.create(1 shl 8,s32inttype,false));
cordconstnode.create(1 shl 8,exprtype,false));
left := ctypeconvnode.create_internal(left,u16inttype);
typecheckpass(left);
end;