浏览代码

fix stack trace crash, see #39492

(cherry picked from commit 7704fe9319a6e7b251022149216d04993b4f94a9)
Benito van der Zander 3 年之前
父节点
当前提交
ec9f7c84b4
共有 1 个文件被更改,包括 1 次插入5 次删除
  1. 1 5
      rtl/aarch64/aarch64.inc

+ 1 - 5
rtl/aarch64/aarch64.inc

@@ -165,10 +165,7 @@ procedure fpc_cpuinit;
 function get_caller_addr(framebp:pointer;addr:pointer=nil):pointer;assembler; nostackframe;
   asm
     cbz x0, .Lcaller_addr_invalid
-    ldur x0, [x0]
-{$ifndef cpullvm}
-    cbz x0, .Lcaller_addr_invalid
-{$else cpullvm}
+{$ifdef cpullvm}
     movn w1, #0
     cmp x0, x1
     csel x0, xzr, x0, ls
@@ -178,7 +175,6 @@ function get_caller_addr(framebp:pointer;addr:pointer=nil):pointer;assembler; no
    .Lcaller_addr_invalid:
   end;
 
-
 {$define FPC_SYSTEM_HAS_GET_CALLER_FRAME}
 function get_caller_frame(framebp:pointer;addr:pointer=nil):pointer;assembler; nostackframe;
   asm