Changeset 190063 in webkit

Timestamp:

Sep 21, 2015 11:59:34 AM (9 years ago)

Author:

commit-queue@webkit.org

Message:

New tests introduced in r188545 fail on 32 bit ARM
​https://bugs.webkit.org/show_bug.cgi?id=148376

Patch by Aleksandr Skachkov <​gskachkov@gmail.com> on 2015-09-19
Reviewed by Saam Barati.

Added correct support of the ARM CPU in JIT functions that are related to arrow function.

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compileNewFunction):

• dfg/DFGSpeculativeJIT.h:

(JSC::DFG::SpeculativeJIT::callOperation):

• jit/JIT.h:
• jit/JITInlines.h:

(JSC::JIT::callOperation):

• jit/JITOpcodes.cpp:

(JSC::JIT::emitNewFuncExprCommon):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGSpeculativeJIT.cpp (modified) (4 diffs, 1 prop)
• dfg/DFGSpeculativeJIT.h (modified) (1 diff, 1 prop)
• jit/JIT.h (modified) (1 diff, 1 prop)
• jit/JITInlines.h (modified) (1 diff, 1 prop)
• jit/JITOpcodes.cpp (modified) (2 diffs, 1 prop)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-09-19 Aleksandr Skachkov   <gskachkov@gmail.com>
+
+        New tests introduced in r188545 fail on 32 bit ARM
+        https://bugs.webkit.org/show_bug.cgi?id=148376
+
+        Reviewed by Saam Barati.
+
+        Added correct support of the ARM CPU in JIT functions that are related to arrow function.
+
+
+        * dfg/DFGSpeculativeJIT.cpp:
+        (JSC::DFG::SpeculativeJIT::compileNewFunction):
+        * dfg/DFGSpeculativeJIT.h:
+        (JSC::DFG::SpeculativeJIT::callOperation):
+        * jit/JIT.h:
+        * jit/JITInlines.h:
+        (JSC::JIT::callOperation):
+        * jit/JITOpcodes.cpp:
+        (JSC::JIT::emitNewFuncExprCommon):
+
 2015-09-21  Sukolsak Sakshuwong  <sukolsak@gmail.com>
 

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

@@ -4639 +4639 @@
     
     SpeculateCellOperand scope(this, node->child1());
+#if USE(JSVALUE64)
     GPRReg thisValueGPR;
+#else
+    GPRReg thisValuePayloadGPR;
+    GPRReg thisValueTagGPR;
+#endif
     GPRReg scopeGPR = scope.gpr();
 
@@ -4645 +4650 @@
 
     if (nodeType == NewArrowFunction) {
+#if USE(JSVALUE64)
         SpeculateCellOperand thisValue(this, node->child2());
         thisValueGPR = thisValue.gpr();
+#else
+        JSValueOperand thisValue(this, node->child2(), ManualOperandSpeculation);
+        thisValuePayloadGPR = thisValue.payloadGPR();
+        thisValueTagGPR = thisValue.tagGPR();
+        
+        DFG_TYPE_CHECK(thisValue.jsValueRegs(), node->child2(), SpecCell, m_jit.branchIfNotCell(thisValue.jsValueRegs()));
+#endif
     }
 
@@ -4656 +4669 @@
         
         if (nodeType == NewArrowFunction)
+#if USE(JSVALUE64)
             callOperation(operationNewArrowFunction, resultGPR, scopeGPR, executable, thisValueGPR);
+#else
+            callOperation(operationNewArrowFunction, resultGPR, scopeGPR, executable, thisValueTagGPR, thisValuePayloadGPR);
+#endif
         else
             callOperation(operationNewFunction, resultGPR, scopeGPR, executable);
