Title: [159914] releases/WebKitGTK/webkit-2.2/Source/_javascript_Core
- Revision
- 159914
- Author
- [email protected]
- Date
- 2013-12-02 00:59:22 -0800 (Mon, 02 Dec 2013)
Log Message
Merge r158687 - Fix register allocation inside control flow in GetByVal String
https://bugs.webkit.org/show_bug.cgi?id=123816
Reviewed by Geoffrey Garen.
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileGetByValOnString):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.2/Source/_javascript_Core/ChangeLog (159913 => 159914)
--- releases/WebKitGTK/webkit-2.2/Source/_javascript_Core/ChangeLog 2013-12-02 07:48:48 UTC (rev 159913)
+++ releases/WebKitGTK/webkit-2.2/Source/_javascript_Core/ChangeLog 2013-12-02 08:59:22 UTC (rev 159914)
@@ -1,3 +1,13 @@
+2013-11-05 Filip Pizlo <[email protected]>
+
+ Fix register allocation inside control flow in GetByVal String
+ https://bugs.webkit.org/show_bug.cgi?id=123816
+
+ Reviewed by Geoffrey Garen.
+
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileGetByValOnString):
+
2013-09-17 Mark Hahnenberg <[email protected]>
DFG doesn't properly keep scope alive for op_put_to_scope
Modified: releases/WebKitGTK/webkit-2.2/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp (159913 => 159914)
--- releases/WebKitGTK/webkit-2.2/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2013-12-02 07:48:48 UTC (rev 159913)
+++ releases/WebKitGTK/webkit-2.2/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2013-12-02 08:59:22 UTC (rev 159914)
@@ -2097,17 +2097,9 @@
// 8 bit string values don't need the isASCII check.
cont8Bit.link(&m_jit);
-#if CPU(X86)
- // Don't have enough register, construct our own indexed address and load.
- m_jit.lshift32(MacroAssembler::TrustedImm32(2), scratchReg);
+ m_jit.lshift32(MacroAssembler::TrustedImm32(sizeof(void*) == 4 ? 2 : 3), scratchReg);
m_jit.addPtr(MacroAssembler::TrustedImmPtr(m_jit.vm()->smallStrings.singleCharacterStrings()), scratchReg);
m_jit.loadPtr(scratchReg, scratchReg);
-#else
- GPRTemporary smallStrings(this);
- GPRReg smallStringsReg = smallStrings.gpr();
- m_jit.move(MacroAssembler::TrustedImmPtr(m_jit.vm()->smallStrings.singleCharacterStrings()), smallStringsReg);
- m_jit.loadPtr(MacroAssembler::BaseIndex(smallStringsReg, scratchReg, MacroAssembler::ScalePtr, 0), scratchReg);
-#endif
addSlowPathGenerator(
slowPathCall(
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
