runJITThreadLimitTests is failing
authorHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 25 Jul 2018 05:29:42 +0000 (05:29 +0000)
committerHironori.Fujii@sony.com <Hironori.Fujii@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 25 Jul 2018 05:29:42 +0000 (05:29 +0000)
https://bugs.webkit.org/show_bug.cgi?id=187886
<rdar://problem/42561966>

Unreviewed build fix for MSVC.

MSVC doen't support ternary operator without second operand.

* dfg/DFGWorklist.cpp:
(JSC::DFG::getNumberOfDFGCompilerThreads):
(JSC::DFG::getNumberOfFTLCompilerThreads):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234190 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/dfg/DFGWorklist.cpp

index a784ca9..33ee8b5 100644 (file)
@@ -1,3 +1,17 @@
+2018-07-24  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        runJITThreadLimitTests is failing
+        https://bugs.webkit.org/show_bug.cgi?id=187886
+        <rdar://problem/42561966>
+
+        Unreviewed build fix for MSVC.
+
+        MSVC doen't support ternary operator without second operand.
+
+        * dfg/DFGWorklist.cpp:
+        (JSC::DFG::getNumberOfDFGCompilerThreads):
+        (JSC::DFG::getNumberOfFTLCompilerThreads):
+
 2018-07-24  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r234183.
index 31acbc5..309fca5 100644 (file)
@@ -535,12 +535,12 @@ static unsigned numberOfFTLCompilerThreads;
 
 static unsigned getNumberOfDFGCompilerThreads()
 {
-    return numberOfDFGCompilerThreads ?: Options::numberOfDFGCompilerThreads();
+    return numberOfDFGCompilerThreads ? numberOfDFGCompilerThreads : Options::numberOfDFGCompilerThreads();
 }
 
 static unsigned getNumberOfFTLCompilerThreads()
 {
-    return numberOfFTLCompilerThreads ?: Options::numberOfFTLCompilerThreads();
+    return numberOfFTLCompilerThreads ? numberOfFTLCompilerThreads : Options::numberOfFTLCompilerThreads();
 }
 
 unsigned setNumberOfDFGCompilerThreads(unsigned numberOfThreads)