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

* convert all arguments to integers in case of comparisons of pointers with

Browse Source 
constants on llvm, as you can only compare with "null" in that case
  * convert all arguments to integers in case of pointer subtractions,
    as pointer subtractions are not supported by llvm

git-svn-id: trunk@30485 -
This commit is contained in:
Jonas Maebe 2015-04-07 19:35:08 +00:00
parent c1935de563
commit f94f9f44e4
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compiler/llvm/nllvmadd.pas
View File

@ -69,10 +69,25 @@ implementation
procedure tllvmaddnode.force_reg_left_right(allow_swap, allow_constant: boolean);
begin
{ comparison with pointer -> no immediate, as icmp can't handle pointer
immediates (except for nil as "null", but we don't generate that) }
if (nodetype in [equaln,unequaln,gtn,gten,ltn,lten]) and
((left.nodetype in [pointerconstn,niln]) or
(right.nodetype in [pointerconstn,niln])) then
allow_constant:=false;
inherited;
{ pointer - pointer = integer -> make all defs pointer since we can't
subtract pointers }
if (nodetype=subn) and
(left.resultdef.typ=pointerdef) and
(right.resultdef.typ=pointerdef) then
begin
hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,resultdef,true);
hlcg.location_force_reg(current_asmdata.CurrAsmList,right.location,right.resultdef,resultdef,true);
end
{ pointer +/- integer -> make defs the same since a_op_* only gets a
single type as argument }
if (left.resultdef.typ=pointerdef)<>(right.resultdef.typ=pointerdef) then
else if (left.resultdef.typ=pointerdef)<>(right.resultdef.typ=pointerdef) then
begin
{ the result is a pointerdef -> typecast both arguments to pointer;
a_op_*_reg will convert them back to integer as needed }