Changeset 96708 in webkit for trunk/Source/JavaScriptCore/wtf

Timestamp:

Oct 5, 2011, 8:51:38 AM (14 years ago)

Author:

[email protected]

Message:

REGRESSION (r96595): WTFReportBacktrace listed as the top frame in all assertion backtraces
​https://bugs.webkit.org/show_bug.cgi?id=69424

Skip an extra frame in WTFReportBacktrace. As well, I now don't count skipped frames in maxFrames,
so I've updated maxFrames to 31, as with one skipped frame the previous value was effectively
31 reported frames.

Reviewed by Adam Roben.

• wtf/Assertions.cpp:
• wtf/Assertions.h:

File:

• trunk/Source/JavaScriptCore/wtf/Assertions.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/wtf/Assertions.cpp

@@ -184 +184 @@
         ::GetProcAddress(kernel32, "RtlCaptureStackBackTrace"));
     if (captureStackBackTraceFunc)
-        *size = captureStackBackTraceFunc(1, *size, stack, 0);
+        *size = captureStackBackTraceFunc(0, *size, stack, 0);
     else
         *size = 0;
@@ -194 +194 @@
 void WTFReportBacktrace()
 {
-    static const int maxFrames = 32;
-    void* samples[maxFrames];
-    int frames = maxFrames;
+    static const int framesToShow = 31;
+    static const int framesToSkip = 2;
+    void* samples[framesToShow + framesToSkip];
+    int frames = framesToShow + framesToSkip;
 
     WTFGetBacktrace(samples, &frames);
 
-    for (int i = 1; i < frames; ++i) {
+    for (int i = framesToSkip; i < frames; ++i) {
         const char* mangledName = 0;
         char* cxaDemangled = 0;