Also fix the 'Skip excessive stack frames' thing not working

al13n321 · al13n321 · commit 5fe117ffd4dc · 2025-05-19T23:56:24.000Z
diff --git a/contrib/aws b/contrib/aws
@@ -1 +1 @@
-Subproject commit a86b913abc2795ee23941b24dd51e862214ec6b0
+Subproject commit a9e7b95baa04b28827d0b22eb08414907b595531
diff --git a/src/Common/StackTrace.cpp b/src/Common/StackTrace.cpp
@@ -369,7 +369,10 @@ StackTrace::StackTrace(const ucontext_t & signal_context)
         /// Skip excessive stack frames that we have created while finding stack trace.
         for (size_t i = 0; i < size; ++i)
         {
-            if (frame_pointers[i] == caller_address)
+            if (frame_pointers[i] == caller_address ||
+                /// This compensates for a hack in libunwind, see the "+ 1" in
+                /// UnwindCursor<A, R>::stepThroughSigReturn.
+                frame_pointers[i] == caller_address + 1)
             {
                 offset = i;
                 break;

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,10 @@ StackTrace::StackTrace(const ucontext_t & signal_context)`
`369`	`369`	`/// Skip excessive stack frames that we have created while finding stack trace.`
`370`	`370`	`for (size_t i = 0; i < size; ++i)`
`371`	`371`	`{`
`372`		`- if (frame_pointers[i] == caller_address)`
	`372`	`+ if (frame_pointers[i] == caller_address \|\|`
	`373`	`+ /// This compensates for a hack in libunwind, see the "+ 1" in`
	`374`	`+ /// UnwindCursor<A, R>::stepThroughSigReturn.`
	`375`	`+ frame_pointers[i] == caller_address + 1)`
`373`	`376`	`{`
`374`	`377`	`offset = i;`
`375`	`378`	`break;`