Title: [164953] trunk/Source/_javascript_Core
- Revision
- 164953
- Author
- [email protected]
- Date
- 2014-03-02 15:14:47 -0800 (Sun, 02 Mar 2014)
Log Message
Clean up use of Options::enableConcurrentJIT().
<https://webkit.org/b/129582>
Reviewed by Filip Pizlo.
DFG Driver was conditionally checking Options::enableConcurrentJIT()
only if ENABLE(CONCURRENT_JIT). Otherwise, it bypasses it with a local
enableConcurrentJIT set to false.
Instead we should configure Options::enableConcurrentJIT() to be false
in Options.cpp if !ENABLE(CONCURRENT_JIT), and DFG Driver should always
check Options::enableConcurrentJIT(). This makes the code read a little
cleaner.
* dfg/DFGDriver.cpp:
(JSC::DFG::compileImpl):
* runtime/Options.cpp:
(JSC::recomputeDependentOptions):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (164952 => 164953)
--- trunk/Source/_javascript_Core/ChangeLog 2014-03-02 23:13:46 UTC (rev 164952)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-03-02 23:14:47 UTC (rev 164953)
@@ -1,3 +1,24 @@
+2014-03-02 Mark Lam <[email protected]>
+
+ Clean up use of Options::enableConcurrentJIT().
+ <https://webkit.org/b/129582>
+
+ Reviewed by Filip Pizlo.
+
+ DFG Driver was conditionally checking Options::enableConcurrentJIT()
+ only if ENABLE(CONCURRENT_JIT). Otherwise, it bypasses it with a local
+ enableConcurrentJIT set to false.
+
+ Instead we should configure Options::enableConcurrentJIT() to be false
+ in Options.cpp if !ENABLE(CONCURRENT_JIT), and DFG Driver should always
+ check Options::enableConcurrentJIT(). This makes the code read a little
+ cleaner.
+
+ * dfg/DFGDriver.cpp:
+ (JSC::DFG::compileImpl):
+ * runtime/Options.cpp:
+ (JSC::recomputeDependentOptions):
+
2014-03-01 Filip Pizlo <[email protected]>
This shouldn't have been a layout test since it runs only under jsc. Moving it to JSC
Modified: trunk/Source/_javascript_Core/dfg/DFGDriver.cpp (164952 => 164953)
--- trunk/Source/_javascript_Core/dfg/DFGDriver.cpp 2014-03-02 23:13:46 UTC (rev 164952)
+++ trunk/Source/_javascript_Core/dfg/DFGDriver.cpp 2014-03-02 23:14:47 UTC (rev 164953)
@@ -92,13 +92,7 @@
RefPtr<Plan> plan = adoptRef(
new Plan(codeBlock, profiledDFGCodeBlock, mode, osrEntryBytecodeIndex, mustHandleValues));
- bool enableConcurrentJIT;
-#if ENABLE(CONCURRENT_JIT)
- enableConcurrentJIT = Options::enableConcurrentJIT();
-#else // ENABLE(CONCURRENT_JIT)
- enableConcurrentJIT = false;
-#endif // ENABLE(CONCURRENT_JIT)
- if (enableConcurrentJIT) {
+ if (Options::enableConcurrentJIT()) {
Worklist* worklist = ensureGlobalWorklistFor(mode);
plan->callback = callback;
if (logCompilationChanges(mode))
Modified: trunk/Source/_javascript_Core/runtime/Options.cpp (164952 => 164953)
--- trunk/Source/_javascript_Core/runtime/Options.cpp 2014-03-02 23:13:46 UTC (rev 164952)
+++ trunk/Source/_javascript_Core/runtime/Options.cpp 2014-03-02 23:14:47 UTC (rev 164953)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2011, 2012, 2014 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -186,6 +186,9 @@
#if !ENABLE(YARR_JIT)
Options::useRegExpJIT() = false;
#endif
+#if !ENABLE(CONCURRENT_JIT)
+ Options::enableConcurrentJIT() = false;
+#endif
if (Options::showDisassembly()
|| Options::showDFGDisassembly()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
