Diff
Modified: branches/safari-604-branch/JSTests/ChangeLog (223650 => 223651)
--- branches/safari-604-branch/JSTests/ChangeLog 2017-10-19 02:26:00 UTC (rev 223650)
+++ branches/safari-604-branch/JSTests/ChangeLog 2017-10-19 02:26:07 UTC (rev 223651)
@@ -1,3 +1,18 @@
+2017-10-18 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r223614. rdar://problem/34920288
+
+ 2017-10-18 Mark Lam <mark....@apple.com>
+
+ The compiler should always register a structure when it adds its transitionWatchPointSet.
+ https://bugs.webkit.org/show_bug.cgi?id=178420
+ <rdar://problem/34814024>
+
+ Reviewed by Saam Barati and Filip Pizlo.
+
+ * stress/regress-178420.js: Added.
+ (new.Array.10000.map):
+
2017-10-02 Jason Marcell <jmarc...@apple.com>
Cherry-pick r222598. rdar://problem/34771434
Added: branches/safari-604-branch/JSTests/stress/regress-178420.js (0 => 223651)
--- branches/safari-604-branch/JSTests/stress/regress-178420.js (rev 0)
+++ branches/safari-604-branch/JSTests/stress/regress-178420.js 2017-10-19 02:26:07 UTC (rev 223651)
@@ -0,0 +1,17 @@
+// This test passes if it does not crash.
+
+var arr0 = [42];
+var arr4 = [,,,,,,,,,,,,,,,,,,,,,,,,];
+
+new Array(10000).map((function() {
+ arr4[-35] = 1.1;
+}), this);
+
+arr0[0] = [];
+gc();
+
+Array.prototype.__proto__ = {};
+gc();
+
+for(var i = 0; i < 65536; i++)
+ arr0['a'+i] = 1.1;
Modified: branches/safari-604-branch/Source/_javascript_Core/ChangeLog (223650 => 223651)
--- branches/safari-604-branch/Source/_javascript_Core/ChangeLog 2017-10-19 02:26:00 UTC (rev 223650)
+++ branches/safari-604-branch/Source/_javascript_Core/ChangeLog 2017-10-19 02:26:07 UTC (rev 223651)
@@ -1,3 +1,51 @@
+2017-10-18 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r223614. rdar://problem/34920288
+
+ 2017-10-18 Mark Lam <mark....@apple.com>
+
+ The compiler should always register a structure when it adds its transitionWatchPointSet.
+ https://bugs.webkit.org/show_bug.cgi?id=178420
+ <rdar://problem/34814024>
+
+ Reviewed by Saam Barati and Filip Pizlo.
+
+ Instead of invoking addLazily() to add a structure's transitionWatchpointSet, we
+ now invoke Graph::registerAndWatchStructureTransition() on the structure.
+ registerAndWatchStructureTransition() both registers the structure and add its
+ transitionWatchpointSet to the plan desired watchpoints.
+
+ Graph::registerAndWatchStructureTransition() is based on Graph::registerStructure()
+ except registerAndWatchStructureTransition() adds the structure's
+ transitionWatchpointSet unconditionally.
+
+ * dfg/DFGArgumentsEliminationPhase.cpp:
+ * dfg/DFGArrayMode.cpp:
+ (JSC::DFG::ArrayMode::refine const):
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::handleIntrinsicCall):
+ * dfg/DFGFixupPhase.cpp:
+ (JSC::DFG::FixupPhase::fixupNode):
+
+ * dfg/DFGGraph.cpp:
+ (JSC::DFG::Graph::registerAndWatchStructureTransition):
+ * dfg/DFGGraph.h:
+
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileGetByValOnString):
+ - The second set of addLazily()s is redundant. This set is executed only when
+ prototypeChainIsSane is true, and prototypeChainIsSane can only be true if and
+ only if we've executed the if statement above it. That preceding if statement
+ already registerAndWatchStructureTransition() the same 2 structures. Hence,
+ this second set can be deleted.
+
+ * dfg/DFGWatchpointCollectionPhase.cpp:
+ (JSC::DFG::WatchpointCollectionPhase::addLazily):
+ - Deleted an unused function.
+
+ * ftl/FTLLowerDFGToB3.cpp:
+ (JSC::FTL::DFG::LowerDFGToB3::compileStringCharAt):
+
2017-10-16 Jason Marcell <jmarc...@apple.com>
Cherry-pick r222417. rdar://problem/35010839
Modified: branches/safari-604-branch/Source/_javascript_Core/dfg/DFGArgumentsEliminationPhase.cpp (223650 => 223651)
--- branches/safari-604-branch/Source/_javascript_Core/dfg/DFGArgumentsEliminationPhase.cpp 2017-10-19 02:26:00 UTC (rev 223650)
+++ branches/safari-604-branch/Source/_javascript_Core/dfg/DFGArgumentsEliminationPhase.cpp 2017-10-19 02:26:07 UTC (rev 223651)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2017 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -244,20 +244,20 @@
// If we're out-of-bounds then we proceed only if the prototype chain
// for the allocation is sane (i.e. doesn't have indexed properties).
JSGlobalObject* globalObject = m_graph.globalObjectFor(edge->origin.semantic);
- InlineWatchpointSet& objectPrototypeTransition = globalObject->objectPrototype()->structure()->transitionWatchpointSet();
+ Structure* objectPrototypeStructure = globalObject->objectPrototype()->structure();
if (edge->op() == CreateRest) {
- InlineWatchpointSet& arrayPrototypeTransition = globalObject->arrayPrototype()->structure()->transitionWatchpointSet();
- if (arrayPrototypeTransition.isStillValid()
- && objectPrototypeTransition.isStillValid()
+ Structure* arrayPrototypeStructure = globalObject->arrayPrototype()->structure();
+ if (arrayPrototypeStructure->transitionWatchpointSetIsStillValid()
+ && objectPrototypeStructure->transitionWatchpointSetIsStillValid()
&& globalObject->arrayPrototypeChainIsSane()) {
- m_graph.watchpoints().addLazily(arrayPrototypeTransition);
- m_graph.watchpoints().addLazily(objectPrototypeTransition);
+ m_graph.registerAndWatchStructureTransition(arrayPrototypeStructure);
+ m_graph.registerAndWatchStructureTransition(objectPrototypeStructure);
break;
}
} else {
- if (objectPrototypeTransition.isStillValid()
+ if (objectPrototypeStructure->transitionWatchpointSetIsStillValid()
&& globalObject->objectPrototypeIsSane()) {
- m_graph.watchpoints().addLazily(objectPrototypeTransition);
+ m_graph.registerAndWatchStructureTransition(objectPrototypeStructure);
break;
}
}
Modified: branches/safari-604-branch/Source/_javascript_Core/dfg/DFGArrayMode.cpp (223650 => 223651)
--- branches/safari-604-branch/Source/_javascript_Core/dfg/DFGArrayMode.cpp 2017-10-19 02:26:00 UTC (rev 223650)
+++ branches/safari-604-branch/Source/_javascript_Core/dfg/DFGArrayMode.cpp 2017-10-19 02:26:07 UTC (rev 223651)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2017 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -214,8 +214,8 @@
&& arrayClass() == Array::OriginalArray
&& globalObject->arrayPrototypeChainIsSane()
&& !graph.hasExitSite(node->origin.semantic, OutOfBounds)) {
- graph.watchpoints().addLazily(globalObject->arrayPrototype()->structure()->transitionWatchpointSet());
- graph.watchpoints().addLazily(globalObject->objectPrototype()->structure()->transitionWatchpointSet());
+ graph.registerAndWatchStructureTransition(globalObject->arrayPrototype()->structure());
+ graph.registerAndWatchStructureTransition(globalObject->objectPrototype()->structure());
if (globalObject->arrayPrototypeChainIsSane())
return withSpeculation(Array::SaneChain);
}
Modified: branches/safari-604-branch/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp (223650 => 223651)
--- branches/safari-604-branch/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp 2017-10-19 02:26:00 UTC (rev 223650)
+++ branches/safari-604-branch/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp 2017-10-19 02:26:07 UTC (rev 223651)
@@ -2319,21 +2319,21 @@
case Array::Contiguous: {
JSGlobalObject* globalObject = m_graph.globalObjectFor(currentNodeOrigin().semantic);
- InlineWatchpointSet& objectPrototypeTransition = globalObject->objectPrototype()->structure()->transitionWatchpointSet();
- InlineWatchpointSet& arrayPrototypeTransition = globalObject->arrayPrototype()->structure()->transitionWatchpointSet();
+ Structure* arrayPrototypeStructure = globalObject->arrayPrototype()->structure();
+ Structure* objectPrototypeStructure = globalObject->objectPrototype()->structure();
// FIXME: We could easily relax the Array/Object.prototype transition as long as we OSR exitted if we saw a hole.
// https://bugs.webkit.org/show_bug.cgi?id=173171
if (globalObject->arraySpeciesWatchpoint().state() == IsWatched
&& globalObject->havingABadTimeWatchpoint()->isStillValid()
- && arrayPrototypeTransition.isStillValid()
- && objectPrototypeTransition.isStillValid()
+ && arrayPrototypeStructure->transitionWatchpointSetIsStillValid()
+ && objectPrototypeStructure->transitionWatchpointSetIsStillValid()
&& globalObject->arrayPrototypeChainIsSane()) {
m_graph.watchpoints().addLazily(globalObject->arraySpeciesWatchpoint());
m_graph.watchpoints().addLazily(globalObject->havingABadTimeWatchpoint());
- m_graph.watchpoints().addLazily(arrayPrototypeTransition);
- m_graph.watchpoints().addLazily(objectPrototypeTransition);
+ m_graph.registerAndWatchStructureTransition(arrayPrototypeStructure);
+ m_graph.registerAndWatchStructureTransition(objectPrototypeStructure);
insertChecks();
@@ -2408,19 +2408,19 @@
case Array::Contiguous: {
JSGlobalObject* globalObject = m_graph.globalObjectFor(currentNodeOrigin().semantic);
- InlineWatchpointSet& objectPrototypeTransition = globalObject->objectPrototype()->structure()->transitionWatchpointSet();
- InlineWatchpointSet& arrayPrototypeTransition = globalObject->arrayPrototype()->structure()->transitionWatchpointSet();
+ Structure* arrayPrototypeStructure = globalObject->arrayPrototype()->structure();
+ Structure* objectPrototypeStructure = globalObject->objectPrototype()->structure();
// FIXME: We could easily relax the Array/Object.prototype transition as long as we OSR exitted if we saw a hole.
// https://bugs.webkit.org/show_bug.cgi?id=173171
if (globalObject->havingABadTimeWatchpoint()->isStillValid()
- && arrayPrototypeTransition.isStillValid()
- && objectPrototypeTransition.isStillValid()
+ && arrayPrototypeStructure->transitionWatchpointSetIsStillValid()
+ && objectPrototypeStructure->transitionWatchpointSetIsStillValid()
&& globalObject->arrayPrototypeChainIsSane()) {
m_graph.watchpoints().addLazily(globalObject->havingABadTimeWatchpoint());
- m_graph.watchpoints().addLazily(arrayPrototypeTransition);
- m_graph.watchpoints().addLazily(objectPrototypeTransition);
+ m_graph.registerAndWatchStructureTransition(arrayPrototypeStructure);
+ m_graph.registerAndWatchStructureTransition(objectPrototypeStructure);
insertChecks();
Modified: branches/safari-604-branch/Source/_javascript_Core/dfg/DFGFixupPhase.cpp (223650 => 223651)
--- branches/safari-604-branch/Source/_javascript_Core/dfg/DFGFixupPhase.cpp 2017-10-19 02:26:00 UTC (rev 223650)
+++ branches/safari-604-branch/Source/_javascript_Core/dfg/DFGFixupPhase.cpp 2017-10-19 02:26:07 UTC (rev 223651)
@@ -760,10 +760,8 @@
}
if (canDoSaneChain) {
- m_graph.watchpoints().addLazily(
- globalObject->arrayPrototype()->structure()->transitionWatchpointSet());
- m_graph.watchpoints().addLazily(
- globalObject->objectPrototype()->structure()->transitionWatchpointSet());
+ m_graph.registerAndWatchStructureTransition(globalObject->arrayPrototype()->structure());
+ m_graph.registerAndWatchStructureTransition(globalObject->objectPrototype()->structure());
if (globalObject->arrayPrototypeChainIsSane())
node->setArrayMode(arrayMode.withSpeculation(Array::SaneChain));
}
@@ -1169,16 +1167,16 @@
// When we go down the fast path, we don't consult the prototype chain, so we must prove
// that it doesn't contain any indexed properties, and that any holes will result in
// jsUndefined().
- InlineWatchpointSet& objectPrototypeTransition = globalObject->objectPrototype()->structure()->transitionWatchpointSet();
- InlineWatchpointSet& arrayPrototypeTransition = globalObject->arrayPrototype()->structure()->transitionWatchpointSet();
- if (node->child1()->shouldSpeculateArray()
- && arrayPrototypeTransition.isStillValid()
- && objectPrototypeTransition.isStillValid()
+ Structure* arrayPrototypeStructure = globalObject->arrayPrototype()->structure();
+ Structure* objectPrototypeStructure = globalObject->objectPrototype()->structure();
+ if (node->child1()->shouldSpeculateArray()
+ && arrayPrototypeStructure->transitionWatchpointSetIsStillValid()
+ && objectPrototypeStructure->transitionWatchpointSetIsStillValid()
&& globalObject->arrayPrototypeChainIsSane()
&& m_graph.isWatchingArrayIteratorProtocolWatchpoint(node->child1().node())
&& m_graph.isWatchingHavingABadTimeWatchpoint(node->child1().node())) {
- m_graph.watchpoints().addLazily(objectPrototypeTransition);
- m_graph.watchpoints().addLazily(arrayPrototypeTransition);
+ m_graph.registerAndWatchStructureTransition(objectPrototypeStructure);
+ m_graph.registerAndWatchStructureTransition(arrayPrototypeStructure);
fixEdge<ArrayUse>(node->child1());
} else
fixEdge<CellUse>(node->child1());
Modified: branches/safari-604-branch/Source/_javascript_Core/dfg/DFGGraph.cpp (223650 => 223651)
--- branches/safari-604-branch/Source/_javascript_Core/dfg/DFGGraph.cpp 2017-10-19 02:26:00 UTC (rev 223650)
+++ branches/safari-604-branch/Source/_javascript_Core/dfg/DFGGraph.cpp 2017-10-19 02:26:07 UTC (rev 223651)
@@ -1422,6 +1422,12 @@
return RegisteredStructure::createPrivate(structure);
}
+void Graph::registerAndWatchStructureTransition(Structure* structure)
+{
+ m_plan.weakReferences.addLazily(structure);
+ m_plan.watchpoints.addLazily(structure->transitionWatchpointSet());
+}
+
void Graph::assertIsRegistered(Structure* structure)
{
// It's convenient to be able to call this with a maybe-null structure.
Modified: branches/safari-604-branch/Source/_javascript_Core/dfg/DFGGraph.h (223650 => 223651)
--- branches/safari-604-branch/Source/_javascript_Core/dfg/DFGGraph.h 2017-10-19 02:26:00 UTC (rev 223650)
+++ branches/safari-604-branch/Source/_javascript_Core/dfg/DFGGraph.h 2017-10-19 02:26:07 UTC (rev 223651)
@@ -217,6 +217,7 @@
return registerStructure(structure, ignored);
}
RegisteredStructure registerStructure(Structure*, StructureRegistrationResult&);
+ void registerAndWatchStructureTransition(Structure*);
void assertIsRegistered(Structure* structure);
// CodeBlock is optional, but may allow additional information to be dumped (e.g. Identifier names).
Modified: branches/safari-604-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp (223650 => 223651)
--- branches/safari-604-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2017-10-19 02:26:00 UTC (rev 223650)
+++ branches/safari-604-branch/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2017-10-19 02:26:07 UTC (rev 223651)
@@ -2080,14 +2080,11 @@
// on a stringPrototypeChainIsSane() guaranteeing that the prototypes have no negative
// indexed properties either.
// https://bugs.webkit.org/show_bug.cgi?id=144668
- m_jit.graph().watchpoints().addLazily(globalObject->stringPrototype()->structure()->transitionWatchpointSet());
- m_jit.graph().watchpoints().addLazily(globalObject->objectPrototype()->structure()->transitionWatchpointSet());
+ m_jit.graph().registerAndWatchStructureTransition(globalObject->stringPrototype()->structure());
+ m_jit.graph().registerAndWatchStructureTransition(globalObject->objectPrototype()->structure());
prototypeChainIsSane = globalObject->stringPrototypeChainIsSane();
}
if (prototypeChainIsSane) {
- m_jit.graph().watchpoints().addLazily(globalObject->stringPrototype()->structure()->transitionWatchpointSet());
- m_jit.graph().watchpoints().addLazily(globalObject->objectPrototype()->structure()->transitionWatchpointSet());
-
#if USE(JSVALUE64)
addSlowPathGenerator(std::make_unique<SaneStringGetByValSlowPathGenerator>(
outOfBounds, this, JSValueRegs(scratchReg), baseReg, propertyReg));
Modified: branches/safari-604-branch/Source/_javascript_Core/dfg/DFGWatchpointCollectionPhase.cpp (223650 => 223651)
--- branches/safari-604-branch/Source/_javascript_Core/dfg/DFGWatchpointCollectionPhase.cpp 2017-10-19 02:26:00 UTC (rev 223650)
+++ branches/safari-604-branch/Source/_javascript_Core/dfg/DFGWatchpointCollectionPhase.cpp 2017-10-19 02:26:07 UTC (rev 223651)
@@ -112,10 +112,6 @@
{
m_graph.watchpoints().addLazily(set);
}
- void addLazily(InlineWatchpointSet& set)
- {
- m_graph.watchpoints().addLazily(set);
- }
JSGlobalObject* globalObject()
{
Modified: branches/safari-604-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp (223650 => 223651)
--- branches/safari-604-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2017-10-19 02:26:00 UTC (rev 223650)
+++ branches/safari-604-branch/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2017-10-19 02:26:07 UTC (rev 223651)
@@ -5428,9 +5428,9 @@
// SaneChainOutOfBounds.
// https://bugs.webkit.org/show_bug.cgi?id=144668
- m_graph.watchpoints().addLazily(globalObject->stringPrototype()->structure()->transitionWatchpointSet());
- m_graph.watchpoints().addLazily(globalObject->objectPrototype()->structure()->transitionWatchpointSet());
-
+ m_graph.registerAndWatchStructureTransition(globalObject->stringPrototype()->structure());
+ m_graph.registerAndWatchStructureTransition(globalObject->objectPrototype()->structure());
+
prototypeChainIsSane = globalObject->stringPrototypeChainIsSane();
}
if (prototypeChainIsSane) {
