Disabling assertions breaks the debug build

https://bugs.webkit.org/show_bug.cgi?id=72091

Reviewed by Geoff Garen.

Source/JavaScriptCore:

* dfg/DFGNode.h: Made hasIdentifier() available when assertions are
disabled. It is used in Graph::dump().
* runtime/JSObject.cpp:
(JSC::JSObject::visitChildren): Update m_isCheckingForDefaultMarkViolation
only if assertions are enabled.
* wtf/Deque.h:
(WTF::::checkIndexValidity): Changed ASSERT to ASSERT_UNUSED.
* wtf/ThreadRestrictionVerifier.h:
(WTF::ThreadRestrictionVerifier::setShared): Guarded the definition of
a local variable that is only used in an assertion.

Source/WebCore:

* platform/graphics/BitmapImage.cpp:
(WebCore::BitmapImage::didDecodeProperties): Guarded the definition of local variables that are
only used in an assertion correctly.
* platform/graphics/gpu/TilingData.h: Changed ASSERT to ASSERT_UNUSED.
(WebCore::TilingData::assertTile):
* rendering/RenderInline.cpp:
(WebCore::RenderInline::willBeDestroyed): Guarded the definition of a local variable that is
only used in an assertion correctly.
* rendering/svg/RenderSVGResourceClipper.cpp:
(WebCore::RenderSVGResourceClipper::applyResource): Changed ASSERT to ASSERT_UNUSED.
* rendering/svg/RenderSVGResourceFilter.cpp:
(WebCore::RenderSVGResourceFilter::applyResource): Changed ASSERT to ASSERT_UNUSED.
(WebCore::RenderSVGResourceFilter::postApplyResource): Changed ASSERT to ASSERT_UNUSED.
* rendering/svg/RenderSVGResourceMasker.cpp:
(WebCore::RenderSVGResourceMasker::applyResource): Changed ASSERT to ASSERT_UNUSED.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@99929 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 6156c7da6c7a51c21166cf6a5851f9c1ea1179c4..65deebe34e90029eb340705cbe50dcd2bdeb3cec 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,21 @@
+2011-11-10  Dan Bernstein  <mitz@apple.com>
+
+        Disabling assertions breaks the debug build
+        https://bugs.webkit.org/show_bug.cgi?id=72091
+
+        Reviewed by Geoff Garen.
+
+        * dfg/DFGNode.h: Made hasIdentifier() available when assertions are
+        disabled. It is used in Graph::dump().
+        * runtime/JSObject.cpp:
+        (JSC::JSObject::visitChildren): Update m_isCheckingForDefaultMarkViolation
+        only if assertions are enabled.
+        * wtf/Deque.h:
+        (WTF::::checkIndexValidity): Changed ASSERT to ASSERT_UNUSED.
+        * wtf/ThreadRestrictionVerifier.h:
+        (WTF::ThreadRestrictionVerifier::setShared): Guarded the definition of
+        a local variable that is only used in an assertion.
+
 2011-11-10  Filip Pizlo  <fpizlo@apple.com>
 
         JSString forgets to clear m_fibers when resolving ropes

diff --git a/Source/JavaScriptCore/dfg/DFGNode.h b/Source/JavaScriptCore/dfg/DFGNode.h
index 66f35893edf9a874b27e1511f7b1b70473ff4225..46675b2f0548aa5ceb4aeba1f0bf91c9765e0bb6 100644 (file)
--- a/Source/JavaScriptCore/dfg/DFGNode.h
+++ b/Source/JavaScriptCore/dfg/DFGNode.h
@@ -469,7 +469,7 @@ struct Node {
         return variableAccessData()->local();
     }
 
