Title: [96708] trunk/Source/_javascript_Core
- Revision
- 96708
- Author
- [email protected]
- Date
- 2011-10-05 08:51:38 -0700 (Wed, 05 Oct 2011)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (96707 => 96708)
--- trunk/Source/_javascript_Core/ChangeLog 2011-10-05 15:40:05 UTC (rev 96707)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-10-05 15:51:38 UTC (rev 96708)
@@ -1,3 +1,17 @@
+2011-10-05 Gavin Peters <[email protected]>
+
+ 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:
+
2011-10-05 Patrick Gansterer <[email protected]>
Unreviewed WinCE build fix for r96595.
Modified: trunk/Source/_javascript_Core/wtf/Assertions.cpp (96707 => 96708)
--- trunk/Source/_javascript_Core/wtf/Assertions.cpp 2011-10-05 15:40:05 UTC (rev 96707)
+++ trunk/Source/_javascript_Core/wtf/Assertions.cpp 2011-10-05 15:51:38 UTC (rev 96708)
@@ -183,7 +183,7 @@
RtlCaptureStackBackTraceFunc captureStackBackTraceFunc = reinterpret_cast<RtlCaptureStackBackTraceFunc>(
::GetProcAddress(kernel32, "RtlCaptureStackBackTrace"));
if (captureStackBackTraceFunc)
- *size = captureStackBackTraceFunc(1, *size, stack, 0);
+ *size = captureStackBackTraceFunc(0, *size, stack, 0);
else
*size = 0;
#else
@@ -193,13 +193,14 @@
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;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
