Title: [166366] trunk/Source/_javascript_Core
- Revision
- 166366
- Author
- [email protected]
- Date
- 2014-03-27 12:19:28 -0700 (Thu, 27 Mar 2014)
Log Message
Clean up questionable style in ScriptExecutable::prepareForExecutionImpl
https://bugs.webkit.org/show_bug.cgi?id=130845
Reviewed by Filip Pizlo.
There was a hack added to make sure C Loop LLInt worked which included overriding the
global Options::useLLInt setting, which makes no sense to do here. We should put the
update of the global setting in Options::recomputeDependentOptions along with the other
execution engine flags.
* runtime/Executable.cpp:
(JSC::ScriptExecutable::prepareForExecutionImpl):
* runtime/Options.cpp:
(JSC::recomputeDependentOptions):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (166365 => 166366)
--- trunk/Source/_javascript_Core/ChangeLog 2014-03-27 18:32:20 UTC (rev 166365)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-03-27 19:19:28 UTC (rev 166366)
@@ -1,3 +1,20 @@
+2014-03-27 Mark Hahnenberg <[email protected]>
+
+ Clean up questionable style in ScriptExecutable::prepareForExecutionImpl
+ https://bugs.webkit.org/show_bug.cgi?id=130845
+
+ Reviewed by Filip Pizlo.
+
+ There was a hack added to make sure C Loop LLInt worked which included overriding the
+ global Options::useLLInt setting, which makes no sense to do here. We should put the
+ update of the global setting in Options::recomputeDependentOptions along with the other
+ execution engine flags.
+
+ * runtime/Executable.cpp:
+ (JSC::ScriptExecutable::prepareForExecutionImpl):
+ * runtime/Options.cpp:
+ (JSC::recomputeDependentOptions):
+
2014-03-26 Filip Pizlo <[email protected]>
Enable LLVM stackmap liveOuts computation
Modified: trunk/Source/_javascript_Core/runtime/Executable.cpp (166365 => 166366)
--- trunk/Source/_javascript_Core/runtime/Executable.cpp 2014-03-27 18:32:20 UTC (rev 166365)
+++ trunk/Source/_javascript_Core/runtime/Executable.cpp 2014-03-27 19:19:28 UTC (rev 166366)
@@ -318,18 +318,7 @@
if (Options::validateBytecode())
codeBlock->validate();
- bool shouldUseLLInt;
-#if !ENABLE(JIT)
- // No JIT implies use of the C Loop LLINT. Override the options to reflect this.
- Options::useLLInt() = true;
- shouldUseLLInt = true;
-#elif ENABLE(LLINT)
- shouldUseLLInt = Options::useLLInt();
-#else
- shouldUseLLInt = false;
-#endif
-
- if (shouldUseLLInt)
+ if (Options::useLLInt())
setupLLInt(vm, codeBlock.get());
else
setupJIT(vm, codeBlock.get());
Modified: trunk/Source/_javascript_Core/runtime/Options.cpp (166365 => 166366)
--- trunk/Source/_javascript_Core/runtime/Options.cpp 2014-03-27 18:32:20 UTC (rev 166365)
+++ trunk/Source/_javascript_Core/runtime/Options.cpp 2014-03-27 19:19:28 UTC (rev 166366)
@@ -185,10 +185,14 @@
static void recomputeDependentOptions()
{
#if !ENABLE(JIT)
+ Options::useLLInt() = true;
Options::useJIT() = false;
Options::useDFGJIT() = false;
Options::useFTLJIT() = false;
#endif
+#if !ENABLE(LLINT)
+ Options::useLLInt() = false;
+#endif
#if !ENABLE(YARR_JIT)
Options::useRegExpJIT() = false;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
