Changeset 34977 in webkit for trunk/JavaScriptCore/kjs/collector.cpp

Timestamp:

Jul 3, 2008, 12:44:43 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoff.

Don't create unnecessary JSGlobalData instances.

• kjs/JSGlobalData.h:
• kjs/JSGlobalData.cpp: (KJS::JSGlobalData::threadInstanceExists): (KJS::JSGlobalData::sharedInstanceExists): (KJS::JSGlobalData::threadInstance): (KJS::JSGlobalData::sharedInstance): (KJS::JSGlobalData::threadInstanceInternal): (KJS::JSGlobalData::sharedInstanceInternal): Added methods to query instance existence.

• kjs/InitializeThreading.cpp: (KJS::initializeThreadingOnce): Initialize thread instance static in a new way.

• API/JSBase.cpp: (JSGarbageCollect):
• kjs/collector.cpp: (KJS::Heap::collect): Check for instance existence before accessing it.

File:

• trunk/JavaScriptCore/kjs/collector.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/collector.cpp

@@ -926 +926 @@
 {
 #ifndef NDEBUG
-    if (JSGlobalData::sharedInstance().heap == this) {
+    if (JSGlobalData::sharedInstanceExists() && JSGlobalData::sharedInstance().heap == this) {
         ASSERT(JSLock::lockCount() > 0);
         ASSERT(JSLock::currentThreadIsHoldingLock());