Adjust stacktrace to point at CALL instruction instead of return address

dlang · Aug 31, 2015 · 8822115 · 8822115
1 parent 44e41db
commit 8822115
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/core/runtime.d b/src/core/runtime.d
@@ -492,7 +492,9 @@ Throwable.TraceInfo defaultTraceHandler( void* ptr = null )
                                             stackPtr < stackBottom &&
                                             numframes < MAXFRAMES; )
                         {
-                            callstack[numframes++] = *(stackPtr + 1);
+                            enum CALL_INSTRUCTION_SIZE = 1; // it may not be 1 but it is good enough to get
+                                                            // in CALL instruction address range for backtrace
+                            callstack[numframes++] = *(stackPtr + 1) - CALL_INSTRUCTION_SIZE;
                             stackPtr = cast(void**) *stackPtr;
                         }
                     }