Changeset 116198 in webkit

Timestamp:

May 4, 2012 5:54:03 PM (12 years ago)

Author:

aestes@apple.com

Message:

Remove uses of ASSERT(false)
​https://bugs.webkit.org/show_bug.cgi?id=85686

Reviewed by Dean Jackson.

Replace uses of ASSERT(false) with ASSERT_NOT_REACHED(). Also, in two places, there was code structured like:

if (expr) {

do something

} else {

ASSERT(false);

}

Replace this with:

ASSERT(expr);
if (!expr)

return;

do something

• Modules/webdatabase/DatabaseTracker.cpp:

(WebCore::DatabaseTracker::deleteOrigin):
(WebCore::DatabaseTracker::doneCreatingDatabase):
(WebCore::DatabaseTracker::doneDeletingDatabase):
(WebCore::DatabaseTracker::deleteDatabase):

• bridge/objc/objc_instance.mm:

(ObjcInstance::invokeObjcMethod):

• bridge/objc/objc_utility.mm:

(JSC::Bindings::convertObjcValueToValue):
(JSC::Bindings::objcValueTypeForType):

• dom/Node.cpp:

(WebCore::Node::createRenderer):

• loader/icon/IconDatabase.cpp:

(WebCore::IconDatabase::setIconURLForPageURLInSQLDatabase):
(WebCore::IconDatabase::setIconIDForPageURLInSQLDatabase):

• platform/graphics/GraphicsContext3D.cpp:

(WebCore::doPacking):

• platform/text/BidiResolver.h:

(WebCore::::createBidiRunsForLine):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webdatabase/DatabaseTracker.cpp (modified) (4 diffs)
• bridge/objc/objc_instance.mm (modified) (1 diff)
• bridge/objc/objc_utility.mm (modified) (2 diffs)
• dom/Node.cpp (modified) (1 diff)
• loader/icon/IconDatabase.cpp (modified) (2 diffs)
• platform/graphics/GraphicsContext3D.cpp (modified) (1 diff)
• platform/text/BidiResolver.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-04  Andy Estes  <aestes@apple.com>
+
+        Remove uses of ASSERT(false)
+        https://bugs.webkit.org/show_bug.cgi?id=85686
+
+        Reviewed by Dean Jackson.
+
+        Replace uses of ASSERT(false) with ASSERT_NOT_REACHED(). Also, in two places, there was code structured like:
+
+        if (expr) {
+            // do something
+        } else {
+            ASSERT(false);
+        }
+
+        Replace this with:
+
+        ASSERT(expr);
+        if (!expr)
+            return;
+
+        // do something
+
+        * Modules/webdatabase/DatabaseTracker.cpp:
+        (WebCore::DatabaseTracker::deleteOrigin):
+        (WebCore::DatabaseTracker::doneCreatingDatabase):
+        (WebCore::DatabaseTracker::doneDeletingDatabase):
+        (WebCore::DatabaseTracker::deleteDatabase):
+        * bridge/objc/objc_instance.mm:
+        (ObjcInstance::invokeObjcMethod):
+        * bridge/objc/objc_utility.mm:
+        (JSC::Bindings::convertObjcValueToValue):
+        (JSC::Bindings::objcValueTypeForType):
+        * dom/Node.cpp:
+        (WebCore::Node::createRenderer):
+        * loader/icon/IconDatabase.cpp:
+        (WebCore::IconDatabase::setIconURLForPageURLInSQLDatabase):
+        (WebCore::IconDatabase::setIconIDForPageURLInSQLDatabase):
+        * platform/graphics/GraphicsContext3D.cpp:
+        (WebCore::doPacking):
+        * platform/text/BidiResolver.h:
+        (WebCore::::createBidiRunsForLine):
+
 2012-05-04  Noel Gordon  <noel.gordon@gmail.com>
 

trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp

@@ -760 +760 @@
         if (!canDeleteOrigin(origin)) {
             LOG_ERROR("Tried to delete an origin (%s) while either creating database in it or already deleting it", origin->databaseIdentifier().ascii().data());
-            ASSERT(false);
+            ASSERT_NOT_REACHED();
             return false;
         }
