Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (191528 => 191529)
--- trunk/Source/_javascript_Core/ChangeLog 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-10-24 01:26:22 UTC (rev 191529)
@@ -1,3 +1,17 @@
+2015-10-23 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r191500.
+ https://bugs.webkit.org/show_bug.cgi?id=150526
+
+ Broke two JSC regression tests (Requested by msaboff on
+ #webkit).
+
+ Reverted changeset:
+
+ "[ES6] Add DFG/FTL support for accessor put operations"
+ https://bugs.webkit.org/show_bug.cgi?id=148860
+ http://trac.webkit.org/changeset/191500
+
2015-10-23 Yusuke Suzuki <[email protected]>
[ES6] Add DFG/FTL support for accessor put operations
Modified: trunk/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h (191528 => 191529)
--- trunk/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h 2015-10-24 01:26:22 UTC (rev 191529)
@@ -2363,15 +2363,6 @@
clobberWorld(node->origin.semantic, clobberLimit);
break;
}
-
- case PutGetterById:
- case PutSetterById:
- case PutGetterSetterById:
- case PutGetterByVal:
- case PutSetterByVal: {
- clobberWorld(node->origin.semantic, clobberLimit);
- break;
- }
case In: {
// FIXME: We can determine when the property definitely exists based on abstract
Modified: trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp (191528 => 191529)
--- trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp 2015-10-24 01:26:22 UTC (rev 191529)
@@ -3749,38 +3749,6 @@
NEXT_OPCODE(op_put_by_id);
}
- case op_put_getter_by_id:
- case op_put_setter_by_id: {
- Node* base = get(VirtualRegister(currentInstruction[1].u.operand));
- unsigned identifierNumber = m_inlineStackTop->m_identifierRemap[currentInstruction[2].u.operand];
- unsigned attributes = currentInstruction[3].u.operand;
- Node* accessor = get(VirtualRegister(currentInstruction[4].u.operand));
- NodeType op = (opcodeID == op_put_getter_by_id) ? PutGetterById : PutSetterById;
- addToGraph(op, OpInfo(identifierNumber), OpInfo(attributes), base, accessor);
- NEXT_OPCODE(op_put_getter_by_id);
- }
-
- case op_put_getter_setter: {
- Node* base = get(VirtualRegister(currentInstruction[1].u.operand));
- unsigned identifierNumber = m_inlineStackTop->m_identifierRemap[currentInstruction[2].u.operand];
- unsigned attributes = currentInstruction[3].u.operand;
- Node* getter = get(VirtualRegister(currentInstruction[4].u.operand));
- Node* setter = get(VirtualRegister(currentInstruction[5].u.operand));
- addToGraph(PutGetterSetterById, OpInfo(identifierNumber), OpInfo(attributes), base, getter, setter);
- NEXT_OPCODE(op_put_getter_setter);
- }
-
- case op_put_getter_by_val:
- case op_put_setter_by_val: {
- Node* base = get(VirtualRegister(currentInstruction[1].u.operand));
- Node* subscript = get(VirtualRegister(currentInstruction[2].u.operand));
- unsigned attributes = currentInstruction[3].u.operand;
- Node* accessor = get(VirtualRegister(currentInstruction[4].u.operand));
- NodeType op = (opcodeID == op_put_getter_by_val) ? PutGetterByVal : PutSetterByVal;
- addToGraph(op, OpInfo(attributes), base, subscript, accessor);
- NEXT_OPCODE(op_put_getter_by_val);
- }
-
case op_profile_type: {
Node* valueToProfile = get(VirtualRegister(currentInstruction[1].u.operand));
addToGraph(ProfileType, OpInfo(currentInstruction[2].u.location), valueToProfile);
Modified: trunk/Source/_javascript_Core/dfg/DFGCapabilities.cpp (191528 => 191529)
--- trunk/Source/_javascript_Core/dfg/DFGCapabilities.cpp 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/dfg/DFGCapabilities.cpp 2015-10-24 01:26:22 UTC (rev 191529)
@@ -154,11 +154,6 @@
case op_get_by_id:
case op_get_array_length:
case op_put_by_id:
- case op_put_getter_by_id:
- case op_put_setter_by_id:
- case op_put_getter_setter:
- case op_put_getter_by_val:
- case op_put_setter_by_val:
case op_jmp:
case op_jtrue:
case op_jfalse:
Modified: trunk/Source/_javascript_Core/dfg/DFGClobberize.h (191528 => 191529)
--- trunk/Source/_javascript_Core/dfg/DFGClobberize.h 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/dfg/DFGClobberize.h 2015-10-24 01:26:22 UTC (rev 191529)
@@ -379,11 +379,6 @@
case PutById:
case PutByIdFlush:
case PutByIdDirect:
- case PutGetterById:
- case PutSetterById:
- case PutGetterSetterById:
- case PutGetterByVal:
- case PutSetterByVal:
case ArrayPush:
case ArrayPop:
case Call:
Modified: trunk/Source/_javascript_Core/dfg/DFGDoesGC.cpp (191528 => 191529)
--- trunk/Source/_javascript_Core/dfg/DFGDoesGC.cpp 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/dfg/DFGDoesGC.cpp 2015-10-24 01:26:22 UTC (rev 191529)
@@ -95,11 +95,6 @@
case PutById:
case PutByIdFlush:
case PutByIdDirect:
- case PutGetterById:
- case PutSetterById:
- case PutGetterSetterById:
- case PutGetterByVal:
- case PutSetterByVal:
case CheckStructure:
case GetExecutable:
case GetButterfly:
Modified: trunk/Source/_javascript_Core/dfg/DFGFixupPhase.cpp (191528 => 191529)
--- trunk/Source/_javascript_Core/dfg/DFGFixupPhase.cpp 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/dfg/DFGFixupPhase.cpp 2015-10-24 01:26:22 UTC (rev 191529)
@@ -1057,25 +1057,6 @@
break;
}
- case PutGetterById:
- case PutSetterById: {
- fixEdge<KnownCellUse>(node->child1());
- fixEdge<KnownCellUse>(node->child2());
- break;
- }
-
- case PutGetterSetterById: {
- fixEdge<KnownCellUse>(node->child1());
- break;
- }
-
- case PutGetterByVal:
- case PutSetterByVal: {
- fixEdge<KnownCellUse>(node->child1());
- fixEdge<KnownCellUse>(node->child3());
- break;
- }
-
case GetExecutable: {
fixEdge<FunctionUse>(node->child1());
break;
Modified: trunk/Source/_javascript_Core/dfg/DFGNode.h (191528 => 191529)
--- trunk/Source/_javascript_Core/dfg/DFGNode.h 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/dfg/DFGNode.h 2015-10-24 01:26:22 UTC (rev 191529)
@@ -853,9 +853,6 @@
case PutById:
case PutByIdFlush:
case PutByIdDirect:
- case PutGetterById:
- case PutSetterById:
- case PutGetterSetterById:
return true;
default:
return false;
@@ -867,37 +864,6 @@
ASSERT(hasIdentifier());
return m_opInfo;
}
-
- bool hasAccessorAttributes()
- {
- switch (op()) {
- case PutGetterById:
- case PutSetterById:
- case PutGetterSetterById:
- case PutGetterByVal:
- case PutSetterByVal:
- return true;
- default:
- return false;
- }
- }
-
- int32_t accessorAttributes()
- {
- ASSERT(hasAccessorAttributes());
- switch (op()) {
- case PutGetterById:
- case PutSetterById:
- case PutGetterSetterById:
- return m_opInfo2;
- case PutGetterByVal:
- case PutSetterByVal:
- return m_opInfo;
- default:
- RELEASE_ASSERT_NOT_REACHED();
- return 0;
- }
- }
bool hasPromotedLocationDescriptor()
{
Modified: trunk/Source/_javascript_Core/dfg/DFGNodeType.h (191528 => 191529)
--- trunk/Source/_javascript_Core/dfg/DFGNodeType.h 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/dfg/DFGNodeType.h 2015-10-24 01:26:22 UTC (rev 191529)
@@ -179,13 +179,8 @@
macro(GetById, NodeResultJS | NodeMustGenerate) \
macro(GetByIdFlush, NodeResultJS | NodeMustGenerate) \
macro(PutById, NodeMustGenerate) \
- macro(PutByIdFlush, NodeMustGenerate) \
+ macro(PutByIdFlush, NodeMustGenerate | NodeMustGenerate) \
macro(PutByIdDirect, NodeMustGenerate) \
- macro(PutGetterById, NodeMustGenerate) \
- macro(PutSetterById, NodeMustGenerate) \
- macro(PutGetterSetterById, NodeMustGenerate) \
- macro(PutGetterByVal, NodeMustGenerate) \
- macro(PutSetterByVal, NodeMustGenerate) \
macro(CheckStructure, NodeMustGenerate) \
macro(GetExecutable, NodeResultJS) \
macro(PutStructure, NodeMustGenerate) \
Modified: trunk/Source/_javascript_Core/dfg/DFGPredictionPropagationPhase.cpp (191528 => 191529)
--- trunk/Source/_javascript_Core/dfg/DFGPredictionPropagationPhase.cpp 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/dfg/DFGPredictionPropagationPhase.cpp 2015-10-24 01:26:22 UTC (rev 191529)
@@ -651,11 +651,6 @@
case PutByIdDirect:
case PutByOffset:
case MultiPutByOffset:
- case PutGetterById:
- case PutSetterById:
- case PutGetterSetterById:
- case PutGetterByVal:
- case PutSetterByVal:
case DFG::Jump:
case Branch:
case Switch:
Modified: trunk/Source/_javascript_Core/dfg/DFGSafeToExecute.h (191528 => 191529)
--- trunk/Source/_javascript_Core/dfg/DFGSafeToExecute.h 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/dfg/DFGSafeToExecute.h 2015-10-24 01:26:22 UTC (rev 191529)
@@ -188,11 +188,6 @@
case PutById:
case PutByIdFlush:
case PutByIdDirect:
- case PutGetterById:
- case PutSetterById:
- case PutGetterSetterById:
- case PutGetterByVal:
- case PutSetterByVal:
case CheckStructure:
case GetExecutable:
case GetButterfly:
Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp (191528 => 191529)
--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2015-10-24 01:26:22 UTC (rev 191529)
@@ -6741,61 +6741,6 @@
ownerIsRememberedOrInEden.link(&m_jit);
}
-void SpeculativeJIT::compilePutAccessorById(Node* node)
-{
- SpeculateCellOperand base(this, node->child1());
- SpeculateCellOperand accessor(this, node->child2());
-
- flushRegisters();
- callOperation(node->op() == PutGetterById ? operationPutGetterById : operationPutSetterById, NoResult, base.gpr(), identifierUID(node->identifierNumber()), node->accessorAttributes(), accessor.gpr());
- m_jit.exceptionCheck();
-
- noResult(node);
-}
-
-void SpeculativeJIT::compilePutGetterSetterById(Node* node)
-{
- SpeculateCellOperand base(this, node->child1());
- JSValueOperand getter(this, node->child2());
- JSValueOperand setter(this, node->child3());
-
- flushRegisters();
-#if USE(JSVALUE64)
- callOperation(operationPutGetterSetter, NoResult, base.gpr(), identifierUID(node->identifierNumber()), node->accessorAttributes(), getter.gpr(), setter.gpr());
-#else
- // These JSValues may be JSUndefined OR JSFunction*.
- // At that time,
- // 1. If the JSValue is JSUndefined, its payload becomes nullptr.
- // 2. If the JSValue is JSFunction*, its payload becomes JSFunction*.
- // So extract payload and pass it to operationPutGetterSetter. This hack is used as the same way in baseline JIT.
- JSValueRegs getterRegs = getter.jsValueRegs();
- JSValueRegs setterRegs = setter.jsValueRegs();
- callOperation(operationPutGetterSetter, NoResult, base.gpr(), identifierUID(node->identifierNumber()), node->accessorAttributes(), getterRegs.payloadGPR(), setterRegs.payloadGPR());
-#endif
- m_jit.exceptionCheck();
-
- noResult(node);
-}
-
-void SpeculativeJIT::compilePutAccessorByVal(Node* node)
-{
- SpeculateCellOperand base(this, node->child1());
- JSValueOperand subscript(this, node->child2());
- SpeculateCellOperand accessor(this, node->child3());
-
- flushRegisters();
- auto operation = node->op() == PutGetterByVal ? operationPutGetterByVal : operationPutSetterByVal;
-#if USE(JSVALUE64)
- callOperation(operation, NoResult, base.gpr(), subscript.gpr(), node->accessorAttributes(), accessor.gpr());
-#else
- JSValueRegs subscriptRegs = subscript.jsValueRegs();
- callOperation(operation, NoResult, base.gpr(), subscriptRegs.tagGPR(), subscriptRegs.payloadGPR(), node->accessorAttributes(), accessor.gpr());
-#endif
- m_jit.exceptionCheck();
-
- noResult(node);
-}
-
} } // namespace JSC::DFG
#endif
Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.h (191528 => 191529)
--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.h 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.h 2015-10-24 01:26:22 UTC (rev 191529)
@@ -1155,17 +1155,36 @@
return appendCallSetResult(operation, result);
}
- JITCompiler::Call callOperation(V_JITOperation_ECIZC operation, GPRReg regOp1, UniquedStringImpl* identOp2, int32_t op3, GPRReg regOp4)
+ template<typename FunctionType>
+ JITCompiler::Call callOperation(FunctionType operation, NoResultTag)
{
- m_jit.setupArgumentsWithExecState(regOp1, TrustedImmPtr(identOp2), TrustedImm32(op3), regOp4);
- return appendCall(operation);
+ return callOperation(operation);
}
-
- template<typename FunctionType, typename... Args>
- JITCompiler::Call callOperation(FunctionType operation, NoResultTag, Args... args)
+ template<typename FunctionType, typename ArgumentType1>
+ JITCompiler::Call callOperation(FunctionType operation, NoResultTag, ArgumentType1 arg1)
{
- return callOperation(operation, args...);
+ return callOperation(operation, arg1);
}
+ template<typename FunctionType, typename ArgumentType1, typename ArgumentType2>
+ JITCompiler::Call callOperation(FunctionType operation, NoResultTag, ArgumentType1 arg1, ArgumentType2 arg2)
+ {
+ return callOperation(operation, arg1, arg2);
+ }
+ template<typename FunctionType, typename ArgumentType1, typename ArgumentType2, typename ArgumentType3>
+ JITCompiler::Call callOperation(FunctionType operation, NoResultTag, ArgumentType1 arg1, ArgumentType2 arg2, ArgumentType3 arg3)
+ {
+ return callOperation(operation, arg1, arg2, arg3);
+ }
+ template<typename FunctionType, typename ArgumentType1, typename ArgumentType2, typename ArgumentType3, typename ArgumentType4>
+ JITCompiler::Call callOperation(FunctionType operation, NoResultTag, ArgumentType1 arg1, ArgumentType2 arg2, ArgumentType3 arg3, ArgumentType4 arg4)
+ {
+ return callOperation(operation, arg1, arg2, arg3, arg4);
+ }
+ template<typename FunctionType, typename ArgumentType1, typename ArgumentType2, typename ArgumentType3, typename ArgumentType4, typename ArgumentType5>
+ JITCompiler::Call callOperation(FunctionType operation, NoResultTag, ArgumentType1 arg1, ArgumentType2 arg2, ArgumentType3 arg3, ArgumentType4 arg4, ArgumentType5 arg5)
+ {
+ return callOperation(operation, arg1, arg2, arg3, arg4, arg5);
+ }
JITCompiler::Call callOperation(D_JITOperation_ZZ operation, FPRReg result, GPRReg arg1, GPRReg arg2)
{
@@ -1515,16 +1534,6 @@
m_jit.setupArgumentsWithExecState(TrustedImm32(arg1), arg2, TrustedImm32(arg3), arg4, TrustedImm32(arg5));
return appendCall(operation);
}
- JITCompiler::Call callOperation(V_JITOperation_ECJZC operation, GPRReg regOp1, GPRReg regOp2, int32_t op3, GPRReg regOp4)
- {
- m_jit.setupArgumentsWithExecState(regOp1, regOp2, TrustedImm32(op3), regOp4);
- return appendCall(operation);
- }
- JITCompiler::Call callOperation(V_JITOperation_ECIZJJ operation, GPRReg regOp1, UniquedStringImpl* identOp2, int32_t op3, GPRReg regOp4, GPRReg regOp5)
- {
- m_jit.setupArgumentsWithExecState(regOp1, TrustedImmPtr(identOp2), TrustedImm32(op3), regOp4, regOp5);
- return appendCall(operation);
- }
#else // USE(JSVALUE32_64)
// EncodedJSValue in JSVALUE32_64 is a 64-bit integer. When being compiled in ARM EABI, it must be aligned even-numbered register (r0, r2 or [sp]).
@@ -1846,16 +1855,6 @@
m_jit.setupArgumentsWithExecState(TrustedImm32(arg1), arg2Payload, arg2Tag, TrustedImm32(arg3), arg4, TrustedImm32(arg5));
return appendCall(operation);
}
- JITCompiler::Call callOperation(V_JITOperation_ECJZC operation, GPRReg arg1, GPRReg arg2Tag, GPRReg arg2Payload, int32_t arg3, GPRReg arg4)
- {
- m_jit.setupArgumentsWithExecState(arg1, arg2Payload, arg2Tag, TrustedImm32(arg3), arg4);
- return appendCall(operation);
- }
- JITCompiler::Call callOperation(V_JITOperation_ECIZCC operation, GPRReg arg1, UniquedStringImpl* identOp2, int32_t op3, GPRReg arg4, GPRReg arg5)
- {
- m_jit.setupArgumentsWithExecState(arg1, TrustedImmPtr(identOp2), TrustedImm32(op3), arg4, arg5);
- return appendCall(operation);
- }
#undef EABI_32BIT_DUMMY_ARG
#undef SH4_32BIT_DUMMY_ARG
@@ -2244,9 +2243,6 @@
void compileTypeOf(Node*);
void compileCheckStructure(Node*, GPRReg cellGPR, GPRReg tempGPR);
void compileCheckStructure(Node*);
- void compilePutAccessorById(Node*);
- void compilePutGetterSetterById(Node*);
- void compilePutAccessorByVal(Node*);
void moveTrueTo(GPRReg);
void moveFalseTo(GPRReg);
Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp (191528 => 191529)
--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp 2015-10-24 01:26:22 UTC (rev 191529)
@@ -4170,23 +4170,6 @@
break;
}
- case PutGetterById:
- case PutSetterById: {
- compilePutAccessorById(node);
- break;
- }
-
- case PutGetterSetterById: {
- compilePutGetterSetterById(node);
- break;
- }
-
- case PutGetterByVal:
- case PutSetterByVal: {
- compilePutAccessorByVal(node);
- break;
- }
-
case GetGlobalLexicalVariable:
case GetGlobalVar: {
GPRTemporary resultPayload(this);
Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp (191528 => 191529)
--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp 2015-10-24 01:26:22 UTC (rev 191529)
@@ -4162,23 +4162,6 @@
break;
}
- case PutGetterById:
- case PutSetterById: {
- compilePutAccessorById(node);
- break;
- }
-
- case PutGetterSetterById: {
- compilePutGetterSetterById(node);
- break;
- }
-
- case PutGetterByVal:
- case PutSetterByVal: {
- compilePutAccessorByVal(node);
- break;
- }
-
case GetGlobalLexicalVariable:
case GetGlobalVar: {
GPRTemporary result(this);
Modified: trunk/Source/_javascript_Core/ftl/FTLCapabilities.cpp (191528 => 191529)
--- trunk/Source/_javascript_Core/ftl/FTLCapabilities.cpp 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/ftl/FTLCapabilities.cpp 2015-10-24 01:26:22 UTC (rev 191529)
@@ -204,11 +204,6 @@
case ForwardVarargs:
case Switch:
case TypeOf:
- case PutGetterById:
- case PutSetterById:
- case PutGetterSetterById:
- case PutGetterByVal:
- case PutSetterByVal:
// These are OK.
break;
case ArithSub:
Modified: trunk/Source/_javascript_Core/ftl/FTLIntrinsicRepository.h (191528 => 191529)
--- trunk/Source/_javascript_Core/ftl/FTLIntrinsicRepository.h 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/ftl/FTLIntrinsicRepository.h 2015-10-24 01:26:22 UTC (rev 191529)
@@ -118,9 +118,6 @@
macro(V_JITOperation_J, functionType(voidType, int64)) \
macro(V_JITOperation_Z, functionType(voidType, int32)) \
macro(V_JITOperation_E, functionType(voidType, intPtr)) \
- macro(V_JITOperation_ECIZC, functionType(voidType, intPtr, intPtr, intPtr, int32, intPtr)) \
- macro(V_JITOperation_ECIZJJ, functionType(voidType, intPtr, intPtr, intPtr, int32, int64, int64)) \
- macro(V_JITOperation_ECJZC, functionType(voidType, intPtr, intPtr, int64, int32, intPtr)) \
macro(Z_JITOperation_D, functionType(int32, doubleType)) \
macro(Z_JITOperation_EC, functionType(int32, intPtr, intPtr)) \
macro(Z_JITOperation_EGC, functionType(int32, intPtr, intPtr, intPtr)) \
Modified: trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp (191528 => 191529)
--- trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp 2015-10-24 01:26:22 UTC (rev 191529)
@@ -565,17 +565,6 @@
case PutByIdFlush:
compilePutById();
break;
- case PutGetterById:
- case PutSetterById:
- compilePutAccessorById();
- break;
- case PutGetterSetterById:
- compilePutGetterSetterById();
- break;
- case PutGetterByVal:
- case PutSetterByVal:
- compilePutAccessorByVal();
- break;
case GetButterfly:
compileGetButterfly();
break;
@@ -3010,38 +2999,6 @@
break;
}
}
-
- void compilePutAccessorById()
- {
- LValue base = lowCell(m_node->child1());
- LValue accessor = lowCell(m_node->child2());
- auto uid = m_graph.identifiers()[m_node->identifierNumber()];
- vmCall(
- m_out.operation(m_node->op() == PutGetterById ? operationPutGetterById : operationPutSetterById),
- m_callFrame, base, m_out.constIntPtr(uid), m_out.constInt32(m_node->accessorAttributes()), accessor);
- }
-
- void compilePutGetterSetterById()
- {
- LValue base = lowCell(m_node->child1());
- LValue getter = lowJSValue(m_node->child2());
- LValue setter = lowJSValue(m_node->child3());
- auto uid = m_graph.identifiers()[m_node->identifierNumber()];
- vmCall(
- m_out.operation(operationPutGetterSetter),
- m_callFrame, base, m_out.constIntPtr(uid), m_out.constInt32(m_node->accessorAttributes()), getter, setter);
-
- }
-
- void compilePutAccessorByVal()
- {
- LValue base = lowCell(m_node->child1());
- LValue subscript = lowJSValue(m_node->child2());
- LValue accessor = lowCell(m_node->child3());
- vmCall(
- m_out.operation(m_node->op() == PutGetterByVal ? operationPutGetterByVal : operationPutSetterByVal),
- m_callFrame, base, subscript, m_out.constInt32(m_node->accessorAttributes()), accessor);
- }
void compileArrayPush()
{
Modified: trunk/Source/_javascript_Core/jit/JIT.h (191528 => 191529)
--- trunk/Source/_javascript_Core/jit/JIT.h 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/jit/JIT.h 2015-10-24 01:26:22 UTC (rev 191529)
@@ -762,13 +762,9 @@
MacroAssembler::Call callOperation(V_JITOperation_E);
MacroAssembler::Call callOperation(V_JITOperation_EC, RegisterID);
MacroAssembler::Call callOperation(V_JITOperation_ECC, RegisterID, RegisterID);
- MacroAssembler::Call callOperation(V_JITOperation_ECIZC, RegisterID, UniquedStringImpl*, int32_t, RegisterID);
- MacroAssembler::Call callOperation(V_JITOperation_ECIZCC, RegisterID, UniquedStringImpl*, int32_t, RegisterID, RegisterID);
-#if USE(JSVALUE64)
- MacroAssembler::Call callOperation(V_JITOperation_ECJZC, RegisterID, RegisterID, int32_t, RegisterID);
-#else
+ MacroAssembler::Call callOperation(V_JITOperation_ECIZC, RegisterID, const Identifier*, int32_t, RegisterID);
+ MacroAssembler::Call callOperation(V_JITOperation_ECIZCC, RegisterID, const Identifier*, int32_t, RegisterID, RegisterID);
MacroAssembler::Call callOperation(V_JITOperation_ECJZC, RegisterID, RegisterID, RegisterID, int32_t, RegisterID);
-#endif
MacroAssembler::Call callOperation(J_JITOperation_EE, RegisterID);
MacroAssembler::Call callOperation(V_JITOperation_EZSymtabJ, int, SymbolTable*, RegisterID);
MacroAssembler::Call callOperation(J_JITOperation_EZSymtabJ, int, SymbolTable*, RegisterID);
@@ -779,10 +775,12 @@
#else
MacroAssembler::Call callOperationNoExceptionCheck(V_JITOperation_EJ, RegisterID, RegisterID);
#endif
+ MacroAssembler::Call callOperation(V_JITOperation_EJIdZJ, RegisterID, const Identifier*, int32_t, RegisterID);
+ MacroAssembler::Call callOperation(V_JITOperation_EJIdZJJ, RegisterID, const Identifier*, int32_t, RegisterID, RegisterID);
+ MacroAssembler::Call callOperation(V_JITOperation_EJJZJ, RegisterID, RegisterID, int32_t, RegisterID);
#if USE(JSVALUE64)
MacroAssembler::Call callOperation(F_JITOperation_EFJZZ, RegisterID, RegisterID, int32_t, RegisterID);
MacroAssembler::Call callOperation(V_JITOperation_ESsiJJI, StructureStubInfo*, RegisterID, RegisterID, UniquedStringImpl*);
- MacroAssembler::Call callOperation(V_JITOperation_ECIZJJ, RegisterID, UniquedStringImpl*, int32_t, RegisterID, RegisterID);
#else
MacroAssembler::Call callOperation(V_JITOperation_ESsiJJI, StructureStubInfo*, RegisterID, RegisterID, RegisterID, RegisterID, UniquedStringImpl*);
#endif
Modified: trunk/Source/_javascript_Core/jit/JITInlines.h (191528 => 191529)
--- trunk/Source/_javascript_Core/jit/JITInlines.h 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/jit/JITInlines.h 2015-10-24 01:26:22 UTC (rev 191529)
@@ -406,11 +406,6 @@
return appendCallWithCallFrameRollbackOnException(operation);
}
-ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(V_JITOperation_ECIZC operation, RegisterID regOp1, UniquedStringImpl* identOp2, int32_t op3, RegisterID regOp4)
-{
- setupArgumentsWithExecState(regOp1, TrustedImmPtr(identOp2), TrustedImm32(op3), regOp4);
- return appendCallWithExceptionCheck(operation);
-}
#if USE(JSVALUE64)
ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(Z_JITOperation_EJZZ operation, GPRReg arg1, int32_t arg2, int32_t arg3)
@@ -546,13 +541,19 @@
return appendCallWithExceptionCheck(operation);
}
-ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(V_JITOperation_ECIZJJ operation, RegisterID regOp1, UniquedStringImpl* identOp2, int32_t op3, RegisterID regOp4, RegisterID regOp5)
+ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(V_JITOperation_EJIdZJ operation, RegisterID regOp1, const Identifier* identOp2, int32_t op3, RegisterID regOp4)
{
+ setupArgumentsWithExecState(regOp1, TrustedImmPtr(identOp2), TrustedImm32(op3), regOp4);
+ return appendCallWithExceptionCheck(operation);
+}
+
+ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(V_JITOperation_EJIdZJJ operation, RegisterID regOp1, const Identifier* identOp2, int32_t op3, RegisterID regOp4, RegisterID regOp5)
+{
setupArgumentsWithExecState(regOp1, TrustedImmPtr(identOp2), TrustedImm32(op3), regOp4, regOp5);
return appendCallWithExceptionCheck(operation);
}
-ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(V_JITOperation_ECJZC operation, RegisterID regOp1, RegisterID regOp2, int32_t op3, RegisterID regOp4)
+ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(V_JITOperation_EJJZJ operation, RegisterID regOp1, RegisterID regOp2, int32_t op3, RegisterID regOp4)
{
setupArgumentsWithExecState(regOp1, regOp2, TrustedImm32(op3), regOp4);
return appendCallWithExceptionCheck(operation);
@@ -674,8 +675,14 @@
return appendCallWithExceptionCheck(operation);
}
-ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(V_JITOperation_ECIZCC operation, RegisterID regOp1, UniquedStringImpl* identOp2, int32_t op3, RegisterID regOp4, RegisterID regOp5)
+ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(V_JITOperation_ECIZC operation, RegisterID regOp1, const Identifier* identOp2, int32_t op3, RegisterID regOp4)
{
+ setupArgumentsWithExecState(regOp1, TrustedImmPtr(identOp2), TrustedImm32(op3), regOp4);
+ return appendCallWithExceptionCheck(operation);
+}
+
+ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(V_JITOperation_ECIZCC operation, RegisterID regOp1, const Identifier* identOp2, int32_t op3, RegisterID regOp4, RegisterID regOp5)
+{
setupArgumentsWithExecState(regOp1, TrustedImmPtr(identOp2), TrustedImm32(op3), regOp4, regOp5);
return appendCallWithExceptionCheck(operation);
}
Modified: trunk/Source/_javascript_Core/jit/JITOperations.cpp (191528 => 191529)
--- trunk/Source/_javascript_Core/jit/JITOperations.cpp 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/jit/JITOperations.cpp 2015-10-24 01:26:22 UTC (rev 191529)
@@ -1353,78 +1353,109 @@
base->putSetter(exec, propertyKey, accessor, attribute);
}
-void JIT_OPERATION operationPutGetterById(ExecState* exec, JSCell* object, UniquedStringImpl* uid, int32_t options, JSCell* getter)
+#if USE(JSVALUE64)
+void JIT_OPERATION operationPutGetterById(ExecState* exec, EncodedJSValue encodedObjectValue, Identifier* identifier, int32_t options, EncodedJSValue encodedGetterValue)
{
VM& vm = exec->vm();
NativeCallFrameTracer tracer(&vm, exec);
- ASSERT(object && object->isObject());
- JSObject* baseObj = object->getObject();
+ ASSERT(JSValue::decode(encodedObjectValue).isObject());
+ JSObject* baseObj = asObject(JSValue::decode(encodedObjectValue));
- ASSERT(getter->isObject());
- baseObj->putGetter(exec, uid, getter, options);
+ JSValue getter = JSValue::decode(encodedGetterValue);
+ ASSERT(getter.isObject());
+ baseObj->putGetter(exec, *identifier, asObject(getter), options);
}
-void JIT_OPERATION operationPutSetterById(ExecState* exec, JSCell* object, UniquedStringImpl* uid, int32_t options, JSCell* setter)
+void JIT_OPERATION operationPutSetterById(ExecState* exec, EncodedJSValue encodedObjectValue, Identifier* identifier, int32_t options, EncodedJSValue encodedSetterValue)
{
VM& vm = exec->vm();
NativeCallFrameTracer tracer(&vm, exec);
- ASSERT(object && object->isObject());
- JSObject* baseObj = object->getObject();
+ ASSERT(JSValue::decode(encodedObjectValue).isObject());
+ JSObject* baseObj = asObject(JSValue::decode(encodedObjectValue));
- ASSERT(setter->isObject());
- baseObj->putSetter(exec, uid, setter, options);
+ JSValue setter = JSValue::decode(encodedSetterValue);
+ ASSERT(setter.isObject());
+ baseObj->putSetter(exec, *identifier, asObject(setter), options);
}
-void JIT_OPERATION operationPutGetterByVal(ExecState* exec, JSCell* base, EncodedJSValue encodedSubscript, int32_t attribute, JSCell* getter)
+void JIT_OPERATION operationPutGetterSetter(ExecState* exec, EncodedJSValue encodedObjectValue, Identifier* identifier, int32_t attribute,
+ EncodedJSValue encodedGetterValue, EncodedJSValue encodedSetterValue)
{
VM& vm = exec->vm();
NativeCallFrameTracer tracer(&vm, exec);
- putAccessorByVal(exec, asObject(base), JSValue::decode(encodedSubscript), attribute, asObject(getter), AccessorType::Getter);
+ ASSERT(JSValue::decode(encodedObjectValue).isObject());
+ JSObject* baseObj = asObject(JSValue::decode(encodedObjectValue));
+
+ GetterSetter* accessor = GetterSetter::create(vm, exec->lexicalGlobalObject());
+
+ JSValue getter = JSValue::decode(encodedGetterValue);
+ JSValue setter = JSValue::decode(encodedSetterValue);
+ ASSERT(getter.isObject() || getter.isUndefined());
+ ASSERT(setter.isObject() || setter.isUndefined());
+ ASSERT(getter.isObject() || setter.isObject());
+
+ if (!getter.isUndefined())
+ accessor->setGetter(vm, exec->lexicalGlobalObject(), asObject(getter));
+ if (!setter.isUndefined())
+ accessor->setSetter(vm, exec->lexicalGlobalObject(), asObject(setter));
+ baseObj->putDirectAccessor(exec, *identifier, accessor, attribute);
}
-void JIT_OPERATION operationPutSetterByVal(ExecState* exec, JSCell* base, EncodedJSValue encodedSubscript, int32_t attribute, JSCell* setter)
+void JIT_OPERATION operationPutGetterByVal(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedSubscript, int32_t attribute, EncodedJSValue encodedGetter)
{
VM& vm = exec->vm();
NativeCallFrameTracer tracer(&vm, exec);
+ JSObject* base = asObject(JSValue::decode(encodedBase));
+ JSValue subscript = JSValue::decode(encodedSubscript);
+ JSObject* getter = asObject(JSValue::decode(encodedGetter));
+ putAccessorByVal(exec, base, subscript, attribute, getter, AccessorType::Getter);
+}
- putAccessorByVal(exec, asObject(base), JSValue::decode(encodedSubscript), attribute, asObject(setter), AccessorType::Setter);
+void JIT_OPERATION operationPutSetterByVal(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedSubscript, int32_t attribute, EncodedJSValue encodedSetter)
+{
+ VM& vm = exec->vm();
+ NativeCallFrameTracer tracer(&vm, exec);
+ JSObject* base = asObject(JSValue::decode(encodedBase));
+ JSValue subscript = JSValue::decode(encodedSubscript);
+ JSObject* setter = asObject(JSValue::decode(encodedSetter));
+ putAccessorByVal(exec, base, subscript, attribute, setter, AccessorType::Setter);
}
-#if USE(JSVALUE64)
-void JIT_OPERATION operationPutGetterSetter(ExecState* exec, JSCell* object, UniquedStringImpl* uid, int32_t attribute, EncodedJSValue encodedGetterValue, EncodedJSValue encodedSetterValue)
+#else
+void JIT_OPERATION operationPutGetterById(ExecState* exec, JSCell* object, Identifier* identifier, int32_t options, JSCell* getter)
{
VM& vm = exec->vm();
NativeCallFrameTracer tracer(&vm, exec);
ASSERT(object && object->isObject());
- JSObject* baseObj = asObject(object);
+ JSObject* baseObj = object->getObject();
- GetterSetter* accessor = GetterSetter::create(vm, exec->lexicalGlobalObject());
+ ASSERT(getter->isObject());
+ baseObj->putGetter(exec, *identifier, getter, options);
+}
- JSValue getter = JSValue::decode(encodedGetterValue);
- JSValue setter = JSValue::decode(encodedSetterValue);
- ASSERT(getter.isObject() || getter.isUndefined());
- ASSERT(setter.isObject() || setter.isUndefined());
- ASSERT(getter.isObject() || setter.isObject());
+void JIT_OPERATION operationPutSetterById(ExecState* exec, JSCell* object, Identifier* identifier, int32_t options, JSCell* setter)
+{
+ VM& vm = exec->vm();
+ NativeCallFrameTracer tracer(&vm, exec);
- if (!getter.isUndefined())
- accessor->setGetter(vm, exec->lexicalGlobalObject(), asObject(getter));
- if (!setter.isUndefined())
- accessor->setSetter(vm, exec->lexicalGlobalObject(), asObject(setter));
- baseObj->putDirectAccessor(exec, uid, accessor, attribute);
+ ASSERT(object && object->isObject());
+ JSObject* baseObj = object->getObject();
+
+ ASSERT(setter->isObject());
+ baseObj->putSetter(exec, *identifier, setter, options);
}
-#else
-void JIT_OPERATION operationPutGetterSetter(ExecState* exec, JSCell* object, UniquedStringImpl* uid, int32_t attribute, JSCell* getter, JSCell* setter)
+void JIT_OPERATION operationPutGetterSetter(ExecState* exec, JSCell* object, Identifier* identifier, int32_t attribute, JSCell* getter, JSCell* setter)
{
VM& vm = exec->vm();
NativeCallFrameTracer tracer(&vm, exec);
ASSERT(object && object->isObject());
- JSObject* baseObj = asObject(object);
+ JSObject* baseObj = object->getObject();
GetterSetter* accessor = GetterSetter::create(vm, exec->lexicalGlobalObject());
@@ -1436,8 +1467,25 @@
accessor->setGetter(vm, exec->lexicalGlobalObject(), getter->getObject());
if (setter)
accessor->setSetter(vm, exec->lexicalGlobalObject(), setter->getObject());
- baseObj->putDirectAccessor(exec, uid, accessor, attribute);
+ baseObj->putDirectAccessor(exec, *identifier, accessor, attribute);
}
+
+void JIT_OPERATION operationPutGetterByVal(ExecState* exec, JSCell* base, EncodedJSValue encodedSubscript, int32_t attribute, JSCell* getter)
+{
+ VM& vm = exec->vm();
+ NativeCallFrameTracer tracer(&vm, exec);
+
+ putAccessorByVal(exec, asObject(base), JSValue::decode(encodedSubscript), attribute, asObject(getter), AccessorType::Getter);
+}
+
+void JIT_OPERATION operationPutSetterByVal(ExecState* exec, JSCell* base, EncodedJSValue encodedSubscript, int32_t attribute, JSCell* setter)
+{
+ VM& vm = exec->vm();
+ NativeCallFrameTracer tracer(&vm, exec);
+
+ putAccessorByVal(exec, asObject(base), JSValue::decode(encodedSubscript), attribute, asObject(setter), AccessorType::Setter);
+}
+
#endif
void JIT_OPERATION operationPopScope(ExecState* exec, int32_t scopeReg)
Modified: trunk/Source/_javascript_Core/jit/JITOperations.h (191528 => 191529)
--- trunk/Source/_javascript_Core/jit/JITOperations.h 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/jit/JITOperations.h 2015-10-24 01:26:22 UTC (rev 191529)
@@ -189,9 +189,8 @@
typedef void JIT_OPERATION (*V_JITOperation_ECb)(ExecState*, CodeBlock*);
typedef void JIT_OPERATION (*V_JITOperation_ECC)(ExecState*, JSCell*, JSCell*);
typedef void JIT_OPERATION (*V_JITOperation_ECIcf)(ExecState*, JSCell*, InlineCallFrame*);
-typedef void JIT_OPERATION (*V_JITOperation_ECIZC)(ExecState*, JSCell*, UniquedStringImpl*, int32_t, JSCell*);
-typedef void JIT_OPERATION (*V_JITOperation_ECIZCC)(ExecState*, JSCell*, UniquedStringImpl*, int32_t, JSCell*, JSCell*);
-typedef void JIT_OPERATION (*V_JITOperation_ECIZJJ)(ExecState*, JSCell*, UniquedStringImpl*, int32_t, EncodedJSValue, EncodedJSValue);
+typedef void JIT_OPERATION (*V_JITOperation_ECIZC)(ExecState*, JSCell*, Identifier*, int32_t, JSCell*);
+typedef void JIT_OPERATION (*V_JITOperation_ECIZCC)(ExecState*, JSCell*, Identifier*, int32_t, JSCell*, JSCell*);
typedef void JIT_OPERATION (*V_JITOperation_ECJZC)(ExecState*, JSCell*, EncodedJSValue, int32_t, JSCell*);
typedef void JIT_OPERATION (*V_JITOperation_ECCIcf)(ExecState*, JSCell*, JSCell*, InlineCallFrame*);
typedef void JIT_OPERATION (*V_JITOperation_ECJJ)(ExecState*, JSCell*, EncodedJSValue, EncodedJSValue);
@@ -201,6 +200,9 @@
typedef void JIT_OPERATION (*V_JITOperation_EZSymtabJ)(ExecState*, int32_t, SymbolTable*, EncodedJSValue);
typedef void JIT_OPERATION (*V_JITOperation_EJ)(ExecState*, EncodedJSValue);
typedef void JIT_OPERATION (*V_JITOperation_EJCI)(ExecState*, EncodedJSValue, JSCell*, UniquedStringImpl*);
+typedef void JIT_OPERATION (*V_JITOperation_EJIdZJ)(ExecState*, EncodedJSValue, Identifier*, int32_t, EncodedJSValue);
+typedef void JIT_OPERATION (*V_JITOperation_EJIdZJJ)(ExecState*, EncodedJSValue, Identifier*, int32_t, EncodedJSValue, EncodedJSValue);
+typedef void JIT_OPERATION (*V_JITOperation_EJJZJ)(ExecState*, EncodedJSValue, EncodedJSValue, int32_t, EncodedJSValue);
typedef void JIT_OPERATION (*V_JITOperation_EJJJ)(ExecState*, EncodedJSValue, EncodedJSValue, EncodedJSValue);
typedef void JIT_OPERATION (*V_JITOperation_EJJJAp)(ExecState*, EncodedJSValue, EncodedJSValue, EncodedJSValue, ArrayProfile*);
typedef void JIT_OPERATION (*V_JITOperation_EJJJBy)(ExecState*, EncodedJSValue, EncodedJSValue, EncodedJSValue, ByValInfo*);
@@ -311,14 +313,18 @@
SlowPathReturnType JIT_OPERATION operationOptimize(ExecState*, int32_t) WTF_INTERNAL;
#endif
void JIT_OPERATION operationPutByIndex(ExecState*, EncodedJSValue, int32_t, EncodedJSValue);
-void JIT_OPERATION operationPutGetterById(ExecState*, JSCell*, UniquedStringImpl*, int32_t options, JSCell*) WTF_INTERNAL;
-void JIT_OPERATION operationPutSetterById(ExecState*, JSCell*, UniquedStringImpl*, int32_t options, JSCell*) WTF_INTERNAL;
+#if USE(JSVALUE64)
+void JIT_OPERATION operationPutGetterById(ExecState*, EncodedJSValue, Identifier*, int32_t options, EncodedJSValue) WTF_INTERNAL;
+void JIT_OPERATION operationPutSetterById(ExecState*, EncodedJSValue, Identifier*, int32_t options, EncodedJSValue) WTF_INTERNAL;
+void JIT_OPERATION operationPutGetterSetter(ExecState*, EncodedJSValue, Identifier*, int32_t attribute, EncodedJSValue, EncodedJSValue) WTF_INTERNAL;
+void JIT_OPERATION operationPutGetterByVal(ExecState*, EncodedJSValue, EncodedJSValue, int32_t attribute, EncodedJSValue) WTF_INTERNAL;
+void JIT_OPERATION operationPutSetterByVal(ExecState*, EncodedJSValue, EncodedJSValue, int32_t attribute, EncodedJSValue) WTF_INTERNAL;
+#else
+void JIT_OPERATION operationPutGetterById(ExecState*, JSCell*, Identifier*, int32_t options, JSCell*) WTF_INTERNAL;
+void JIT_OPERATION operationPutSetterById(ExecState*, JSCell*, Identifier*, int32_t options, JSCell*) WTF_INTERNAL;
+void JIT_OPERATION operationPutGetterSetter(ExecState*, JSCell*, Identifier*, int32_t attribute, JSCell*, JSCell*) WTF_INTERNAL;
void JIT_OPERATION operationPutGetterByVal(ExecState*, JSCell*, EncodedJSValue, int32_t attribute, JSCell*) WTF_INTERNAL;
void JIT_OPERATION operationPutSetterByVal(ExecState*, JSCell*, EncodedJSValue, int32_t attribute, JSCell*) WTF_INTERNAL;
-#if USE(JSVALUE64)
-void JIT_OPERATION operationPutGetterSetter(ExecState*, JSCell*, UniquedStringImpl*, int32_t attribute, EncodedJSValue, EncodedJSValue) WTF_INTERNAL;
-#else
-void JIT_OPERATION operationPutGetterSetter(ExecState*, JSCell*, UniquedStringImpl*, int32_t attribute, JSCell*, JSCell*) WTF_INTERNAL;
#endif
void JIT_OPERATION operationPushFunctionNameScope(ExecState*, int32_t, SymbolTable*, EncodedJSValue) WTF_INTERNAL;
void JIT_OPERATION operationPopScope(ExecState*, int32_t) WTF_INTERNAL;
Modified: trunk/Source/_javascript_Core/jit/JITPropertyAccess.cpp (191528 => 191529)
--- trunk/Source/_javascript_Core/jit/JITPropertyAccess.cpp 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/jit/JITPropertyAccess.cpp 2015-10-24 01:26:22 UTC (rev 191529)
@@ -492,7 +492,7 @@
emitGetVirtualRegister(currentInstruction[1].u.operand, regT0);
int32_t options = currentInstruction[3].u.operand;
emitGetVirtualRegister(currentInstruction[4].u.operand, regT1);
- callOperation(operationPutGetterById, regT0, m_codeBlock->identifier(currentInstruction[2].u.operand).impl(), options, regT1);
+ callOperation(operationPutGetterById, regT0, &m_codeBlock->identifier(currentInstruction[2].u.operand), options, regT1);
}
void JIT::emit_op_put_setter_by_id(Instruction* currentInstruction)
@@ -500,7 +500,7 @@
emitGetVirtualRegister(currentInstruction[1].u.operand, regT0);
int32_t options = currentInstruction[3].u.operand;
emitGetVirtualRegister(currentInstruction[4].u.operand, regT1);
- callOperation(operationPutSetterById, regT0, m_codeBlock->identifier(currentInstruction[2].u.operand).impl(), options, regT1);
+ callOperation(operationPutSetterById, regT0, &m_codeBlock->identifier(currentInstruction[2].u.operand), options, regT1);
}
void JIT::emit_op_put_getter_setter(Instruction* currentInstruction)
@@ -509,7 +509,7 @@
int32_t attribute = currentInstruction[3].u.operand;
emitGetVirtualRegister(currentInstruction[4].u.operand, regT1);
emitGetVirtualRegister(currentInstruction[5].u.operand, regT2);
- callOperation(operationPutGetterSetter, regT0, m_codeBlock->identifier(currentInstruction[2].u.operand).impl(), attribute, regT1, regT2);
+ callOperation(operationPutGetterSetter, regT0, &m_codeBlock->identifier(currentInstruction[2].u.operand), attribute, regT1, regT2);
}
void JIT::emit_op_put_getter_by_val(Instruction* currentInstruction)
Modified: trunk/Source/_javascript_Core/jit/JITPropertyAccess32_64.cpp (191528 => 191529)
--- trunk/Source/_javascript_Core/jit/JITPropertyAccess32_64.cpp 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/jit/JITPropertyAccess32_64.cpp 2015-10-24 01:26:22 UTC (rev 191529)
@@ -66,7 +66,7 @@
emitLoadPayload(base, regT1);
emitLoadPayload(getter, regT3);
- callOperation(operationPutGetterById, regT1, m_codeBlock->identifier(property).impl(), options, regT3);
+ callOperation(operationPutGetterById, regT1, &m_codeBlock->identifier(property), options, regT3);
}
void JIT::emit_op_put_setter_by_id(Instruction* currentInstruction)
@@ -78,7 +78,7 @@
emitLoadPayload(base, regT1);
emitLoadPayload(setter, regT3);
- callOperation(operationPutSetterById, regT1, m_codeBlock->identifier(property).impl(), options, regT3);
+ callOperation(operationPutSetterById, regT1, &m_codeBlock->identifier(property), options, regT3);
}
void JIT::emit_op_put_getter_setter(Instruction* currentInstruction)
@@ -92,7 +92,7 @@
emitLoadPayload(base, regT1);
emitLoadPayload(getter, regT3);
emitLoadPayload(setter, regT4);
- callOperation(operationPutGetterSetter, regT1, m_codeBlock->identifier(property).impl(), attribute, regT3, regT4);
+ callOperation(operationPutGetterSetter, regT1, &m_codeBlock->identifier(property), attribute, regT3, regT4);
}
void JIT::emit_op_put_getter_by_val(Instruction* currentInstruction)
Deleted: trunk/Source/_javascript_Core/tests/stress/dfg-put-accessors-by-id-class.js (191528 => 191529)
--- trunk/Source/_javascript_Core/tests/stress/dfg-put-accessors-by-id-class.js 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/tests/stress/dfg-put-accessors-by-id-class.js 2015-10-24 01:26:22 UTC (rev 191529)
@@ -1,82 +0,0 @@
-function shouldBe(actual, expected) {
- if (actual !== expected)
- throw new Error('bad value: ' + actual);
-}
-
-function testAttribute(object, name, type) {
- shouldBe(Reflect.has(object, name), true);
- let desc = Reflect.getOwnPropertyDescriptor(object, name);
- shouldBe(desc.configurable, true);
- shouldBe(desc.enumerable, false);
- if (type === 'get') {
- shouldBe(typeof desc.get, 'function');
- shouldBe(typeof desc.set, 'undefined');
- } else if (type === 'set') {
- shouldBe(typeof desc.get, 'undefined');
- shouldBe(typeof desc.set, 'function');
- } else {
- shouldBe(typeof desc.get, 'function');
- shouldBe(typeof desc.set, 'function');
- }
-}
-noInline(testAttribute);
-
-function getter()
-{
- class Cocoa {
- get hello() {
- return 42;
- }
- }
-
- let object = new Cocoa();
- testAttribute(object.__proto__, 'hello', 'get');
- return object.hello;
-}
-noInline(getter);
-
-function setter()
-{
- class Cocoa {
- constructor() {
- this.value = 0;
- }
- set hello(value) {
- this.value = value;
- }
- }
-
- let object = new Cocoa();
- testAttribute(object.__proto__, 'hello', 'set');
- object.hello = 42;
- return object.value;
-
-}
-noInline(setter);
-
-function accessors()
-{
- class Cocoa {
- constructor() {
- this.value = 0;
- }
- get hello() {
- return this.value;
- }
- set hello(value) {
- this.value = value;
- }
- }
-
- let object = new Cocoa();
- testAttribute(object.__proto__, 'hello', 'getset');
- object.hello = 42;
- return object.hello;
-}
-noInline(accessors);
-
-for (var i = 0; i < 10000; ++i) {
- shouldBe(getter(), 42);
- shouldBe(setter(), 42);
- shouldBe(accessors(), 42);
-}
Deleted: trunk/Source/_javascript_Core/tests/stress/dfg-put-accessors-by-id.js (191528 => 191529)
--- trunk/Source/_javascript_Core/tests/stress/dfg-put-accessors-by-id.js 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/tests/stress/dfg-put-accessors-by-id.js 2015-10-24 01:26:22 UTC (rev 191529)
@@ -1,75 +0,0 @@
-function shouldBe(actual, expected) {
- if (actual !== expected)
- throw new Error('bad value: ' + actual);
-}
-
-function testAttribute(object, name, type) {
- shouldBe(Reflect.has(object, name), true);
- let desc = Reflect.getOwnPropertyDescriptor(object, name);
- shouldBe(desc.configurable, true);
- shouldBe(desc.enumerable, true);
- if (type === 'get') {
- shouldBe(typeof desc.get, 'function');
- shouldBe(typeof desc.set, 'undefined');
- } else if (type === 'set') {
- shouldBe(typeof desc.get, 'undefined');
- shouldBe(typeof desc.set, 'function');
- } else {
- shouldBe(typeof desc.get, 'function');
- shouldBe(typeof desc.set, 'function');
- }
-}
-noInline(testAttribute);
-
-function getter()
-{
- var object = {
- get hello() {
- return 42;
- }
- };
-
- testAttribute(object, 'hello', 'get');
- return object.hello;
-}
-noInline(getter);
-
-function setter()
-{
- var object = {
- value: 0,
- set hello(value) {
- this.value = value;
- }
- };
-
- testAttribute(object, 'hello', 'set');
- object.hello = 42;
- return object.value;
-
-}
-noInline(setter);
-
-function accessors()
-{
- var object = {
- value: 0,
- get hello() {
- return this.value;
- },
- set hello(value) {
- this.value = value;
- }
- };
-
- testAttribute(object, 'hello', 'getset');
- object.hello = 42;
- return object.hello;
-}
-noInline(accessors);
-
-for (var i = 0; i < 10000; ++i) {
- shouldBe(getter(), 42);
- shouldBe(setter(), 42);
- shouldBe(accessors(), 42);
-}
Deleted: trunk/Source/_javascript_Core/tests/stress/dfg-put-getter-by-id-class.js (191528 => 191529)
--- trunk/Source/_javascript_Core/tests/stress/dfg-put-getter-by-id-class.js 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/tests/stress/dfg-put-getter-by-id-class.js 2015-10-24 01:26:22 UTC (rev 191529)
@@ -1,45 +0,0 @@
-function shouldBe(actual, expected) {
- if (actual !== expected)
- throw new Error('bad value: ' + actual);
-}
-
-function testAttribute(object, name, type) {
- shouldBe(Reflect.has(object, name), true);
- let desc = Reflect.getOwnPropertyDescriptor(object, name);
- shouldBe(desc.configurable, true);
- shouldBe(desc.enumerable, false);
- if (type === 'get') {
- shouldBe(typeof desc.get, 'function');
- shouldBe(typeof desc.set, 'undefined');
- } else if (type === 'set') {
- shouldBe(typeof desc.get, 'undefined');
- shouldBe(typeof desc.set, 'function');
- } else {
- shouldBe(typeof desc.get, 'function');
- shouldBe(typeof desc.set, 'function');
- }
-}
-noInline(testAttribute);
-
-function getter(name)
-{
- class Cocoa {
- constructor() {
- this.ok = 42;
- }
- get hello() {
- return this.ok;
- }
- get [name]() {
- }
- }
-
- let object = new Cocoa();
- testAttribute(object.__proto__, 'hello', 'get');
- testAttribute(object.__proto__, 'dummy', 'get');
- return object.hello;
-}
-noInline(getter);
-
-for (var i = 0; i < 10000; ++i)
- shouldBe(getter('dummy'), 42);
Deleted: trunk/Source/_javascript_Core/tests/stress/dfg-put-getter-by-id.js (191528 => 191529)
--- trunk/Source/_javascript_Core/tests/stress/dfg-put-getter-by-id.js 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/tests/stress/dfg-put-getter-by-id.js 2015-10-24 01:26:22 UTC (rev 191529)
@@ -1,39 +0,0 @@
-function shouldBe(actual, expected) {
- if (actual !== expected)
- throw new Error('bad value: ' + actual);
-}
-
-function testAttribute(object, name, type) {
- shouldBe(Reflect.has(object, name), true);
- let desc = Reflect.getOwnPropertyDescriptor(object, name);
- shouldBe(desc.configurable, true);
- shouldBe(desc.enumerable, true);
- if (type === 'get') {
- shouldBe(typeof desc.get, 'function');
- shouldBe(typeof desc.set, 'undefined');
- } else if (type === 'set') {
- shouldBe(typeof desc.get, 'undefined');
- shouldBe(typeof desc.set, 'function');
- } else {
- shouldBe(typeof desc.get, 'function');
- shouldBe(typeof desc.set, 'function');
- }
-}
-noInline(testAttribute);
-
-function getter(name)
-{
- var object = {
- get hello() {
- return this.ok;
- },
- [name]: 42
- };
-
- testAttribute(object, 'hello', 'get');
- return object.hello;
-}
-noInline(getter);
-
-for (var i = 0; i < 10000; ++i)
- shouldBe(getter('ok'), 42);
Deleted: trunk/Source/_javascript_Core/tests/stress/dfg-put-getter-by-val-class.js (191528 => 191529)
--- trunk/Source/_javascript_Core/tests/stress/dfg-put-getter-by-val-class.js 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/tests/stress/dfg-put-getter-by-val-class.js 2015-10-24 01:26:22 UTC (rev 191529)
@@ -1,42 +0,0 @@
-function shouldBe(actual, expected) {
- if (actual !== expected)
- throw new Error('bad value: ' + actual);
-}
-
-function testAttribute(object, name, type) {
- shouldBe(Reflect.has(object, name), true);
- let desc = Reflect.getOwnPropertyDescriptor(object, name);
- shouldBe(desc.configurable, true);
- shouldBe(desc.enumerable, false);
- if (type === 'get') {
- shouldBe(typeof desc.get, 'function');
- shouldBe(typeof desc.set, 'undefined');
- } else if (type === 'set') {
- shouldBe(typeof desc.get, 'undefined');
- shouldBe(typeof desc.set, 'function');
- } else {
- shouldBe(typeof desc.get, 'function');
- shouldBe(typeof desc.set, 'function');
- }
-}
-noInline(testAttribute);
-
-function getter(name)
-{
- class Cocoa {
- constructor() {
- this.ok = 42;
- }
- get [name]() {
- return this.ok;
- }
- }
-
- let object = new Cocoa();
- testAttribute(object.__proto__, 'hello', 'get');
- return object.hello;
-}
-noInline(getter);
-
-for (var i = 0; i < 10000; ++i)
- shouldBe(getter('hello'), 42);
Deleted: trunk/Source/_javascript_Core/tests/stress/dfg-put-getter-by-val.js (191528 => 191529)
--- trunk/Source/_javascript_Core/tests/stress/dfg-put-getter-by-val.js 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/tests/stress/dfg-put-getter-by-val.js 2015-10-24 01:26:22 UTC (rev 191529)
@@ -1,39 +0,0 @@
-function shouldBe(actual, expected) {
- if (actual !== expected)
- throw new Error('bad value: ' + actual);
-}
-
-function testAttribute(object, name, type) {
- shouldBe(Reflect.has(object, name), true);
- let desc = Reflect.getOwnPropertyDescriptor(object, name);
- shouldBe(desc.configurable, true);
- shouldBe(desc.enumerable, true);
- if (type === 'get') {
- shouldBe(typeof desc.get, 'function');
- shouldBe(typeof desc.set, 'undefined');
- } else if (type === 'set') {
- shouldBe(typeof desc.get, 'undefined');
- shouldBe(typeof desc.set, 'function');
- } else {
- shouldBe(typeof desc.get, 'function');
- shouldBe(typeof desc.set, 'function');
- }
-}
-noInline(testAttribute);
-
-function getter(name)
-{
- var object = {
- ok: 42,
- get [name]() {
- return this.ok;
- }
- };
-
- testAttribute(object, 'hello', 'get');
- return object.hello;
-}
-noInline(getter);
-
-for (var i = 0; i < 10000; ++i)
- shouldBe(getter('hello'), 42);
Deleted: trunk/Source/_javascript_Core/tests/stress/dfg-put-setter-by-id-class.js (191528 => 191529)
--- trunk/Source/_javascript_Core/tests/stress/dfg-put-setter-by-id-class.js 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/tests/stress/dfg-put-setter-by-id-class.js 2015-10-24 01:26:22 UTC (rev 191529)
@@ -1,46 +0,0 @@
-function shouldBe(actual, expected) {
- if (actual !== expected)
- throw new Error('bad value: ' + actual);
-}
-
-function testAttribute(object, name, type) {
- shouldBe(Reflect.has(object, name), true);
- let desc = Reflect.getOwnPropertyDescriptor(object, name);
- shouldBe(desc.configurable, true);
- shouldBe(desc.enumerable, false);
- if (type === 'get') {
- shouldBe(typeof desc.get, 'function');
- shouldBe(typeof desc.set, 'undefined');
- } else if (type === 'set') {
- shouldBe(typeof desc.get, 'undefined');
- shouldBe(typeof desc.set, 'function');
- } else {
- shouldBe(typeof desc.get, 'function');
- shouldBe(typeof desc.set, 'function');
- }
-}
-noInline(testAttribute);
-
-function getter(name)
-{
- class Cocoa {
- constructor() {
- this.ok = 0;
- }
- set hello(value) {
- this.ok = value;
- }
- get [name]() {
- }
- }
-
- let object = new Cocoa();
- testAttribute(object.__proto__, 'hello', 'set');
- testAttribute(object.__proto__, 'dummy', 'get');
- object.hello = 42;
- return object.ok;
-}
-noInline(getter);
-
-for (var i = 0; i < 10000; ++i)
- shouldBe(getter('dummy'), 42);
Deleted: trunk/Source/_javascript_Core/tests/stress/dfg-put-setter-by-id.js (191528 => 191529)
--- trunk/Source/_javascript_Core/tests/stress/dfg-put-setter-by-id.js 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/tests/stress/dfg-put-setter-by-id.js 2015-10-24 01:26:22 UTC (rev 191529)
@@ -1,41 +0,0 @@
-function shouldBe(actual, expected) {
- if (actual !== expected)
- throw new Error('bad value: ' + actual);
-}
-
-function testAttribute(object, name, type) {
- shouldBe(Reflect.has(object, name), true);
- let desc = Reflect.getOwnPropertyDescriptor(object, name);
- shouldBe(desc.configurable, true);
- shouldBe(desc.enumerable, true);
- if (type === 'get') {
- shouldBe(typeof desc.get, 'function');
- shouldBe(typeof desc.set, 'undefined');
- } else if (type === 'set') {
- shouldBe(typeof desc.get, 'undefined');
- shouldBe(typeof desc.set, 'function');
- } else {
- shouldBe(typeof desc.get, 'function');
- shouldBe(typeof desc.set, 'function');
- }
-}
-noInline(testAttribute);
-
-function setter(name)
-{
- var object = {
- set hello(value) {
- this.ok = value;
- },
- [name]: 0
- };
-
- testAttribute(object, 'hello', 'set');
- object.hello = 42;
- return object.ok;
-
-}
-noInline(setter);
-
-for (var i = 0; i < 10000; ++i)
- shouldBe(setter('ok'), 42);
Deleted: trunk/Source/_javascript_Core/tests/stress/dfg-put-setter-by-val-class.js (191528 => 191529)
--- trunk/Source/_javascript_Core/tests/stress/dfg-put-setter-by-val-class.js 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/tests/stress/dfg-put-setter-by-val-class.js 2015-10-24 01:26:22 UTC (rev 191529)
@@ -1,44 +0,0 @@
-function shouldBe(actual, expected) {
- if (actual !== expected)
- throw new Error('bad value: ' + actual);
-}
-
-function testAttribute(object, name, type) {
- shouldBe(Reflect.has(object, name), true);
- let desc = Reflect.getOwnPropertyDescriptor(object, name);
- shouldBe(desc.configurable, true);
- shouldBe(desc.enumerable, false);
- if (type === 'get') {
- shouldBe(typeof desc.get, 'function');
- shouldBe(typeof desc.set, 'undefined');
- } else if (type === 'set') {
- shouldBe(typeof desc.get, 'undefined');
- shouldBe(typeof desc.set, 'function');
- } else {
- shouldBe(typeof desc.get, 'function');
- shouldBe(typeof desc.set, 'function');
- }
-}
-noInline(testAttribute);
-
-function setter(name)
-{
- class Cocoa {
- constructor() {
- this.ok = 0;
- }
- set [name](value) {
- this.ok = value;
- }
- }
-
- let object = new Cocoa();
- testAttribute(object.__proto__, 'hello', 'set');
- object.hello = 42;
- return object.ok;
-
-}
-noInline(setter);
-
-for (var i = 0; i < 10000; ++i)
- shouldBe(setter('hello'), 42);
Deleted: trunk/Source/_javascript_Core/tests/stress/dfg-put-setter-by-val.js (191528 => 191529)
--- trunk/Source/_javascript_Core/tests/stress/dfg-put-setter-by-val.js 2015-10-24 01:11:36 UTC (rev 191528)
+++ trunk/Source/_javascript_Core/tests/stress/dfg-put-setter-by-val.js 2015-10-24 01:26:22 UTC (rev 191529)
@@ -1,41 +0,0 @@
-function shouldBe(actual, expected) {
- if (actual !== expected)
- throw new Error('bad value: ' + actual);
-}
-
-function testAttribute(object, name, type) {
- shouldBe(Reflect.has(object, name), true);
- let desc = Reflect.getOwnPropertyDescriptor(object, name);
- shouldBe(desc.configurable, true);
- shouldBe(desc.enumerable, true);
- if (type === 'get') {
- shouldBe(typeof desc.get, 'function');
- shouldBe(typeof desc.set, 'undefined');
- } else if (type === 'set') {
- shouldBe(typeof desc.get, 'undefined');
- shouldBe(typeof desc.set, 'function');
- } else {
- shouldBe(typeof desc.get, 'function');
- shouldBe(typeof desc.set, 'function');
- }
-}
-noInline(testAttribute);
-
-function setter(name)
-{
- var object = {
- ok: 0,
- set [name](value) {
- this.ok = value;
- }
- };
-
- testAttribute(object, 'hello', 'set');
- object.hello = 42;
- return object.ok;
-
-}
-noInline(setter);
-
-for (var i = 0; i < 10000; ++i)
- shouldBe(setter('hello'), 42);