Changeset 38665 in webkit for trunk/JavaScriptCore

Timestamp:

Nov 21, 2008, 10:49:03 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Sam Weinig.

​https://bugs.webkit.org/show_bug.cgi?id=22402
Replace abort() with CRASH()

• wtf/Assertions.h: Added abort() after an attempt to crash for extra safety.

• runtime/Collector.cpp:
• wtf/FastMalloc.cpp:
• wtf/FastMalloc.h:
• wtf/TCSpinLock.h: Replace abort() with CRASH().

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/Collector.cpp (modified) (2 diffs)
• wtf/Assertions.h (modified) (2 diffs)
• wtf/FastMalloc.cpp (modified) (15 diffs)
• wtf/FastMalloc.h (modified) (1 diff)
• wtf/TCSpinLock.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-11-21  Alexey Proskuryakov  <[email protected]>
+
+        Reviewed by Sam Weinig.
+
+        https://bugs.webkit.org/show_bug.cgi?id=22402
+        Replace abort() with CRASH()
+
+        * wtf/Assertions.h: Added abort() after an attempt to crash for extra safety.
+
+        * runtime/Collector.cpp:
+        * wtf/FastMalloc.cpp:
+        * wtf/FastMalloc.h:
+        * wtf/TCSpinLock.h:
+        Replace abort() with CRASH().
+
 2008-11-21  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/runtime/Collector.cpp

@@ -284 +284 @@
     ASSERT(heapType == PrimaryHeap || heap.extraCost == 0);
     // FIXME: If another global variable access here doesn't hurt performance
-    // too much, we could abort() in NDEBUG builds, which could help ensure we
+    // too much, we could CRASH() in NDEBUG builds, which could help ensure we
     // don't spend any time debugging cases where we allocate inside an object's
     // deallocation code.
@@ -975 +975 @@
     ASSERT((primaryHeap.operationInProgress == NoOperation) | (numberHeap.operationInProgress == NoOperation));
     if ((primaryHeap.operationInProgress != NoOperation) | (numberHeap.operationInProgress != NoOperation))
-        abort();
+        CRASH();
 
     JAVASCRIPTCORE_GC_BEGIN();

trunk/JavaScriptCore/wtf/Assertions.h

@@ -51 +51 @@
 #endif
 
+#include <stdlib.h>
+
 #ifdef NDEBUG
 #define ASSERTIONS_DISABLED_DEFAULT 1
@@ -121 +123 @@
 
 #ifndef CRASH
-#define CRASH() *(int *)(uintptr_t)0xbbadbeef = 0
+#define CRASH() do { \
+    *(int *)(uintptr_t)0xbbadbeef = 0; \
+    abort(); \
+} while (false)
 #endif
 

trunk/JavaScriptCore/wtf/FastMalloc.cpp

@@ -192 +192 @@
     void* result = malloc(n);
     if (!result)
-        abort();
+        CRASH();
     return result;
 }
@@ -207 +207 @@
     void* result = calloc(n_elements, element_size);
     if (!result)
-        abort();
+        CRASH();
     return result;
 }
@@ -228 +228 @@
     void* result = realloc(p, n);
     if (!result)
-        abort();
+        CRASH();
     return result;
 }
@@ -687 +687 @@
   if (ClassIndex(0) < 0) {
     MESSAGE("Invalid class index %d for size 0\n", ClassIndex(0));
-    abort();
+    CRASH();
   }
   if (static_cast<size_t>(ClassIndex(kMaxSize)) >= sizeof(class_array)) {
     MESSAGE("Invalid class index %d for kMaxSize\n", ClassIndex(kMaxSize));
-    abort();
+    CRASH();
   }
 
@@ -743 +743 @@
     MESSAGE("wrong number of size classes: found %" PRIuS " instead of %d\n",
             sc, int(kNumClasses));
-    abort();
+    CRASH();
   }
 
