implement op_get_rest_length so that we can allocate the rest array with the right size from the start
https://bugs.webkit.org/show_bug.cgi?id=151467
Reviewed by Geoffrey Garen and Mark Lam.
This patch implements op_get_rest_length which returns the length
that the rest parameter array will be. We're implementing this because
it might be a constant value in the presence of inlining in the DFG.
We will take advantage of this optimization opportunity in a future patch:
https://bugs.webkit.org/show_bug.cgi?id=151454
to emit better code for op_copy_rest.
op_get_rest_length has two operands:
1) a destination
2) A constant indicating the number of parameters to skip when copying the rest array.
op_get_rest_length lowers to a JSConstant node when we're inlined
and not a varargs call (in this case, we statically know the arguments
length). When that condition isn't met, we lower op_get_rest_length to
GetRestArray. GetRestArray produces its result as an int32.
* bytecode/BytecodeList.json:
* bytecode/BytecodeUseDef.h:
(JSC::computeUsesForBytecodeOffset):
(JSC::computeDefsForBytecodeOffset):
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::dumpBytecode):
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::emitNewArray):
(JSC::BytecodeGenerator::emitNewArrayWithSize):
(JSC::BytecodeGenerator::emitNewFunction):
(JSC::BytecodeGenerator::emitExpectedFunctionSnippet):
(JSC::BytecodeGenerator::emitRestParameter):
* bytecompiler/BytecodeGenerator.h:
* bytecompiler/NodesCodegen.cpp:
(JSC::RestParameterNode::emit):
* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::parseBlock):
* dfg/DFGCapabilities.cpp:
(JSC::DFG::capabilityLevel):
* dfg/DFGClobberize.h:
(JSC::DFG::clobberize):
* dfg/DFGDoesGC.cpp:
(JSC::DFG::doesGC):
* dfg/DFGFixupPhase.cpp:
(JSC::DFG::FixupPhase::fixupNode):
* dfg/DFGMayExit.cpp:
(JSC::DFG::mayExit):
* dfg/DFGNode.h:
(JSC::DFG::Node::numberOfArgumentsToSkip):
* dfg/DFGNodeType.h:
* dfg/DFGOperations.cpp:
* dfg/DFGOperations.h:
* dfg/DFGPredictionPropagationPhase.cpp:
(JSC::DFG::PredictionPropagationPhase::propagate):
* dfg/DFGSafeToExecute.h:
(JSC::DFG::safeToExecute):
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileCopyRest):
(JSC::DFG::SpeculativeJIT::compileGetRestLength):
(JSC::DFG::SpeculativeJIT::compileNotifyWrite):
* dfg/DFGSpeculativeJIT.h:
(JSC::DFG::SpeculativeJIT::callOperation):
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* ftl/FTLCapabilities.cpp:
(JSC::FTL::canCompile):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::compileNode):
(JSC::FTL::DFG::LowerDFGToLLVM::compileCopyRest):
(JSC::FTL::DFG::LowerDFGToLLVM::compileGetRestLength):
(JSC::FTL::DFG::LowerDFGToLLVM::compileNewObject):
* jit/JIT.cpp:
(JSC::JIT::privateCompileMainPass):
* jit/JIT.h:
* jit/JITOpcodes.cpp:
(JSC::JIT::emit_op_copy_rest):
(JSC::JIT::emit_op_get_rest_length):
* llint/LowLevelInterpreter.asm:
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:
* runtime/CommonSlowPaths.cpp:
(JSC::SLOW_PATH_DECL):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@192814 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 7540ba74..69710dc 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,93 @@
+2015-11-30 Saam barati <sbarati@apple.com>
+
+ implement op_get_rest_length so that we can allocate the rest array with the right size from the start
+ https://bugs.webkit.org/show_bug.cgi?id=151467
+
+ Reviewed by Geoffrey Garen and Mark Lam.
+
+ This patch implements op_get_rest_length which returns the length
+ that the rest parameter array will be. We're implementing this because
+ it might be a constant value in the presence of inlining in the DFG.
+ We will take advantage of this optimization opportunity in a future patch:
+ https://bugs.webkit.org/show_bug.cgi?id=151454
+ to emit better code for op_copy_rest.
+
+ op_get_rest_length has two operands:
+ 1) a destination
+ 2) A constant indicating the number of parameters to skip when copying the rest array.
+
+ op_get_rest_length lowers to a JSConstant node when we're inlined
+ and not a varargs call (in this case, we statically know the arguments
+ length). When that condition isn't met, we lower op_get_rest_length to
+ GetRestArray. GetRestArray produces its result as an int32.
+
+ * bytecode/BytecodeList.json:
+ * bytecode/BytecodeUseDef.h:
+ (JSC::computeUsesForBytecodeOffset):
+ (JSC::computeDefsForBytecodeOffset):
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::dumpBytecode):
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::emitNewArray):
+ (JSC::BytecodeGenerator::emitNewArrayWithSize):
+ (JSC::BytecodeGenerator::emitNewFunction):
+ (JSC::BytecodeGenerator::emitExpectedFunctionSnippet):
+ (JSC::BytecodeGenerator::emitRestParameter):
+ * bytecompiler/BytecodeGenerator.h:
+ * bytecompiler/NodesCodegen.cpp:
+ (JSC::RestParameterNode::emit):
+ * dfg/DFGAbstractInterpreterInlines.h:
+ (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::parseBlock):
+ * dfg/DFGCapabilities.cpp:
+ (JSC::DFG::capabilityLevel):
+ * dfg/DFGClobberize.h:
+ (JSC::DFG::clobberize):
+ * dfg/DFGDoesGC.cpp:
+ (JSC::DFG::doesGC):
+ * dfg/DFGFixupPhase.cpp:
+ (JSC::DFG::FixupPhase::fixupNode):
+ * dfg/DFGMayExit.cpp:
+ (JSC::DFG::mayExit):
+ * dfg/DFGNode.h:
+ (JSC::DFG::Node::numberOfArgumentsToSkip):
+ * dfg/DFGNodeType.h:
+ * dfg/DFGOperations.cpp:
+ * dfg/DFGOperations.h:
+ * dfg/DFGPredictionPropagationPhase.cpp:
+ (JSC::DFG::PredictionPropagationPhase::propagate):
+ * dfg/DFGSafeToExecute.h:
+ (JSC::DFG::safeToExecute):
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileCopyRest):
+ (JSC::DFG::SpeculativeJIT::compileGetRestLength):
+ (JSC::DFG::SpeculativeJIT::compileNotifyWrite):
+ * dfg/DFGSpeculativeJIT.h:
+ (JSC::DFG::SpeculativeJIT::callOperation):
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * ftl/FTLCapabilities.cpp:
+ (JSC::FTL::canCompile):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileNode):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileCopyRest):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileGetRestLength):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileNewObject):
+ * jit/JIT.cpp:
+ (JSC::JIT::privateCompileMainPass):
+ * jit/JIT.h:
+ * jit/JITOpcodes.cpp:
+ (JSC::JIT::emit_op_copy_rest):
+ (JSC::JIT::emit_op_get_rest_length):
+ * llint/LowLevelInterpreter.asm:
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+ * runtime/CommonSlowPaths.cpp:
+ (JSC::SLOW_PATH_DECL):
+
2015-11-30 Filip Pizlo <fpizlo@apple.com>
MacroAssembler needs an API for disabling scratch registers
diff --git a/Source/JavaScriptCore/bytecode/BytecodeList.json b/Source/JavaScriptCore/bytecode/BytecodeList.json
index 2990fae..f6c89a9 100644
--- a/Source/JavaScriptCore/bytecode/BytecodeList.json
+++ b/Source/JavaScriptCore/bytecode/BytecodeList.json
@@ -129,7 +129,8 @@
{ "name" : "op_to_index_string", "length" : 3 },
{ "name" : "op_load_arrowfunction_this", "length" : 2 },
{ "name" : "op_assert", "length" : 3 },
- { "name" : "op_copy_rest", "length": 3 }
+ { "name" : "op_copy_rest", "length": 4 },
+ { "name" : "op_get_rest_length", "length": 3 }
]
},
{
diff --git a/Source/JavaScriptCore/bytecode/BytecodeUseDef.h b/Source/JavaScriptCore/bytecode/BytecodeUseDef.h
index a6132c3..cbb8948 100644
--- a/Source/JavaScriptCore/bytecode/BytecodeUseDef.h
+++ b/Source/JavaScriptCore/bytecode/BytecodeUseDef.h
@@ -53,6 +53,7 @@
case op_profile_control_flow:
case op_create_direct_arguments:
case op_create_out_of_band_arguments:
+ case op_get_rest_length:
return;
case op_assert:
case op_get_scope:
@@ -70,8 +71,7 @@
case op_jeq_null:
case op_jneq_null:
case op_dec:
- case op_inc:
- case op_copy_rest: {
+ case op_inc: {
functor(codeBlock, instruction, opcodeID, instruction[1].u.operand);
return;
}
@@ -82,7 +82,8 @@
case op_jnlesseq:
case op_jngreater:
case op_jngreatereq:
- case op_jless: {
+ case op_jless:
+ case op_copy_rest: {
functor(codeBlock, instruction, opcodeID, instruction[1].u.operand);
functor(codeBlock, instruction, opcodeID, instruction[2].u.operand);
return;
@@ -377,7 +378,8 @@
case op_del_by_id:
case op_del_by_val:
case op_unsigned:
- case op_get_from_arguments: {
+ case op_get_from_arguments:
+ case op_get_rest_length: {
functor(codeBlock, instruction, opcodeID, instruction[1].u.operand);
return;
}
diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.cpp b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
index fca6301..9e1386e 100644
--- a/Source/JavaScriptCore/bytecode/CodeBlock.cpp
+++ b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
@@ -783,7 +783,16 @@
}
case op_copy_rest: {
int r0 = (++it)->u.operand;
+ int r1 = (++it)->u.operand;
+ unsigned argumentOffset = (++it)->u.unsignedValue;
printLocationAndOp(out, exec, location, it, "copy_rest");
+ out.printf("%s, %s, ", registerName(r0).data(), registerName(r1).data());
+ out.printf("ArgumentsOffset: %u", argumentOffset);
+ break;
+ }
+ case op_get_rest_length: {
+ int r0 = (++it)->u.operand;
+ printLocationAndOp(out, exec, location, it, "get_rest_length");
out.printf("%s, ", registerName(r0).data());
unsigned argumentOffset = (++it)->u.unsignedValue;
out.printf("ArgumentsOffset: %u", argumentOffset);
diff --git a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
index b9370c8..1abbba4 100644
--- a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
+++ b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
@@ -2471,6 +2471,16 @@
return dst;
}
+RegisterID* BytecodeGenerator::emitNewArrayWithSize(RegisterID* dst, RegisterID* length)
+{
+ emitOpcode(op_new_array_with_size);
+ instructions().append(dst->index());
+ instructions().append(length->index());
+ instructions().append(newArrayAllocationProfile());
+
+ return dst;
+}
+
RegisterID* BytecodeGenerator::emitNewFunction(RegisterID* dst, FunctionMetadataNode* function)
{
return emitNewFunctionInternal(dst, m_codeBlock->addFunctionDecl(makeFunction(function)));
@@ -2600,12 +2610,9 @@
instructions().append(realCall->bind(begin, instructions().size()));
if (dst != ignoredResult()) {
- if (callArguments.argumentCountIncludingThis() == 2) {
- emitOpcode(op_new_array_with_size);
- instructions().append(dst->index());
- instructions().append(callArguments.argumentRegister(0)->index());
- instructions().append(newArrayAllocationProfile());
- } else {
+ if (callArguments.argumentCountIncludingThis() == 2)
+ emitNewArrayWithSize(dst, callArguments.argumentRegister(0));
+ else {
ASSERT(callArguments.argumentCountIncludingThis() == 1);
emitOpcode(op_new_array);
instructions().append(dst->index());
@@ -3833,10 +3840,16 @@
RegisterID* BytecodeGenerator::emitRestParameter(RegisterID* result, unsigned numParametersToSkip)
{
- emitNewArray(result, nullptr, 0);
+ RefPtr<RegisterID> restArrayLength = newTemporary();
+ emitOpcode(op_get_rest_length);
+ instructions().append(restArrayLength->index());
+ instructions().append(numParametersToSkip);
+
+ emitNewArrayWithSize(result, restArrayLength.get());
emitOpcode(op_copy_rest);
instructions().append(result->index());
+ instructions().append(restArrayLength->index());
instructions().append(numParametersToSkip);
return result;
diff --git a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h
index 38b659a..07316b1 100644
--- a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h
+++ b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h
@@ -497,6 +497,7 @@
void liftTDZCheckIfPossible(const Variable&);
RegisterID* emitNewObject(RegisterID* dst);
RegisterID* emitNewArray(RegisterID* dst, ElementNode*, unsigned length); // stops at first elision
+ RegisterID* emitNewArrayWithSize(RegisterID* dst, RegisterID* length);
RegisterID* emitNewFunction(RegisterID* dst, FunctionMetadataNode*);
RegisterID* emitNewFunctionInternal(RegisterID* dst, unsigned index);
diff --git a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
index 4a7e2e7..242738e 100644
--- a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
+++ b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
@@ -3483,7 +3483,8 @@
return;
}
- RefPtr<RegisterID> restParameterArray = generator.emitRestParameter(generator.newTemporary(), m_numParametersToSkip);
+ RefPtr<RegisterID> restParameterArray = generator.newTemporary();
+ generator.emitRestParameter(restParameterArray.get(), m_numParametersToSkip);
generator.emitProfileType(restParameterArray.get(), var, m_divotStart, m_divotEnd);
RefPtr<RegisterID> scope = generator.emitResolveScope(nullptr, var);
generator.emitExpressionInfo(m_divotEnd, m_divotStart, m_divotEnd);
diff --git a/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h b/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h
index b95ef8f..fbe82e9 100644
--- a/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h
+++ b/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h
@@ -1763,6 +1763,10 @@
forNode(node).setType(SpecInt32);
break;
+ case GetRestLength:
+ forNode(node).setType(SpecInt32);
+ break;
+
case GetGetter: {
JSValue base = forNode(node->child1()).m_value;
if (base) {
diff --git a/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
index 24dbd7b..439e620 100644
--- a/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
+++ b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
@@ -3331,10 +3331,31 @@
NEXT_OPCODE(op_new_regexp);
}
+ case op_get_rest_length: {
+ InlineCallFrame* inlineCallFrame = this->inlineCallFrame();
+ Node* length;
+ if (inlineCallFrame && !inlineCallFrame->isVarargs()) {
+ unsigned argumentsLength = inlineCallFrame->arguments.size() - 1;
+ unsigned numParamsToSkip = currentInstruction[2].u.unsignedValue;
+ JSValue restLength;
+ if (argumentsLength <= numParamsToSkip)
+ restLength = jsNumber(0);
+ else
+ restLength = jsNumber(argumentsLength - numParamsToSkip);
+
+ length = jsConstant(restLength);
+ } else
+ length = addToGraph(GetRestLength, OpInfo(currentInstruction[2].u.unsignedValue));
+ set(VirtualRegister(currentInstruction[1].u.operand), length);
+ NEXT_OPCODE(op_get_rest_length);
+ }
+
case op_copy_rest: {
noticeArgumentsUse();
- addToGraph(CopyRest,
- OpInfo(currentInstruction[2].u.unsignedValue), get(VirtualRegister(currentInstruction[1].u.operand)));
+ Node* array = get(VirtualRegister(currentInstruction[1].u.operand));
+ Node* arrayLength = get(VirtualRegister(currentInstruction[2].u.operand));
+ addToGraph(CopyRest, OpInfo(currentInstruction[3].u.unsignedValue),
+ array, arrayLength);
NEXT_OPCODE(op_copy_rest);
}
diff --git a/Source/JavaScriptCore/dfg/DFGCapabilities.cpp b/Source/JavaScriptCore/dfg/DFGCapabilities.cpp
index ae06593..7a5ec3f 100644
--- a/Source/JavaScriptCore/dfg/DFGCapabilities.cpp
+++ b/Source/JavaScriptCore/dfg/DFGCapabilities.cpp
@@ -220,6 +220,7 @@
case op_get_parent_scope:
case op_catch:
case op_copy_rest:
+ case op_get_rest_length:
return CanCompileAndInline;
case op_put_to_scope: {
diff --git a/Source/JavaScriptCore/dfg/DFGClobberize.h b/Source/JavaScriptCore/dfg/DFGClobberize.h
index 9d7969d..a85586d 100644
--- a/Source/JavaScriptCore/dfg/DFGClobberize.h
+++ b/Source/JavaScriptCore/dfg/DFGClobberize.h
@@ -428,6 +428,10 @@
read(AbstractHeap(Stack, JSStack::ArgumentCount));
def(HeapLocation(StackPayloadLoc, AbstractHeap(Stack, JSStack::ArgumentCount)), LazyNode(node));
return;
+
+ case GetRestLength:
+ read(Stack);
+ return;
case GetLocal:
read(AbstractHeap(Stack, node->local()));
diff --git a/Source/JavaScriptCore/dfg/DFGDoesGC.cpp b/Source/JavaScriptCore/dfg/DFGDoesGC.cpp
index 4269088..b26e0a5 100644
--- a/Source/JavaScriptCore/dfg/DFGDoesGC.cpp
+++ b/Source/JavaScriptCore/dfg/DFGDoesGC.cpp
@@ -50,6 +50,7 @@
case Identity:
case GetCallee:
case GetArgumentCount:
+ case GetRestLength:
case GetLocal:
case SetLocal:
case MovHint:
diff --git a/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp b/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp
index 97c3c1e..a957d2b 100644
--- a/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp
+++ b/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp
@@ -1370,6 +1370,7 @@
case CopyRest: {
fixEdge<KnownCellUse>(node->child1());
+ fixEdge<KnownInt32Use>(node->child2());
break;
}
@@ -1381,6 +1382,7 @@
case GetLocal:
case GetCallee:
case GetArgumentCount:
+ case GetRestLength:
case Flush:
case PhantomLocal:
case GetLocalUnlinked:
diff --git a/Source/JavaScriptCore/dfg/DFGMayExit.cpp b/Source/JavaScriptCore/dfg/DFGMayExit.cpp
index 8259a97..d1e21ed 100644
--- a/Source/JavaScriptCore/dfg/DFGMayExit.cpp
+++ b/Source/JavaScriptCore/dfg/DFGMayExit.cpp
@@ -113,6 +113,7 @@
case GetStack:
case GetCallee:
case GetArgumentCount:
+ case GetRestLength:
case GetScope:
case PhantomLocal:
case CountExecution:
diff --git a/Source/JavaScriptCore/dfg/DFGNode.h b/Source/JavaScriptCore/dfg/DFGNode.h
index 532e689..1aa1516 100644
--- a/Source/JavaScriptCore/dfg/DFGNode.h
+++ b/Source/JavaScriptCore/dfg/DFGNode.h
@@ -2161,7 +2161,7 @@
unsigned numberOfArgumentsToSkip()
{
- ASSERT(op() == CopyRest);
+ ASSERT(op() == CopyRest || op() == GetRestLength);
return static_cast<unsigned>(m_opInfo);
}
diff --git a/Source/JavaScriptCore/dfg/DFGNodeType.h b/Source/JavaScriptCore/dfg/DFGNodeType.h
index 9a321f9..2ed3ce4 100644
--- a/Source/JavaScriptCore/dfg/DFGNodeType.h
+++ b/Source/JavaScriptCore/dfg/DFGNodeType.h
@@ -262,6 +262,8 @@
macro(NewArrayBuffer, NodeResultJS) \
macro(NewTypedArray, NodeResultJS | NodeMustGenerate) \
macro(NewRegexp, NodeResultJS) \
+ /* Rest Parameter */\
+ macro(GetRestLength, NodeResultInt32) \
macro(CopyRest, NodeMustGenerate) \
\
/* Support for allocation sinking. */\
diff --git a/Source/JavaScriptCore/dfg/DFGOperations.cpp b/Source/JavaScriptCore/dfg/DFGOperations.cpp
index afc4cd3..8fa219c 100644
--- a/Source/JavaScriptCore/dfg/DFGOperations.cpp
+++ b/Source/JavaScriptCore/dfg/DFGOperations.cpp
@@ -818,11 +818,11 @@
return result;
}
-void JIT_OPERATION operationCopyRest(ExecState* exec, JSCell* arrayAsCell, Register* argumentStart, unsigned numberOfParamsToSkip, unsigned numberOfArguments)
+void JIT_OPERATION operationCopyRest(ExecState* exec, JSCell* arrayAsCell, Register* argumentStart, unsigned numberOfParamsToSkip, unsigned arraySize)
{
- RELEASE_ASSERT(numberOfArguments > numberOfParamsToSkip); // We should only call this from JIT code when this condition is true.
+ ASSERT(arraySize);
JSArray* array = jsCast<JSArray*>(arrayAsCell);
- unsigned arraySize = numberOfArguments - numberOfParamsToSkip;
+ ASSERT(arraySize == array->length());
array->setLength(exec, arraySize);
for (unsigned i = 0; i < arraySize; i++)
array->putDirectIndex(exec, i, argumentStart[i + numberOfParamsToSkip].jsValue());
diff --git a/Source/JavaScriptCore/dfg/DFGOperations.h b/Source/JavaScriptCore/dfg/DFGOperations.h
index d6c2b74..8d1fc2b 100644
--- a/Source/JavaScriptCore/dfg/DFGOperations.h
+++ b/Source/JavaScriptCore/dfg/DFGOperations.h
@@ -103,7 +103,7 @@
JSCell* JIT_OPERATION operationCreateScopedArguments(ExecState*, Structure*, Register* argumentStart, int32_t length, JSFunction* callee, JSLexicalEnvironment*);
JSCell* JIT_OPERATION operationCreateClonedArgumentsDuringExit(ExecState*, InlineCallFrame*, JSFunction*, int32_t argumentCount);
JSCell* JIT_OPERATION operationCreateClonedArguments(ExecState*, Structure*, Register* argumentStart, int32_t length, JSFunction* callee);
-void JIT_OPERATION operationCopyRest(ExecState*, JSCell*, Register* argumentStart, unsigned numberOfParamsToSkip, unsigned argumentsCount);
+void JIT_OPERATION operationCopyRest(ExecState*, JSCell*, Register* argumentStart, unsigned numberOfParamsToSkip, unsigned arraySize);
double JIT_OPERATION operationFModOnInts(int32_t, int32_t) WTF_INTERNAL;
size_t JIT_OPERATION operationObjectIsObject(ExecState*, JSGlobalObject*, JSCell*) WTF_INTERNAL;
size_t JIT_OPERATION operationObjectIsFunction(ExecState*, JSGlobalObject*, JSCell*) WTF_INTERNAL;
diff --git a/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp b/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp
index 5c09c22..59ae9f3 100644
--- a/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp
+++ b/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp
@@ -219,6 +219,11 @@
break;
}
+ case GetRestLength: {
+ changed |= setPrediction(SpecInt32);
+ break;
+ }
+
case GetTypedArrayByteOffset:
case GetArrayLength: {
changed |= setPrediction(SpecInt32);
diff --git a/Source/JavaScriptCore/dfg/DFGSafeToExecute.h b/Source/JavaScriptCore/dfg/DFGSafeToExecute.h
index b15b0b4..f5c68db 100644
--- a/Source/JavaScriptCore/dfg/DFGSafeToExecute.h
+++ b/Source/JavaScriptCore/dfg/DFGSafeToExecute.h
@@ -140,6 +140,7 @@
case CreateThis:
case GetCallee:
case GetArgumentCount:
+ case GetRestLength:
case GetLocal:
case SetLocal:
case PutStack:
diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp
index bf4936e..77a14b4 100755
--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp
+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp
@@ -5352,22 +5352,20 @@
ASSERT(node->op() == CopyRest);
SpeculateCellOperand array(this, node->child1());
- GPRReg arrayGPR = array.gpr();
-
- GPRTemporary argumentsLength(this);
- GPRReg argumentsLengthGPR = argumentsLength.gpr();
-
GPRTemporary argumentsStart(this);
- GPRReg argumentsStartGPR = argumentsStart.gpr();
+ SpeculateStrictInt32Operand arrayLength(this, node->child2());
- emitGetLength(node->origin.semantic, argumentsLengthGPR);
- CCallHelpers::Jump done = m_jit.branch32(MacroAssembler::LessThanOrEqual, argumentsLengthGPR, TrustedImm32(node->numberOfArgumentsToSkip()));
+ GPRReg arrayGPR = array.gpr();
+ GPRReg argumentsStartGPR = argumentsStart.gpr();
+ GPRReg arrayLengthGPR = arrayLength.gpr();
+
+ CCallHelpers::Jump done = m_jit.branch32(MacroAssembler::Equal, arrayLengthGPR, TrustedImm32(0));
emitGetArgumentStart(node->origin.semantic, argumentsStartGPR);
- silentSpillAllRegisters(argumentsLengthGPR, argumentsStartGPR);
- // Arguments: 0:exec, 1:JSCell* array, 2:arguments start, 3:number of arguments to skip, 4:number of arguments
- callOperation(operationCopyRest, arrayGPR, argumentsStartGPR, TrustedImm32(node->numberOfArgumentsToSkip()), argumentsLengthGPR);
- silentFillAllRegisters(argumentsLengthGPR);
+ silentSpillAllRegisters(argumentsStartGPR);
+ // Arguments: 0:exec, 1:JSCell* array, 2:arguments start, 3:number of arguments to skip, 4:array length
+ callOperation(operationCopyRest, arrayGPR, argumentsStartGPR, Imm32(node->numberOfArgumentsToSkip()), arrayLengthGPR);
+ silentFillAllRegisters(argumentsStartGPR);
m_jit.exceptionCheck();
done.link(&m_jit);
@@ -5375,6 +5373,24 @@
noResult(node);
}
+void SpeculativeJIT::compileGetRestLength(Node* node)
+{
+ ASSERT(node->op() == GetRestLength);
+
+ GPRTemporary result(this);
+ GPRReg resultGPR = result.gpr();
+
+ emitGetLength(node->origin.semantic, resultGPR);
+ CCallHelpers::Jump hasNonZeroLength = m_jit.branch32(MacroAssembler::Above, resultGPR, Imm32(node->numberOfArgumentsToSkip()));
+ m_jit.move(TrustedImm32(0), resultGPR);
+ CCallHelpers::Jump done = m_jit.jump();
+ hasNonZeroLength.link(&m_jit);
+ if (node->numberOfArgumentsToSkip())
+ m_jit.sub32(TrustedImm32(node->numberOfArgumentsToSkip()), resultGPR);
+ done.link(&m_jit);
+ int32Result(resultGPR, node);
+}
+
void SpeculativeJIT::compileNotifyWrite(Node* node)
{
WatchpointSet* set = node->watchpointSet();
diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h
index cb11a44..8660b04 100755
--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h
+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h
@@ -1221,9 +1221,9 @@
return appendCall(operation);
}
- JITCompiler::Call callOperation(V_JITOperation_ECRUiUi operation, GPRReg arg1, GPRReg arg2, TrustedImm32 arg3, GPRReg arg4)
+ JITCompiler::Call callOperation(V_JITOperation_ECRUiUi operation, GPRReg arg1, GPRReg arg2, Imm32 arg3, GPRReg arg4)
{
- m_jit.setupArgumentsWithExecState(arg1, arg2, arg3, arg4);
+ m_jit.setupArgumentsWithExecState(arg1, arg2, arg3.asTrustedImm32(), arg4);
return appendCall(operation);
}
@@ -2245,6 +2245,7 @@
void compileCreateScopedArguments(Node*);
void compileCreateClonedArguments(Node*);
void compileCopyRest(Node*);
+ void compileGetRestLength(Node*);
void compileNotifyWrite(Node*);
bool compileRegExpExec(Node*);
void compileIsObjectOrNull(Node*);
diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp
index 2a3c2f8..b0c4e94 100644
--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp
+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp
@@ -4443,6 +4443,11 @@
break;
}
+ case GetRestLength: {
+ compileGetRestLength(node);
+ break;
+ }
+
case NewFunction:
case NewArrowFunction:
compileNewFunction(node);
diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
index d38c0f2..570332c 100644
--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
@@ -3827,6 +3827,11 @@
int32Result(result.gpr(), node);
break;
}
+
+ case GetRestLength: {
+ compileGetRestLength(node);
+ break;
+ }
case GetScope:
compileGetScope(node);
diff --git a/Source/JavaScriptCore/ftl/FTLCapabilities.cpp b/Source/JavaScriptCore/ftl/FTLCapabilities.cpp
index f4bb10b..64a4822 100644
--- a/Source/JavaScriptCore/ftl/FTLCapabilities.cpp
+++ b/Source/JavaScriptCore/ftl/FTLCapabilities.cpp
@@ -211,6 +211,7 @@
case PutGetterByVal:
case PutSetterByVal:
case CopyRest:
+ case GetRestLength:
// These are OK.
break;
diff --git a/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp b/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp
index 9b1face..3ef2c55 100644
--- a/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp
+++ b/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp
@@ -970,6 +970,9 @@
case CopyRest:
compileCopyRest();
break;
+ case GetRestLength:
+ compileGetRestLength();
+ break;
case PhantomLocal:
case LoopHint:
@@ -3645,22 +3648,42 @@
LBasicBlock doCopyRest = FTL_NEW_BLOCK(m_out, ("CopyRest C call"));
LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("FillRestParameter continuation"));
- LValue numberOfArgumentsToSkip = m_out.constInt32(m_node->numberOfArgumentsToSkip());
- LValue numberOfArguments = getArgumentsLength().value;
+ LValue arrayLength = lowInt32(m_node->child2());
m_out.branch(
- m_out.above(numberOfArguments, numberOfArgumentsToSkip),
- unsure(doCopyRest), unsure(continuation));
+ m_out.equal(arrayLength, m_out.constInt32(0)),
+ unsure(continuation), unsure(doCopyRest));
LBasicBlock lastNext = m_out.appendTo(doCopyRest, continuation);
- // Arguments: 0:exec, 1:JSCell* array, 2:arguments start, 3:number of arguments to skip, 4:number of arguments
+ // Arguments: 0:exec, 1:JSCell* array, 2:arguments start, 3:number of arguments to skip, 4:array length
+ LValue numberOfArgumentsToSkip = m_out.constInt32(m_node->numberOfArgumentsToSkip());
vmCall(
m_out.voidType,m_out.operation(operationCopyRest), m_callFrame, lowCell(m_node->child1()),
- getArgumentsStart(), numberOfArgumentsToSkip, numberOfArguments);
+ getArgumentsStart(), numberOfArgumentsToSkip, arrayLength);
m_out.jump(continuation);
m_out.appendTo(continuation, lastNext);
}
+
+ void compileGetRestLength()
+ {
+ LBasicBlock nonZeroLength = FTL_NEW_BLOCK(m_out, ("GetRestLength non zero"));
+ LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("GetRestLength continuation"));
+
+ ValueFromBlock zeroLengthResult = m_out.anchor(m_out.constInt32(0));
+
+ LValue numberOfArgumentsToSkip = m_out.constInt32(m_node->numberOfArgumentsToSkip());
+ LValue argumentsLength = getArgumentsLength().value;
+ m_out.branch(m_out.above(argumentsLength, numberOfArgumentsToSkip),
+ unsure(nonZeroLength), unsure(continuation));
+
+ LBasicBlock lastNext = m_out.appendTo(nonZeroLength, continuation);
+ ValueFromBlock nonZeroLengthResult = m_out.anchor(m_out.sub(argumentsLength, numberOfArgumentsToSkip));
+ m_out.jump(continuation);
+
+ m_out.appendTo(continuation, lastNext);
+ setInt32(m_out.phi(m_out.int32, zeroLengthResult, nonZeroLengthResult));
+ }
void compileNewObject()
{
diff --git a/Source/JavaScriptCore/jit/JIT.cpp b/Source/JavaScriptCore/jit/JIT.cpp
index a61b57d..2d6f02c 100644
--- a/Source/JavaScriptCore/jit/JIT.cpp
+++ b/Source/JavaScriptCore/jit/JIT.cpp
@@ -212,6 +212,7 @@
DEFINE_OP(op_create_scoped_arguments)
DEFINE_OP(op_create_out_of_band_arguments)
DEFINE_OP(op_copy_rest)
+ DEFINE_OP(op_get_rest_length)
DEFINE_OP(op_check_tdz)
DEFINE_OP(op_assert)
DEFINE_OP(op_debug)
diff --git a/Source/JavaScriptCore/jit/JIT.h b/Source/JavaScriptCore/jit/JIT.h
index d225823..b2c424a 100755
--- a/Source/JavaScriptCore/jit/JIT.h
+++ b/Source/JavaScriptCore/jit/JIT.h
@@ -491,6 +491,7 @@
void emit_op_create_scoped_arguments(Instruction*);
void emit_op_create_out_of_band_arguments(Instruction*);
void emit_op_copy_rest(Instruction*);
+ void emit_op_get_rest_length(Instruction*);
void emit_op_check_tdz(Instruction*);
void emit_op_assert(Instruction*);
void emit_op_debug(Instruction*);
diff --git a/Source/JavaScriptCore/jit/JITOpcodes.cpp b/Source/JavaScriptCore/jit/JITOpcodes.cpp
index d494896..f60ae57 100755
--- a/Source/JavaScriptCore/jit/JITOpcodes.cpp
+++ b/Source/JavaScriptCore/jit/JITOpcodes.cpp
@@ -1405,6 +1405,35 @@
slowPathCall.call();
}
+void JIT::emit_op_get_rest_length(Instruction* currentInstruction)
+{
+ int dst = currentInstruction[1].u.operand;
+ unsigned numParamsToSkip = currentInstruction[2].u.unsignedValue;
+ load32(payloadFor(JSStack::ArgumentCount), regT0);
+ sub32(TrustedImm32(1), regT0);
+ Jump zeroLength = branch32(LessThanOrEqual, regT0, Imm32(numParamsToSkip));
+ sub32(Imm32(numParamsToSkip), regT0);
+#if USE(JSVALUE64)
+ boxInt32(regT0, JSValueRegs(regT0));
+#endif
+ Jump done = jump();
+
+ zeroLength.link(this);
+#if USE(JSVALUE64)
+ move(TrustedImm64(JSValue::encode(jsNumber(0))), regT0);
+#else
+ move(TrustedImm32(0), regT0);
+#endif
+
+ done.link(this);
+#if USE(JSVALUE64)
+ emitPutVirtualRegister(dst, regT0);
+#else
+ move(TrustedImm32(JSValue::Int32Tag), regT1);
+ emitPutVirtualRegister(dst, JSValueRegs(regT1, regT0));
+#endif
+}
+
} // namespace JSC
#endif // ENABLE(JIT)
diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
index f8e128c..5ad5b3f 100644
--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
@@ -1678,7 +1678,7 @@
_llint_op_copy_rest:
traceExecution()
callSlowPath(_slow_path_copy_rest)
- dispatch(3)
+ dispatch(4)
# Lastly, make sure that we can link even though we don't support all opcodes.
diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
index 52efbe6..e1d122c 100644
--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
@@ -2430,3 +2430,20 @@
storei CellTag, TagOffset[cfr, t1, 8]
storei t0, PayloadOffset[cfr, t1, 8]
dispatch(2)
+
+
+_llint_op_get_rest_length:
+ traceExecution()
+ loadi PayloadOffset + ArgumentCount[cfr], t0
+ subi 1, t0
+ loadisFromInstruction(2, t1)
+ bilteq t0, t1, .storeZero
+ subi t1, t0
+ jmp .finish
+.storeZero:
+ move 0, t0
+.finish:
+ loadisFromInstruction(1, t1)
+ storei t0, PayloadOffset[cfr, t1, 8]
+ storei Int32Tag, TagOffset[cfr, t1, 8]
+ dispatch(3)
diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
index c92d8ea..49f3cd7 100644
--- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
@@ -2298,3 +2298,20 @@
loadisFromInstruction(1, t1)
storeq t0, [cfr, t1, 8]
dispatch(2)
+
+
+_llint_op_get_rest_length:
+ traceExecution()
+ loadi PayloadOffset + ArgumentCount[cfr], t0
+ subi 1, t0
+ loadisFromInstruction(2, t1)
+ bilteq t0, t1, .storeZero
+ subi t1, t0
+ jmp .boxUp
+.storeZero:
+ move 0, t0
+.boxUp:
+ orq tagTypeNumber, t0
+ loadisFromInstruction(1, t1)
+ storeq t0, [cfr, t1, 8]
+ dispatch(3)
diff --git a/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp b/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp
index 90f65c2..490636f 100644
--- a/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp
+++ b/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp
@@ -704,14 +704,14 @@
SLOW_PATH_DECL(slow_path_copy_rest)
{
BEGIN();
- unsigned numParamsToSkip = pc[2].u.unsignedValue;
- unsigned numArgumentsToFunction = exec->argumentCount();
- if (numArgumentsToFunction <= numParamsToSkip)
+ unsigned arraySize = OP_C(2).jsValue().asUInt32();
+ if (!arraySize) {
+ ASSERT(!jsCast<JSArray*>(OP(1).jsValue())->length());
END();
-
+ }
JSArray* array = jsCast<JSArray*>(OP(1).jsValue());
- unsigned arraySize = numArgumentsToFunction - numParamsToSkip;
- array->setLength(exec, arraySize);
+ ASSERT(arraySize == array->length());
+ unsigned numParamsToSkip = pc[3].u.unsignedValue;
for (unsigned i = 0; i < arraySize; i++)
array->putDirectIndex(exec, i, exec->uncheckedArgument(i + numParamsToSkip));
END();
