Changeset 127719 in webkit

Timestamp:

Sep 6, 2012 3:13:14 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Renamed useYarrJIT() option to useRegExpJIT(). Also fixed regression in
which inadvertantly allows the ASM llint to use the baseline JIT when
useRegExpJIT() is true.
​https://bugs.webkit.org/show_bug.cgi?id=95918.

Patch by Mark Lam <​mark.lam@apple.com> on 2012-09-06
Reviewed by Geoffrey Garen.

• runtime/JSGlobalData.cpp:

(JSC::enableAssembler):
(JSC::JSGlobalData::JSGlobalData):

• runtime/JSGlobalData.h:

(JSC::JSGlobalData::canUseJIT):
(JSC::JSGlobalData::canUseRegExpJIT):
(JSGlobalData):

• runtime/Options.cpp:

(JSC::Options::initialize):

• runtime/Options.h:

(JSC):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSGlobalData.cpp (modified) (2 diffs)
• runtime/JSGlobalData.h (modified) (3 diffs)
• runtime/Options.cpp (modified) (1 diff)
• runtime/Options.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-09-06  Mark Lam  <mark.lam@apple.com>
+
+        Renamed useYarrJIT() option to useRegExpJIT(). Also fixed regression in
+        which inadvertantly allows the ASM llint to use the baseline JIT when
+        useRegExpJIT() is true.
+        https://bugs.webkit.org/show_bug.cgi?id=95918.
+
+        Reviewed by Geoffrey Garen.
+
+        * runtime/JSGlobalData.cpp:
+        (JSC::enableAssembler):
+        (JSC::JSGlobalData::JSGlobalData):
+        * runtime/JSGlobalData.h:
+        (JSC::JSGlobalData::canUseJIT):
+        (JSC::JSGlobalData::canUseRegExpJIT):
+        (JSGlobalData):
+        * runtime/Options.cpp:
+        (JSC::Options::initialize):
+        * runtime/Options.h:
+        (JSC):
+
 2012-09-06  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp

@@ -101 +101 @@
 static bool enableAssembler(ExecutableAllocator& executableAllocator)
 {
-    if (!executableAllocator.isValid() || (!Options::useJIT() && !Options::useYarrJIT()))
+    if (!executableAllocator.isValid() || (!Options::useJIT() && !Options::useRegExpJIT()))
         return false;
 
@@ -183 +183 @@
 #if ENABLE(ASSEMBLER) && (ENABLE(CLASSIC_INTERPRETER) || ENABLE(LLINT))
     , m_canUseAssembler(enableAssembler(executableAllocator))
+    , m_canUseJIT(m_canUseAssembler && Options::useJIT())
+    , m_canUseRegExpJIT(m_canUseAssembler && Options::useRegExpJIT())
 #endif
 #if ENABLE(GC_VALIDATION)

trunk/Source/JavaScriptCore/runtime/JSGlobalData.h

@@ -285 +285 @@
         bool canUseJIT() { return true; } // jit only
 #else
-        bool canUseJIT() { return m_canUseAssembler; }
+        bool canUseJIT() { return m_canUseJIT; }
 #endif
 
@@ -293 +293 @@
         bool canUseRegExpJIT() { return true; } // jit only
 #else
-        bool canUseRegExpJIT() { return m_canUseAssembler; }
+        bool canUseRegExpJIT() { return m_canUseRegExpJIT; }
 #endif
 
@@ -442 +442 @@
 #if ENABLE(ASSEMBLER) && (ENABLE(CLASSIC_INTERPRETER) || ENABLE(LLINT))
         bool m_canUseAssembler;
+        bool m_canUseJIT;
+        bool m_canUseRegExpJIT;
 #endif
 #if ENABLE(GC_VALIDATION)

trunk/Source/JavaScriptCore/runtime/Options.cpp

@@ -144 +144 @@
 #endif
 #if !ENABLE(YARR_JIT)
-    useYarrJIT() = false;
+    useRegExpJIT() = false;
 #endif
 

trunk/Source/JavaScriptCore/runtime/Options.h

@@ -66 +66 @@
     v(bool, useJIT,    true) \
     v(bool, useDFGJIT, true) \
-    v(bool, useYarrJIT, true) \
+    v(bool, useRegExpJIT, true) \
     \
     /* showDisassembly implies showDFGDisassembly. */ \