Changeset 166524 in webkit

Timestamp:

Mar 31, 2014 2:04:03 PM (10 years ago)

Author:

benjamin@webkit.org

Message:

CSS JIT: clean up the functions ending when generating a checker with context
​https://bugs.webkit.org/show_bug.cgi?id=130959

Reviewed by Andreas Kling.

This code got refactored over time and now both branches do the exact same action
on the stack.
This patch removes the stack split and move the stack cleanup in the common ending
just before restoring the callee saved registers.

• cssjit/SelectorCompiler.cpp:

(WebCore::SelectorCompiler::SelectorCodeGenerator::generateSelectorChecker):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• cssjit/SelectorCompiler.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-31  Benjamin Poulain  <benjamin@webkit.org>
+
+        CSS JIT: clean up the functions ending when generating a checker with context
+        https://bugs.webkit.org/show_bug.cgi?id=130959
+
+        Reviewed by Andreas Kling.
+
+        This code got refactored over time and now both branches do the exact same action
+        on the stack.
+        This patch removes the stack split and move the stack cleanup in the common ending
+        just before restoring the callee saved registers.
+
+        * cssjit/SelectorCompiler.cpp:
+        (WebCore::SelectorCompiler::SelectorCodeGenerator::generateSelectorChecker):
+
 2014-03-31  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebCore/cssjit/SelectorCompiler.cpp

@@ -707 +707 @@
         m_assembler.move(Assembler::TrustedImm32(1), returnRegister);
 
-        StackAllocator successStack = m_stackAllocator;
-        StackAllocator failureStack = m_stackAllocator;
-
-        LocalRegister checkingContextRegister(m_registerAllocator);
-        successStack.popAndDiscardUpTo(m_checkingContextStackReference);
-
         // Failure.
         if (!failureCases.empty()) {
             Assembler::Jump skipFailureCase = m_assembler.jump();
-
             failureCases.link(&m_assembler);
-            failureStack.popAndDiscardUpTo(m_checkingContextStackReference);
             m_assembler.move(Assembler::TrustedImm32(0), returnRegister);
-
             skipFailureCase.link(&m_assembler);
         }
 
-        m_stackAllocator.merge(std::move(successStack), std::move(failureStack));
+        m_stackAllocator.popAndDiscardUpTo(m_checkingContextStackReference);
         m_registerAllocator.restoreCalleeSavedRegisters(m_stackAllocator);
         m_assembler.ret();