浏览代码

Merge commit #45733 to fixes branch:
------------------------------------------------------------------------
r45733 | pierre | 2020-07-06 13:39:42 +0200 (Mon, 06 Jul 2020) | 1 line

Fix cycle with -CriotR option on aarch64-linux
------------------------------------------------------------------------
--- Merging r45733 into '.':
U compiler/constexp.pas
--- Recording mergeinfo for merge of r45733 into '.':
U .

git-svn-id: branches/fixes_3_2@49606 -

pierre 4 年之前
父节点
当前提交
2ade09bdf8
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      compiler/constexp.pas

+ 2 - 0
compiler/constexp.pas

@@ -219,7 +219,9 @@ begin
   else if not a.signed and (a.uvalue>qword(high(int64))) then
   else if not a.signed and (a.uvalue>qword(high(int64))) then
     goto try_qword
     goto try_qword
   else
   else
+    {$push} {$Q-}
     sspace:=a.uvalue+abs_low_int64;
     sspace:=a.uvalue+abs_low_int64;
+    {$pop}
   if sspace>=b then
   if sspace>=b then
     begin
     begin
       result.signed:=true;
       result.signed:=true;