Changeset 18888 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Jan 16, 2007, 1:07:54 PM (18 years ago)

Author:

ggaren

Message:

Reviewed by Darin Adler.

Added re-entrency checking to GC allocation and collection. It is an error
to allocate or collect from within a collection. We've had at least one
case of each bug in the past.

Added a comment to the API header, explaining that API clients must not
make this mistake, either.

Layout tests and JS tests pass.

• API/JSObjectRef.h:
• kjs/collector.cpp: (KJS::GCLock::GCLock): (KJS::GCLock::~GCLock): (KJS::Collector::allocate): (KJS::Collector::collect):

File:

• trunk/JavaScriptCore/kjs/collector.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/collector.cpp

@@ -111 +111 @@
 bool Collector::memoryFull = false;
 
+#ifndef NDEBUG
+class GCLock {
+    static bool isLocked;
+
+public:
+    GCLock()
+    {
+        ASSERT(!isLocked);
+        isLocked = true;
+    }
+    
+    ~GCLock()
+    {
+        ASSERT(isLocked);
+        isLocked = false;
+    }
+};
+
+bool GCLock::isLocked = false;
+#endif
+
 void* Collector::allocate(size_t s)
 {
@@ -124 +145 @@
     numLiveObjects = heap.numLiveObjects;
   }
+  
+#ifndef NDEBUG
+  GCLock lock;
+#endif
   
   if (s > CELL_SIZE) {
@@ -463 +488 @@
   assert(JSLock::lockCount() > 0);
 
+#ifndef NDEBUG
+  GCLock lock;
+#endif
+  
 #if USE(MULTIPLE_THREADS)
     bool currentThreadIsMainThread = !pthread_is_threaded_np() || pthread_main_np();