Changeset 83709 in webkit

Timestamp:

Apr 13, 2011 1:14:36 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-13 Paul Knight <​pknight@apple.com>

Reviewed by Gavin Barraclough.

BACKTRACE() macro should check for Debug configuration in macro, not WTFReportBacktrace definition
​https://bugs.webkit.org/show_bug.cgi?id=58405

The BACKTRACE() macro requires JavaScriptCore be built with a Debug
configuration in order for it to be enabled. Move the NDEBUG check to
the header so it will be enabled when the calling framework or
application is built with a Debug configuration, similar to how
ASSERT() and friends work.

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

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/Assertions.cpp (modified) (1 diff)
• wtf/Assertions.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-04-13  Paul Knight  <pknight@apple.com>
+
+        Reviewed by Gavin Barraclough.
+
+        BACKTRACE() macro should check for Debug configuration in macro, not WTFReportBacktrace definition
+        https://bugs.webkit.org/show_bug.cgi?id=58405
+
+        The BACKTRACE() macro requires JavaScriptCore be built with a Debug
+        configuration in order for it to be enabled. Move the NDEBUG check to
+        the header so it will be enabled when the calling framework or
+        application is built with a Debug configuration, similar to how
+        ASSERT() and friends work.
+
+        * wtf/Assertions.cpp:
+        * wtf/Assertions.h:
+
 2011-04-12  Ben Taylor  <bentaylor.solx86@gmail.com>
 

trunk/Source/JavaScriptCore/wtf/Assertions.cpp

@@ -216 +216 @@
 void WTFReportBacktrace()
 {
-#if PLATFORM(MAC) && !defined(NDEBUG)
+#if PLATFORM(MAC)
     static const int maxFrames = 32;
     void* samples[maxFrames];

trunk/Source/JavaScriptCore/wtf/Assertions.h

@@ -74 +74 @@
 #endif
 
+#ifndef BACKTRACE_DISABLED
+#define BACKTRACE_DISABLED ASSERTIONS_DISABLED_DEFAULT
+#endif
+
 #ifndef ASSERT_DISABLED
 #define ASSERT_DISABLED ASSERTIONS_DISABLED_DEFAULT
@@ -189 +193 @@
   Print a backtrace to the same location as ASSERT messages.
 */
-#ifndef BACKTRACE
+
+#if BACKTRACE_DISABLED
+
+#define BACKTRACE() ((void)0)
+
+#else
+
 #define BACKTRACE() do { \
     WTFReportBacktrace(); \
 } while(false)
+
 #endif