Changeset 249499 in webkit

Timestamp:

Sep 4, 2019, 2:12:47 PM (6 years ago)

Author:

mark.lam@apple.com

Message:

Structure::storedPrototype() and storedPrototypeObject() should assert with isCompilationThread(), not !isMainThread().
​https://bugs.webkit.org/show_bug.cgi?id=201449

Reviewed by Yusuke Suzuki.

Using !isMainThread() in the assertion also disables the assertion for the mutator
of worker threads. This is not what we intended.

• runtime/StructureInlines.h:

(JSC::Structure::storedPrototype const):
(JSC::Structure::storedPrototypeObject const):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/StructureInlines.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-09-03  Mark Lam  <mark.lam@apple.com>
+
+        Structure::storedPrototype() and storedPrototypeObject() should assert with isCompilationThread(), not !isMainThread().
+        https://bugs.webkit.org/show_bug.cgi?id=201449
+
+        Reviewed by Yusuke Suzuki.
+
+        Using !isMainThread() in the assertion also disables the assertion for the mutator
+        of worker threads.  This is not what we intended.
+
+        * runtime/StructureInlines.h:
+        (JSC::Structure::storedPrototype const):
+        (JSC::Structure::storedPrototypeObject const):
+
 2019-09-04  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/runtime/StructureInlines.h

@@ -33 +33 @@
 #include "StructureChain.h"
 #include "StructureRareDataInlines.h"
+#include <wtf/Threading.h>
 
 namespace JSC {
@@ -109 +110 @@
 ALWAYS_INLINE JSValue Structure::storedPrototype(const JSObject* object) const
 {
-    ASSERT(!isMainThread() || object->structure() == this);
+    ASSERT(isCompilationThread() || Thread::mayBeGCThread() || object->structure() == this);
     if (hasMonoProto())
         return storedPrototype();
@@ -117 +118 @@
 ALWAYS_INLINE JSObject* Structure::storedPrototypeObject(const JSObject* object) const
 {
-    ASSERT(!isMainThread() || object->structure() == this);
+    ASSERT(isCompilationThread() || Thread::mayBeGCThread() || object->structure() == this);
     if (hasMonoProto())
         return storedPrototypeObject();