@@ -761 +761 @@
     if (sc == 0) {
       MESSAGE("Bad size class %" PRIuS " for %" PRIuS "\n", sc, size);
-      abort();
+      CRASH();
     }
     if (sc > 1 && size <= class_to_size[sc-1]) {
       MESSAGE("Allocating unnecessarily large class %" PRIuS " for %" PRIuS
               "\n", sc, size);
-      abort();
+      CRASH();
     }
     if (sc >= kNumClasses) {
       MESSAGE("Bad size class %" PRIuS " for %" PRIuS "\n", sc, size);
-      abort();
+      CRASH();
     }
     const size_t s = class_to_size[sc];
     if (size > s) {
      MESSAGE("Bad size %" PRIuS " for %" PRIuS " (sc = %" PRIuS ")\n", s, size, sc);
-      abort();
+      CRASH();
     }
     if (s == 0) {
       MESSAGE("Bad size %" PRIuS " for %" PRIuS " (sc = %" PRIuS ")\n", s, size, sc);
-      abort();
+      CRASH();
     }
   }
@@ -862 +862 @@
         // Need more room
         free_area_ = reinterpret_cast<char*>(MetaDataAlloc(kAllocIncrement));
-        if (free_area_ == NULL) abort();
+        if (free_area_ == NULL) CRASH();
         free_avail_ = kAllocIncrement;
       }
@@ -3024 +3024 @@
 
 #ifdef WTF_CHANGES
-template <bool abortOnFailure>
+template <bool crashOnFailure>
 #endif
 static ALWAYS_INLINE void* do_malloc(size_t size) {
@@ -3057 +3057 @@
   if (!ret) {
 #ifdef WTF_CHANGES
-    if (abortOnFailure) // This branch should be optimized out by the compiler.
-        abort();
+    if (crashOnFailure) // This branch should be optimized out by the compiler.
+        CRASH();
 #else
     errno = ENOMEM;
@@ -3227 +3227 @@
 extern "C" 
 #else
-#define do_malloc do_malloc<abortOnFailure>
-
-template <bool abortOnFailure>
+#define do_malloc do_malloc<crashOnFailure>
+
+template <bool crashOnFailure>
 void* malloc(size_t);
 
@@ -3242 +3242 @@
 }
 
-template <bool abortOnFailure>
+template <bool crashOnFailure>
 ALWAYS_INLINE
 #endif
@@ -3266 +3266 @@
 extern "C" 
 #else
-template <bool abortOnFailure>
+template <bool crashOnFailure>
 void* calloc(size_t, size_t);
 
@@ -3279 +3279 @@
 }
 
-template <bool abortOnFailure>
+template <bool crashOnFailure>
 ALWAYS_INLINE
 #endif
@@ -3312 +3312 @@
 extern "C" 
 #else
-template <bool abortOnFailure>
+template <bool crashOnFailure>
 void* realloc(void*, size_t);
 
@@ -3325 +3325 @@
 }
 
-template <bool abortOnFailure>
+template <bool crashOnFailure>
 ALWAYS_INLINE
 #endif

trunk/JavaScriptCore/wtf/FastMalloc.h

@@ -28 +28 @@
 namespace WTF {
 
-    // These functions call abort() if an allocation fails.
+    // These functions call CRASH() if an allocation fails.
     void* fastMalloc(size_t n);
     void* fastZeroedMalloc(size_t n);

trunk/JavaScriptCore/wtf/TCSpinLock.h

@@ -47 +47 @@
 #include <sys/types.h>
 #endif
-#include <stdlib.h>     /* for abort() */
 
 #if PLATFORM(WIN_OS)
@@ -200 +199 @@
 
   inline void Init() {
-    if (pthread_mutex_init(&private_lock_, NULL) != 0) abort();
+    if (pthread_mutex_init(&private_lock_, NULL) != 0) CRASH();
   }
   inline void Finalize() {
-    if (pthread_mutex_destroy(&private_lock_) != 0) abort();
+    if (pthread_mutex_destroy(&private_lock_) != 0) CRASH();
   }
   inline void Lock() {
-    if (pthread_mutex_lock(&private_lock_) != 0) abort();
+    if (pthread_mutex_lock(&private_lock_) != 0) CRASH();
   }
   inline void Unlock() {
-    if (pthread_mutex_unlock(&private_lock_) != 0) abort();
+    if (pthread_mutex_unlock(&private_lock_) != 0) CRASH();
   }
 };