Diff
Modified: branches/safari-605-branch/Source/_javascript_Core/ChangeLog (227805 => 227806)
--- branches/safari-605-branch/Source/_javascript_Core/ChangeLog 2018-01-30 18:50:09 UTC (rev 227805)
+++ branches/safari-605-branch/Source/_javascript_Core/ChangeLog 2018-01-30 18:50:11 UTC (rev 227806)
@@ -1,3 +1,20 @@
+2018-01-30 Jason Marcell <[email protected]>
+
+ Cherry-pick r227636. rdar://problem/37019363
+
+ 2018-01-25 Mark Lam <[email protected]>
+
+ Rename some local vars from type to typedArrayType for greater clarity.
+ https://bugs.webkit.org/show_bug.cgi?id=182148
+ <rdar://problem/36882310>
+
+ Reviewed by Saam Barati.
+
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileNewTypedArrayWithSize):
+ * ftl/FTLLowerDFGToB3.cpp:
+ (JSC::FTL::DFG::LowerDFGToB3::compileNewTypedArray):
+
2018-01-25 Jason Marcell <[email protected]>
Cherry-pick r227435. rdar://problem/36873349
Modified: branches/safari-605-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp (227805 => 227806)
--- branches/safari-605-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2018-01-30 18:50:09 UTC (rev 227805)
+++ branches/safari-605-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2018-01-30 18:50:11 UTC (rev 227806)
@@ -8986,8 +8986,8 @@
void SpeculativeJIT::compileNewTypedArrayWithSize(Node* node)
{
JSGlobalObject* globalObject = m_jit.graph().globalObjectFor(node->origin.semantic);
- TypedArrayType type = node->typedArrayType();
- RegisteredStructure structure = m_jit.graph().registerStructure(globalObject->typedArrayStructureConcurrently(type));
+ auto typedArrayType = node->typedArrayType();
+ RegisteredStructure structure = m_jit.graph().registerStructure(globalObject->typedArrayStructureConcurrently(typedArrayType));
RELEASE_ASSERT(structure.get());
SpeculateInt32Operand size(this, node->child1());
@@ -9013,8 +9013,8 @@
slowCases.append(m_jit.branchTest32(MacroAssembler::Zero, sizeGPR));
m_jit.move(sizeGPR, scratchGPR);
- m_jit.lshift32(TrustedImm32(logElementSize(type)), scratchGPR);
- if (elementSize(type) < 8) {
+ m_jit.lshift32(TrustedImm32(logElementSize(typedArrayType)), scratchGPR);
+ if (elementSize(typedArrayType) < 8) {
m_jit.add32(TrustedImm32(7), scratchGPR);
m_jit.and32(TrustedImm32(~7), scratchGPR);
}
@@ -9024,12 +9024,12 @@
MacroAssembler::Jump done = m_jit.branchTest32(MacroAssembler::Zero, sizeGPR);
m_jit.move(sizeGPR, scratchGPR);
- if (elementSize(type) != 4) {
- if (elementSize(type) > 4)
- m_jit.lshift32(TrustedImm32(logElementSize(type) - 2), scratchGPR);
+ if (elementSize(typedArrayType) != 4) {
+ if (elementSize(typedArrayType) > 4)
+ m_jit.lshift32(TrustedImm32(logElementSize(typedArrayType) - 2), scratchGPR);
else {
- if (elementSize(type) > 1)
- m_jit.lshift32(TrustedImm32(logElementSize(type)), scratchGPR);
+ if (elementSize(typedArrayType) > 1)
+ m_jit.lshift32(TrustedImm32(logElementSize(typedArrayType)), scratchGPR);
m_jit.add32(TrustedImm32(3), scratchGPR);
m_jit.urshift32(TrustedImm32(2), scratchGPR);
}
@@ -9061,7 +9061,7 @@
m_jit.mutatorFence(*m_jit.vm());
addSlowPathGenerator(slowPathCall(
- slowCases, this, operationNewTypedArrayWithSizeForType(type),
+ slowCases, this, operationNewTypedArrayWithSizeForType(typedArrayType),
resultGPR, structure, sizeGPR, storageGPR));
cellResult(resultGPR, node);
Modified: branches/safari-605-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp (227805 => 227806)
--- branches/safari-605-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2018-01-30 18:50:09 UTC (rev 227805)
+++ branches/safari-605-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2018-01-30 18:50:11 UTC (rev 227806)
@@ -5575,12 +5575,12 @@
void compileNewTypedArray()
{
- TypedArrayType type = m_node->typedArrayType();
+ TypedArrayType typedArrayType = m_node->typedArrayType();
JSGlobalObject* globalObject = m_graph.globalObjectFor(m_node->origin.semantic);
switch (m_node->child1().useKind()) {
case Int32Use: {
- RegisteredStructure structure = m_graph.registerStructure(globalObject->typedArrayStructureConcurrently(type));
+ RegisteredStructure structure = m_graph.registerStructure(globalObject->typedArrayStructureConcurrently(typedArrayType));
LValue size = lowInt32(m_node->child1());
@@ -5602,8 +5602,8 @@
m_out.appendTo(nonZeroCase, slowCase);
LValue byteSize =
- m_out.shl(m_out.zeroExtPtr(size), m_out.constInt32(logElementSize(type)));
- if (elementSize(type) < 8) {
+ m_out.shl(m_out.zeroExtPtr(size), m_out.constInt32(logElementSize(typedArrayType)));
+ if (elementSize(typedArrayType) < 8) {
byteSize = m_out.bitAnd(
m_out.add(byteSize, m_out.constIntPtr(7)),
m_out.constIntPtr(~static_cast<intptr_t>(7)));
@@ -5640,7 +5640,7 @@
LValue slowResultValue = lazySlowPath(
[=, &vm] (const Vector<Location>& locations) -> RefPtr<LazySlowPath::Generator> {
return createLazyCallGenerator(vm,
- operationNewTypedArrayWithSizeForType(type), locations[0].directGPR(),
+ operationNewTypedArrayWithSizeForType(typedArrayType), locations[0].directGPR(),
CCallHelpers::TrustedImmPtr(structure.get()), locations[1].directGPR(),
locations[2].directGPR());
},
@@ -5657,8 +5657,8 @@
LValue argument = lowJSValue(m_node->child1());
LValue result = vmCall(
- pointerType(), m_out.operation(operationNewTypedArrayWithOneArgumentForType(type)),
- m_callFrame, weakPointer(globalObject->typedArrayStructureConcurrently(type)), argument);
+ pointerType(), m_out.operation(operationNewTypedArrayWithOneArgumentForType(typedArrayType)),
+ m_callFrame, weakPointer(globalObject->typedArrayStructureConcurrently(typedArrayType)), argument);
setJSValue(result);
return;
