Title: [169930] trunk/Source/_javascript_Core
Revision
169930
Author
[email protected]
Date
2014-06-12 21:56:20 -0700 (Thu, 12 Jun 2014)

Log 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):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/API/JSCTestRunnerUtils.cpp (169929 => 169930)


--- trunk/Source/_javascript_Core/API/JSCTestRunnerUtils.cpp	2014-06-13 04:20:05 UTC (rev 169929)
+++ trunk/Source/_javascript_Core/API/JSCTestRunnerUtils.cpp	2014-06-13 04:56:20 UTC (rev 169930)
@@ -35,12 +35,14 @@
 JSValueRef numberOfDFGCompiles(JSContextRef context, JSValueRef theFunctionValueRef)
 {
     ExecState* exec= toJS(context);
+    JSLockHolder holder(exec);
     return toRef(exec, numberOfDFGCompiles(toJS(exec, theFunctionValueRef)));
 }
 
 JSValueRef setNeverInline(JSContextRef context, JSValueRef theFunctionValueRef)
 {
     ExecState* exec= toJS(context);
+    JSLockHolder holder(exec);
     return toRef(exec, setNeverInline(toJS(exec, theFunctionValueRef)));
 }
 

Modified: trunk/Source/_javascript_Core/ChangeLog (169929 => 169930)


--- trunk/Source/_javascript_Core/ChangeLog	2014-06-13 04:20:05 UTC (rev 169929)
+++ trunk/Source/_javascript_Core/ChangeLog	2014-06-13 04:56:20 UTC (rev 169930)
@@ -1,3 +1,17 @@
+2014-06-12  Simon Fraser  <[email protected]>
+
+        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  <[email protected]>
 
         [Win] Avoid fork bomb during build
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to