@@ -4686 +4703 @@
     if (nodeType == NewArrowFunction) {
         compileNewFunctionCommon<JSArrowFunction>(resultGPR, structure, scratch1GPR, scratch2GPR, scopeGPR, slowPath, JSArrowFunction::allocationSize(0), executable, JSArrowFunction::offsetOfScopeChain(), JSArrowFunction::offsetOfExecutable(), JSArrowFunction::offsetOfRareData());
-        
+#if USE(JSVALUE64)
         m_jit.storePtr(thisValueGPR, JITCompiler::Address(resultGPR, JSArrowFunction::offsetOfThisValue()));
-        
         addSlowPathGenerator(slowPathCall(slowPath, this, operationNewArrowFunctionWithInvalidatedReallocationWatchpoint, resultGPR, scopeGPR, executable, thisValueGPR));
+#else
+        m_jit.store32(thisValueTagGPR, MacroAssembler::Address(resultGPR, JSArrowFunction::offsetOfThisValue() + TagOffset));
+        m_jit.store32(thisValuePayloadGPR, MacroAssembler::Address(resultGPR, JSArrowFunction::offsetOfThisValue() + PayloadOffset));
+        
+        addSlowPathGenerator(slowPathCall(slowPath, this, operationNewArrowFunctionWithInvalidatedReallocationWatchpoint, resultGPR, scopeGPR, executable, thisValueTagGPR, thisValuePayloadGPR));
+#endif
     }
 

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h

@@ -1632 +1632 @@
         return appendCallSetResult(operation, resultPayload, resultTag);
     }
-    JITCompiler::Call callOperation(J_JITOperation_EJscCJ operation, GPRReg resultTag, GPRReg resultPayload, GPRReg arg1, JSCell* cell, GPRReg arg2)
-    {
-        m_jit.setupArgumentsWithExecState(arg1, TrustedImmPtr(cell), arg2);
-        return appendCallSetResult(operation, resultPayload, resultTag);
+    JITCompiler::Call callOperation(J_JITOperation_EJscCJ operation, GPRReg result, GPRReg arg1, JSCell* cell, GPRReg arg2Tag, GPRReg arg2Payload)
+    {
+        m_jit.setupArgumentsWithExecState(arg1, TrustedImmPtr(cell), EABI_32BIT_DUMMY_ARG arg2Payload, arg2Tag);
+        return appendCallSetResult(operation, result);
     }
     JITCompiler::Call callOperation(J_JITOperation_ESsiCI operation, GPRReg resultTag, GPRReg resultPayload, StructureStubInfo* stubInfo, GPRReg arg1, const UniquedStringImpl* uid)

trunk/Source/JavaScriptCore/jit/JIT.h

@@ -823 +823 @@
         MacroAssembler::Call callOperation(V_JITOperation_EJZJ, RegisterID, RegisterID, int32_t, RegisterID, RegisterID);
         MacroAssembler::Call callOperation(V_JITOperation_EZJ, int32_t, RegisterID, RegisterID);
+        MacroAssembler::Call callOperation(J_JITOperation_EJscCJ, int, GPRReg, JSCell*, GPRReg, GPRReg);
 #endif
 

trunk/Source/JavaScriptCore/jit/JITInlines.h

@@ -747 +747 @@
     return appendCallWithExceptionCheck(operation);
 }
+    
+ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(J_JITOperation_EJscCJ operation, int dst, GPRReg arg1, JSCell* cell, GPRReg arg2Tag, GPRReg arg2Payload)
+{
+    setupArgumentsWithExecState(arg1, TrustedImmPtr(cell), EABI_32BIT_DUMMY_ARG arg2Payload, arg2Tag);
+    return appendCallWithExceptionCheckSetJSValueResult(operation, dst);
+}
 
 #undef EABI_32BIT_DUMMY_ARG

trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp

@@ -996 +996 @@
 #else
     emitLoadPayload(currentInstruction[2].u.operand, regT0);
-    if (isArrowFunction)
-        emitLoadPayload(currentInstruction[4].u.operand, regT1);
+    if (isArrowFunction) {
+        int value = currentInstruction[4].u.operand;
+        emitLoad(value, regT3, regT2);
+    }
     notUndefinedScope = branch32(NotEqual, tagFor(currentInstruction[2].u.operand), TrustedImm32(JSValue::UndefinedTag));
     emitStore(dst, jsUndefined());
@@ -1006 +1008 @@
     FunctionExecutable* function = m_codeBlock->functionExpr(currentInstruction[3].u.operand);
     if (isArrowFunction)
+#if USE(JSVALUE64)
         callOperation(operationNewArrowFunction, dst, regT0, function, regT1);
+#else 
+        callOperation(operationNewArrowFunction, dst, regT0, function, regT3, regT2);
+#endif
     else
         callOperation(operationNewFunction, dst, regT0, function);