Changeset 37630 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 15, 2008, 11:41:08 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=21610
run-webkit-threads --threaded crashes in StructureID destructor

• kjs/StructureID.cpp: (JSC::StructureID::StructureID): (JSC::StructureID::~StructureID): Protect access to a static (debug-only) HashSet with a lock.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/StructureID.cpp (modified) (4 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-10-15  Alexey Proskuryakov  <[email protected]>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=21610
+        run-webkit-threads --threaded crashes in StructureID destructor
+
+        * kjs/StructureID.cpp:
+        (JSC::StructureID::StructureID):
+        (JSC::StructureID::~StructureID):
+        Protect access to a static (debug-only) HashSet with a lock.
+
 2008-10-15  Sam Weinig  <[email protected]>
 

trunk/JavaScriptCore/kjs/StructureID.cpp

@@ -34 +34 @@
 #include <wtf/RefPtr.h>
 
+#if ENABLE(JSC_MULTIPLE_THREADS)
+#include <wtf/Threading.h>
+#endif
+
 using namespace std;
 
@@ -40 +44 @@
 #ifndef NDEBUG
 static WTF::RefCountedLeakCounter structureIDCounter("StructureID");
+
+#if ENABLE(JSC_MULTIPLE_THREADS)
+static Mutex ignoreSetMutex;
+#endif
 
 static bool shouldIgnoreLeaks;
@@ -83 +91 @@
 
 #ifndef NDEBUG
+#if ENABLE(JSC_MULTIPLE_THREADS)
+    MutexLocker protect(ignoreSetMutex);
+#endif
     if (shouldIgnoreLeaks)
         ignoreSet.add(this);
@@ -116 +127 @@
 
 #ifndef NDEBUG
+#if ENABLE(JSC_MULTIPLE_THREADS)
+    MutexLocker protect(ignoreSetMutex);
+#endif
     HashSet<StructureID*>::iterator it = ignoreSet.find(this);
     if (it != ignoreSet.end())