Changeset 169930 in webkit

Timestamp:

Jun 12, 2014, 9:56:20 PM (12 years ago)

Author:

Simon Fraser

Message:

Fix assertions under JSC::setNeverInline() when running js tests in WebKitTestRunner
​https://bugs.webkit.org/show_bug.cgi?id=133840

Reviewed by Filip Pizlo.

Fix ASSERT(exec->vm().currentThreadIsHoldingAPILock()); under JSC::setNeverInline()
when running DFG tests.

• API/JSCTestRunnerUtils.cpp:

(JSC::numberOfDFGCompiles):
(JSC::setNeverInline):

Location:

trunk/Source/JavaScriptCore

Files:

• API/JSCTestRunnerUtils.cpp (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSCTestRunnerUtils.cpp

@@ -36 +36 @@
 {
     ExecState* exec= toJS(context);
+    JSLockHolder holder(exec);
     return toRef(exec, numberOfDFGCompiles(toJS(exec, theFunctionValueRef)));
 }
@@ -42 +43 @@
 {
     ExecState* exec= toJS(context);
+    JSLockHolder holder(exec);
     return toRef(exec, setNeverInline(toJS(exec, theFunctionValueRef)));
 }

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-06-12  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix assertions under JSC::setNeverInline() when running js tests in WebKitTestRunner
+        https://bugs.webkit.org/show_bug.cgi?id=133840
+
+        Reviewed by Filip Pizlo.
+        
+        Fix ASSERT(exec->vm().currentThreadIsHoldingAPILock()); under JSC::setNeverInline()
+        when running DFG tests.
+
+        * API/JSCTestRunnerUtils.cpp:
+        (JSC::numberOfDFGCompiles):
+        (JSC::setNeverInline):
+
 2014-06-12  Brent Fulgham  <bfulgham@apple.com>