[webkit-changes] [169363] trunk/Source/WebCore

[commit-queue]

Title: [169363] trunk/Source/WebCore

Revision

169363

Author

commit-qu...@webkit.org

Date

2014-05-26 17:19:17 -0700 (Mon, 26 May 2014)

Log Message

CSS JIT: Fix build error raised when CSS_SELECTOR_JIT_DEBUGGING is 1
https://bugs.webkit.org/show_bug.cgi?id=133266

Patch by Yusuke Suzuki <utatane....@gmail.com> on 2014-05-26
Reviewed by Benjamin Poulain.

When CSS_SELECTOR_JIT_DEBUGGING is 1, build erros occur on x86_64.

* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::SelectorCodeGenerator::generatePrologue):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateEpilogue):

Modified Paths

• trunk/Source/WebCore/ChangeLog
• trunk/Source/WebCore/cssjit/SelectorCompiler.cpp

Diff

Modified: trunk/Source/WebCore/ChangeLog (169362 => 169363)

--- trunk/Source/WebCore/ChangeLog	2014-05-27 00:02:34 UTC (rev 169362)
+++ trunk/Source/WebCore/ChangeLog	2014-05-27 00:19:17 UTC (rev 169363)
@@ -1,3 +1,16 @@
+2014-05-26  Yusuke Suzuki  <utatane....@gmail.com>
+
+        CSS JIT: Fix build error raised when CSS_SELECTOR_JIT_DEBUGGING is 1
+        https://bugs.webkit.org/show_bug.cgi?id=133266
+
+        Reviewed by Benjamin Poulain.
+
+        When CSS_SELECTOR_JIT_DEBUGGING is 1, build erros occur on x86_64.
+
+        * cssjit/SelectorCompiler.cpp:
+        (WebCore::SelectorCompiler::SelectorCodeGenerator::generatePrologue):
+        (WebCore::SelectorCompiler::SelectorCodeGenerator::generateEpilogue):
+
 2014-05-26  Benjamin Poulain  <benja...@webkit.org>
 
         Fix the quirks mode selector matching of the pseudo classes :hover and :active

Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (169362 => 169363)

--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp	2014-05-27 00:02:34 UTC (rev 169362)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp	2014-05-27 00:19:17 UTC (rev 169363)
@@ -45,6 +45,7 @@
 #include "SelectorCheckerTestFunctions.h"
 #include "StackAllocator.h"
 #include "StyledElement.h"
+#include <_javascript_Core/GPRInfo.h>
 #include <_javascript_Core/LinkBuffer.h>
 #include <_javascript_Core/MacroAssembler.h>
 #include <_javascript_Core/VM.h>
@@ -174,9 +175,10 @@
     SelectorCompilationStatus compile(JSC::VM*, JSC::MacroAssemblerCodeRef&);
 
 private:
-    static const Assembler::RegisterID returnRegister = JSC::GPRInfo::returnValueGPR;
-    static const Assembler::RegisterID elementAddressRegister = JSC::GPRInfo::argumentGPR0;
-    static const Assembler::RegisterID checkingContextRegister = JSC::GPRInfo::argumentGPR1;
+    static const Assembler::RegisterID returnRegister;
+    static const Assembler::RegisterID elementAddressRegister;
+    static const Assembler::RegisterID checkingContextRegister;
+    static const Assembler::RegisterID callFrameRegister;
 
     void computeBacktrackingInformation();
     void generateSelectorChecker();
@@ -259,6 +261,11 @@
 #endif
 };
 
+const Assembler::RegisterID SelectorCodeGenerator::returnRegister = JSC::GPRInfo::returnValueGPR;
+const Assembler::RegisterID SelectorCodeGenerator::elementAddressRegister = JSC::GPRInfo::argumentGPR0;
+const Assembler::RegisterID SelectorCodeGenerator::checkingContextRegister = JSC::GPRInfo::argumentGPR1;
+const Assembler::RegisterID SelectorCodeGenerator::callFrameRegister = JSC::GPRInfo::callFrameRegister;
+
 SelectorCompilationStatus compileSelector(const CSSSelector* lastSelector, JSC::VM* vm, SelectorContext selectorContext, JSC::MacroAssemblerCodeRef& codeRef)
 {
     if (!vm->canUseJIT())
@@ -939,7 +946,7 @@
     return true;
 #elif CPU(X86_64) && CSS_SELECTOR_JIT_DEBUGGING
     Vector<JSC::MacroAssembler::RegisterID, 1> prologueRegister;
-    prologueRegister.append(GPRInfo::callFrameRegister);
+    prologueRegister.append(callFrameRegister);
     m_prologueStackReferences = m_stackAllocator.push(prologueRegister);
     return true;
 #endif
@@ -955,7 +962,7 @@
     m_stackAllocator.pop(m_prologueStackReferences, prologueRegisters);
 #elif CPU(X86_64) && CSS_SELECTOR_JIT_DEBUGGING
     Vector<JSC::MacroAssembler::RegisterID, 1> prologueRegister;
-    prologueRegister.append(GPRInfo::callFrameRegister);
+    prologueRegister.append(callFrameRegister);
     m_stackAllocator.pop(m_prologueStackReferences, prologueRegister);
 #endif
 }

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes