paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-05 13:38:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fix #41004: correctly determine the instruction pointer for leaf functions and set the CONTEXT_UNWOUND_TO_CALL context flag

Browse Source
This commit is contained in:
Sven/Sarah Barth 2024-11-10 21:59:28 +01:00
parent ee6bfa357a
commit 1b44d17899
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rtl/win64/seh64.inc
View File

@ -18,6 +18,8 @@ const
EXCEPTION_UNWIND = EXCEPTION_UNWINDING or EXCEPTION_EXIT_UNWIND or
EXCEPTION_TARGET_UNWIND or EXCEPTION_COLLIDED_UNWIND;
CONTEXT_UNWOUND_TO_CALL = $20000000;
UNWIND_HISTORY_TABLE_SIZE = 12;
UNW_FLAG_NHANDLER = 0;
@ -346,9 +348,12 @@ begin
Context.Rip:=PQWord(Context.Rsp)^;
Inc(Context.Rsp, sizeof(Pointer));
{$elseif defined(CPUAARCH64)}
{ ToDo }
//Context.Pc:=Context.Lr;
ContextSetIP(Context,0);
{ For leaf function on Windows ARM64, return address is at LR(X30). Add
CONTEXT_UNWOUND_TO_CALL flag to avoid unwind ambiguity for tailcall on
ARM64, because padding after tailcall is not guaranteed.
Source: https://chromium.googlesource.com/chromium/src/base/+/master/profiler/win32_stack_frame_unwinder.cc#116 }
Context.Pc:=Context.Lr;
Context.ContextFlags := Context.ContextFlags or CONTEXT_UNWOUND_TO_CALL;
{$else}
ContextSetIP(Context,0);
{$endif}