@@ -854 +854 @@
     ASSERT(!m_databaseGuard.tryLock());
     NameCountMap* nameMap = m_beingCreated.get(origin);
-    if (nameMap) {
-        long count = nameMap->get(name);
-        ASSERT(count > 0);
-        if (count <= 1) {
-            nameMap->remove(name);
-            if (nameMap->isEmpty()) {
-                m_beingCreated.remove(origin);
-                delete nameMap;
-            }
-        } else
-            nameMap->set(name, count - 1);
+    ASSERT(nameMap);
+    if (!nameMap)
+        return;
+
+    long count = nameMap->get(name);
+    ASSERT(count > 0);
+    if (count <= 1) {
+        nameMap->remove(name);
+        if (nameMap->isEmpty()) {
+            m_beingCreated.remove(origin);
+            delete nameMap;
+        }
     } else
-        ASSERT(false);
+        nameMap->set(name, count - 1);
 }
 
@@ -899 +900 @@
     ASSERT(!m_databaseGuard.tryLock());
     NameSet* nameSet = m_beingDeleted.get(origin);
-    if (nameSet) {
-        ASSERT(nameSet->contains(name));
-        nameSet->remove(name);
-        if (nameSet->isEmpty()) {
-            m_beingDeleted.remove(origin);
-            delete nameSet;
-        }
-    } else {
-        ASSERT(false);
+    ASSERT(nameSet);
+    if (!nameSet)
+        return;
+
+    ASSERT(nameSet->contains(name));
+    nameSet->remove(name);
+    if (nameSet->isEmpty()) {
+        m_beingDeleted.remove(origin);
+        delete nameSet;
     }
 }
@@ -953 +954 @@
 
         if (!canDeleteDatabase(origin, name)) {
-            ASSERT(FALSE);
+            ASSERT_NOT_REACHED();
             return false;
         }

trunk/Source/WebCore/bridge/objc/objc_instance.mm

@@ -316 +316 @@
                     // of an invalid type anyway).
                     fprintf(stderr, "%s: invalid type (%d)\n", __PRETTY_FUNCTION__, (int)objcValueType);
-                    ASSERT(false);
+                    ASSERT_NOT_REACHED();
             }
         }

trunk/Source/WebCore/bridge/objc/objc_utility.mm

@@ -233 +233 @@
             // Should never get here. Argument types are filtered.
             fprintf(stderr, "%s: invalid type (%d)\n", __PRETTY_FUNCTION__, (int)type);
-            ASSERT(false);
+            ASSERT_NOT_REACHED();
     }
     
@@ -299 +299 @@
                 // Unhandled type. We don't handle C structs, unions, etc.
                 // FIXME: throw an exception?
-                ASSERT(false);
+                ASSERT_NOT_REACHED();
         }
 

trunk/Source/WebCore/dom/Node.cpp

@@ -1435 +1435 @@
 RenderObject* Node::createRenderer(RenderArena*, RenderStyle*)
 {
-    ASSERT(false);
+    ASSERT_NOT_REACHED();
     return 0;
 }

trunk/Source/WebCore/loader/icon/IconDatabase.cpp

@@ -1896 +1896 @@
     if (!iconID) {
         LOG_ERROR("Failed to establish an ID for iconURL %s", urlForLogging(iconURL).ascii().data());
-        ASSERT(false);
+        ASSERT_NOT_REACHED();
         return;
     }
@@ -1913 +1913 @@
     int result = m_setIconIDForPageURLStatement->step();
     if (result != SQLResultDone) {
-        ASSERT(false);
+        ASSERT_NOT_REACHED();
         LOG_ERROR("setIconIDForPageURLQuery failed for url %s", urlForLogging(pageURL).ascii().data());
     }

trunk/Source/WebCore/platform/graphics/GraphicsContext3D.cpp

@@ -1349 +1349 @@
     }
     default:
-        ASSERT(false);
+        ASSERT_NOT_REACHED();
     }
 }

trunk/Source/WebCore/platform/text/BidiResolver.h

@@ -855 +855 @@
                         break;
                     default:
-                        ASSERT(false);
+                        ASSERT_NOT_REACHED();
                 }
                 appendRun();