-#if !ASSERT_DISABLED
+#ifndef NDEBUG
     bool hasIdentifier()
     {
         switch (op) {

diff --git a/Source/JavaScriptCore/runtime/JSObject.cpp b/Source/JavaScriptCore/runtime/JSObject.cpp
index f255333874747c85b2fa5d40a5dbfa6071d0d7ee..9ebd7bf233a40ab7ab2678d2473ffbb7b0b608f9 100644 (file)
--- a/Source/JavaScriptCore/runtime/JSObject.cpp
+++ b/Source/JavaScriptCore/runtime/JSObject.cpp
@@ -84,7 +84,7 @@ void JSObject::visitChildren(JSCell* cell, SlotVisitor& visitor)
 {
     JSObject* thisObject = static_cast<JSObject*>(cell);
     ASSERT_GC_OBJECT_INHERITS(thisObject, &s_info);
-#ifndef NDEBUG
+#if !ASSERT_DISABLED
     bool wasCheckingForDefaultMarkViolation = visitor.m_isCheckingForDefaultMarkViolation;
     visitor.m_isCheckingForDefaultMarkViolation = false;
 #endif
@@ -97,7 +97,7 @@ void JSObject::visitChildren(JSCell* cell, SlotVisitor& visitor)
     if (thisObject->m_inheritorID)
         visitor.append(&thisObject->m_inheritorID);
 
-#ifndef NDEBUG
+#if !ASSERT_DISABLED
     visitor.m_isCheckingForDefaultMarkViolation = wasCheckingForDefaultMarkViolation;
 #endif
 }

diff --git a/Source/JavaScriptCore/wtf/Deque.h b/Source/JavaScriptCore/wtf/Deque.h
index 1ed47a8884ba8736a3ae745c1980ea7a7c3ad6b2..276b59a6f55e6ff26528af2e69df2a1bb54beb90 100644 (file)
--- a/Source/JavaScriptCore/wtf/Deque.h
+++ b/Source/JavaScriptCore/wtf/Deque.h
@@ -280,7 +280,7 @@ namespace WTF {
     template<typename T, size_t inlineCapacity>
     void Deque<T, inlineCapacity>::checkIndexValidity(size_t index) const
     {
-        ASSERT(index <= m_buffer.capacity());
+        ASSERT_UNUSED(index, index <= m_buffer.capacity());
         if (m_start <= m_end) {
             ASSERT(index >= m_start);
             ASSERT(index <= m_end);

diff --git a/Source/JavaScriptCore/wtf/ThreadRestrictionVerifier.h b/Source/JavaScriptCore/wtf/ThreadRestrictionVerifier.h
index e76e6c6fab935337d4fe9151852500037c848a76..0eeac8e6275a205b30639ee034e98f8e744edf06 100644 (file)
--- a/Source/JavaScriptCore/wtf/ThreadRestrictionVerifier.h
+++ b/Source/JavaScriptCore/wtf/ThreadRestrictionVerifier.h
@@ -94,7 +94,9 @@ public:
     // Indicates that the object may (or may not) be owned by more than one place.
     void setShared(bool shared)
     {
+#if !ASSERT_DISABLED
         bool previouslyShared = m_shared;
+#endif
         m_shared = shared;
 
         if (!m_shared)

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 84fd21ff3fb05b13d06714d97c77a1b1f2310102..189e198ac55c4a6832206ea861beaef86857a16a 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2011-11-10  Dan Bernstein  <mitz@apple.com>
+
+        Disabling assertions breaks the debug build
+        https://bugs.webkit.org/show_bug.cgi?id=72091
+
+        Reviewed by Geoff Garen.
+
+        * platform/graphics/BitmapImage.cpp:
+        (WebCore::BitmapImage::didDecodeProperties): Guarded the definition of local variables that are
+        only used in an assertion correctly.
+        * platform/graphics/gpu/TilingData.h: Changed ASSERT to ASSERT_UNUSED.
+        (WebCore::TilingData::assertTile):
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::willBeDestroyed): Guarded the definition of a local variable that is
+        only used in an assertion correctly.
+        * rendering/svg/RenderSVGResourceClipper.cpp:
+        (WebCore::RenderSVGResourceClipper::applyResource): Changed ASSERT to ASSERT_UNUSED.
+        * rendering/svg/RenderSVGResourceFilter.cpp:
+        (WebCore::RenderSVGResourceFilter::applyResource): Changed ASSERT to ASSERT_UNUSED.
+        (WebCore::RenderSVGResourceFilter::postApplyResource): Changed ASSERT to ASSERT_UNUSED.
+        * rendering/svg/RenderSVGResourceMasker.cpp:
+        (WebCore::RenderSVGResourceMasker::applyResource): Changed ASSERT to ASSERT_UNUSED.
+
 2011-11-10  Daniel Cheng  <dcheng@chromium.org>
 
         [chromium] Add plumbing for JS to write to clipboard in copy/cut events.

diff --git a/Source/WebCore/platform/graphics/BitmapImage.cpp b/Source/WebCore/platform/graphics/BitmapImage.cpp
index 0862e6fac079b4e0842e211fe23765497e0cdb54..7e6f6869dc515c9c14d70f9e67838ef764fa1e88 100644 (file)
--- a/Source/WebCore/platform/graphics/BitmapImage.cpp
+++ b/Source/WebCore/platform/graphics/BitmapImage.cpp
@@ -157,7 +157,7 @@ void BitmapImage::didDecodeProperties() const
     if (m_decodedPropertiesSize == updatedSize)
         return;
     int deltaBytes = updatedSize - m_decodedPropertiesSize;
-#ifndef NDEBUG
+#if !ASSERT_DISABLED
     bool overflow = updatedSize > m_decodedPropertiesSize && deltaBytes < 0;
     bool underflow = updatedSize < m_decodedPropertiesSize && deltaBytes > 0;
     ASSERT(!overflow && !underflow);

diff --git a/Source/WebCore/platform/graphics/gpu/TilingData.h b/Source/WebCore/platform/graphics/gpu/TilingData.h
index bc63a670bf461725e81d800a891895fac8662a67..de7216eeed5a1322406ce9cf44a4a222b68b051e 100644 (file)
--- a/Source/WebCore/platform/graphics/gpu/TilingData.h
+++ b/Source/WebCore/platform/graphics/gpu/TilingData.h
@@ -77,11 +77,7 @@ public:
 
 private:
     TilingData() : m_maxTextureSize(0), m_totalSizeX(0), m_totalSizeY(0) {}
-#ifndef NDEBUG
-    void assertTile(int tile) const { ASSERT(tile >= 0 && tile < numTiles()); }
-#else
-    void assertTile(int) const {}
-#endif
+    void assertTile(int tile) const { ASSERT_UNUSED(tile, tile >= 0 && tile < numTiles()); }
     void recomputeNumTiles();
 
     int m_maxTextureSize;

diff --git a/Source/WebCore/rendering/RenderInline.cpp b/Source/WebCore/rendering/RenderInline.cpp
index 3f09633b008d956fa1f7e2182e30c4dd205ac3a3..4499e1089f41aecd2762d8bc80e565d5332b1cec 100644 (file)
--- a/Source/WebCore/rendering/RenderInline.cpp
+++ b/Source/WebCore/rendering/RenderInline.cpp
@@ -55,7 +55,7 @@ RenderInline::RenderInline(Node* node)
 
 void RenderInline::willBeDestroyed()
 {
-#ifndef NDEBUG
+#if !ASSERT_DISABLED
     // Make sure we do not retain "this" in the continuation outline table map of our containing blocks.
     if (parent() && style()->visibility() == VISIBLE && hasOutline()) {
         bool containingBlockPaintsContinuationOutline = continuation() || isInlineElementContinuation();

diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp
index f0b11c237bbf627b07b4241d2c47cff24666ddc4..1be58a54534c1856efa9b90df60ae0b8cb23953c 100644 (file)
--- a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp
+++ b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp
@@ -96,11 +96,7 @@ bool RenderSVGResourceClipper::applyResource(RenderObject* object, RenderStyle*,
 {
     ASSERT(object);
     ASSERT(context);
-#ifndef NDEBUG
-    ASSERT(resourceMode == ApplyToDefaultMode);
-#else
-    UNUSED_PARAM(resourceMode);
-#endif
+    ASSERT_UNUSED(resourceMode, resourceMode == ApplyToDefaultMode);
 
     return applyClippingToContext(object, object->objectBoundingBox(), object->repaintRectInLocalCoordinates(), context);
 }

diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp
index a428ec63f8cecb166244f659379696998825f2c6..01a205eb7eb4e999606833ea4134f57cdf9ccb38 100644 (file)
--- a/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp
+++ b/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp
@@ -141,11 +141,7 @@ bool RenderSVGResourceFilter::applyResource(RenderObject* object, RenderStyle*,
 {
     ASSERT(object);
     ASSERT(context);
-#ifndef NDEBUG
-    ASSERT(resourceMode == ApplyToDefaultMode);
-#else
-    UNUSED_PARAM(resourceMode);
-#endif
+    ASSERT_UNUSED(resourceMode, resourceMode == ApplyToDefaultMode);
 
     // Returning false here, to avoid drawings onto the context. We just want to
     // draw the stored filter output, not the unfiltered object as well.
@@ -264,11 +260,7 @@ void RenderSVGResourceFilter::postApplyResource(RenderObject* object, GraphicsCo
 {
     ASSERT(object);
     ASSERT(context);
-#ifndef NDEBUG
-    ASSERT(resourceMode == ApplyToDefaultMode);
-#else
-    UNUSED_PARAM(resourceMode);
-#endif
+    ASSERT_UNUSED(resourceMode, resourceMode == ApplyToDefaultMode);
 
     FilterData* filterData = m_filter.get(object);
     if (!filterData)

diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp
index 10037eb2d986c593c7299a1fbd96b3e33ec339b4..eb6db3d1277af77a1d9d99c5db312771a51c826e 100644 (file)
--- a/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp
+++ b/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp
@@ -84,11 +84,7 @@ bool RenderSVGResourceMasker::applyResource(RenderObject* object, RenderStyle*,
 {
     ASSERT(object);
     ASSERT(context);
-#ifndef NDEBUG
-    ASSERT(resourceMode == ApplyToDefaultMode);
-#else
-    UNUSED_PARAM(resourceMode);
-#endif
+    ASSERT_UNUSED(resourceMode, resourceMode == ApplyToDefaultMode);
 
     if (!m_masker.contains(object))
         m_masker.set(object, new MaskerData);