<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164651] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164651">164651</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-02-25 09:47:29 -0800 (Tue, 25 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, roll out http://trac.webkit.org/changeset/164493.
It causes crashes, apparently because it's removing too many barriers. I will investigate
later.
* bytecode/SpeculatedType.cpp:
(JSC::speculationToAbbreviatedString):
* bytecode/SpeculatedType.h:
* dfg/DFGFixupPhase.cpp:
(JSC::DFG::FixupPhase::fixupNode):
(JSC::DFG::FixupPhase::insertStoreBarrier):
* dfg/DFGNode.h:
* ftl/FTLCapabilities.cpp:
(JSC::FTL::canCompile):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::compareEqObjectOrOtherToObject):
(JSC::FTL::LowerDFGToLLVM::equalNullOrUndefined):
(JSC::FTL::LowerDFGToLLVM::isNotNully):
(JSC::FTL::LowerDFGToLLVM::isNully):
(JSC::FTL::LowerDFGToLLVM::speculate):
(JSC::FTL::LowerDFGToLLVM::speculateObjectOrOther):
(JSC::FTL::LowerDFGToLLVM::speculateNotCell):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeSpeculatedTypecpp">trunk/Source/JavaScriptCore/bytecode/SpeculatedType.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeSpeculatedTypeh">trunk/Source/JavaScriptCore/bytecode/SpeculatedType.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGFixupPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGNodeh">trunk/Source/JavaScriptCore/dfg/DFGNode.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLCapabilitiescpp">trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (164650 => 164651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-25 17:15:18 UTC (rev 164650)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-25 17:47:29 UTC (rev 164651)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-02-25 Filip Pizlo <fpizlo@apple.com>
+
+ Unreviewed, roll out http://trac.webkit.org/changeset/164493.
+
+ It causes crashes, apparently because it's removing too many barriers. I will investigate
+ later.
+
+ * bytecode/SpeculatedType.cpp:
+ (JSC::speculationToAbbreviatedString):
+ * bytecode/SpeculatedType.h:
+ * dfg/DFGFixupPhase.cpp:
+ (JSC::DFG::FixupPhase::fixupNode):
+ (JSC::DFG::FixupPhase::insertStoreBarrier):
+ * dfg/DFGNode.h:
+ * ftl/FTLCapabilities.cpp:
+ (JSC::FTL::canCompile):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compareEqObjectOrOtherToObject):
+ (JSC::FTL::LowerDFGToLLVM::equalNullOrUndefined):
+ (JSC::FTL::LowerDFGToLLVM::isNotNully):
+ (JSC::FTL::LowerDFGToLLVM::isNully):
+ (JSC::FTL::LowerDFGToLLVM::speculate):
+ (JSC::FTL::LowerDFGToLLVM::speculateObjectOrOther):
+ (JSC::FTL::LowerDFGToLLVM::speculateNotCell):
+
</ins><span class="cx"> 2014-02-24 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix build.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeSpeculatedTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/SpeculatedType.cpp (164650 => 164651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/SpeculatedType.cpp 2014-02-25 17:15:18 UTC (rev 164650)
+++ trunk/Source/JavaScriptCore/bytecode/SpeculatedType.cpp 2014-02-25 17:47:29 UTC (rev 164651)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011, 2012, 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -255,8 +255,6 @@
</span><span class="cx"> return "<Boolean>";
</span><span class="cx"> if (isOtherSpeculation(prediction))
</span><span class="cx"> return "<Other>";
</span><del>- if (isNotCellSpeculation(prediction))
- return "<NotCell>";
</del><span class="cx"> return "";
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeSpeculatedTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/SpeculatedType.h (164650 => 164651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/SpeculatedType.h 2014-02-25 17:15:18 UTC (rev 164650)
+++ trunk/Source/JavaScriptCore/bytecode/SpeculatedType.h 2014-02-25 17:47:29 UTC (rev 164651)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011, 2012, 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -340,11 +340,6 @@
</span><span class="cx"> return !value || value == SpecOther;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool isNotCellSpeculation(SpeculatedType value)
-{
- return !!value && !(value & SpecCell);
-}
-
</del><span class="cx"> inline bool isEmptySpeculation(SpeculatedType value)
</span><span class="cx"> {
</span><span class="cx"> return value == SpecEmpty;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (164650 => 164651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2014-02-25 17:15:18 UTC (rev 164650)
+++ trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2014-02-25 17:47:29 UTC (rev 164651)
</span><span class="lines">@@ -1062,6 +1062,11 @@
</span><span class="cx"> // FIXME: Get rid of this by allowing Phantoms after terminals.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=126778
</span><span class="cx"> m_requiredPhantoms.resize(0);
</span><ins>+ // Since StoreBarriers are recursively fixed up so that their children look
+ // identical to that of the node they're barrier-ing, we need to avoid adding
+ // any Phantoms when processing them because this would invalidate the
+ // InsertionSet's invariant of inserting things in a monotonically increasing
+ // order. This should be okay anyways because StoreBarriers can't exit.
</ins><span class="cx"> } else
</span><span class="cx"> addPhantomsIfNecessary();
</span><span class="cx"> }
</span><span class="lines">@@ -1610,47 +1615,15 @@
</span><span class="cx">
</span><span class="cx"> void insertStoreBarrier(unsigned indexInBlock, Edge child1, Edge child2 = Edge())
</span><span class="cx"> {
</span><del>- if (!child2) {
- m_insertionSet.insertNode(
- indexInBlock, SpecNone, StoreBarrier, m_currentNode->origin, child1);
- return;
</del><ins>+ Node* barrierNode;
+ if (!child2)
+ barrierNode = m_graph.addNode(SpecNone, StoreBarrier, m_currentNode->origin, Edge(child1.node(), child1.useKind()));
+ else {
+ barrierNode = m_graph.addNode(SpecNone, ConditionalStoreBarrier, m_currentNode->origin,
+ Edge(child1.node(), child1.useKind()), Edge(child2.node(), child2.useKind()));
</ins><span class="cx"> }
</span><del>-
- // Figure out some cheap way of avoiding the barrier entirely. In addition to being
- // cheap, we try to make these checks strong: we want to prove as much as possible for
- // the code that follows.
- if (child2->shouldSpeculateInt32()) {
- insertPhantomCheck(indexInBlock, child2.node(), Int32Use);
- return;
- }
- if (child2->shouldSpeculateMachineInt()) {
- insertPhantomCheck(indexInBlock, child2.node(), MachineIntUse);
- return;
- }
- if (child2->shouldSpeculateBoolean()) {
- insertPhantomCheck(indexInBlock, child2.node(), BooleanUse);
- return;
- }
- if (child2->shouldSpeculateOther()) {
- insertPhantomCheck(indexInBlock, child2.node(), OtherUse);
- return;
- }
- if (child2->shouldSpeculateNotCell()) {
- insertPhantomCheck(indexInBlock, child2.node(), NotCellUse);
- return;
- }
-
- m_insertionSet.insertNode(
- indexInBlock, SpecNone, ConditionalStoreBarrier, m_currentNode->origin,
- child1, Edge(child2.node(), UntypedUse));
</del><ins>+ m_insertionSet.insert(indexInBlock, barrierNode);
</ins><span class="cx"> }
</span><del>-
- void insertPhantomCheck(unsigned indexInBlock, Node* node, UseKind useKind)
- {
- m_insertionSet.insertNode(
- indexInBlock, SpecNone, Phantom, m_currentNode->origin, Edge(node, useKind));
- observeUseKindOnNode(node, useKind);
- }
</del><span class="cx">
</span><span class="cx"> void fixIntEdge(Edge& edge)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGNode.h (164650 => 164651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGNode.h 2014-02-25 17:15:18 UTC (rev 164650)
+++ trunk/Source/JavaScriptCore/dfg/DFGNode.h 2014-02-25 17:47:29 UTC (rev 164651)
</span><span class="lines">@@ -1500,21 +1500,11 @@
</span><span class="cx"> return isObjectOrOtherSpeculation(prediction());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool shouldSpeculateOther()
- {
- return isOtherSpeculation(prediction());
- }
-
</del><span class="cx"> bool shouldSpeculateCell()
</span><span class="cx"> {
</span><span class="cx"> return isCellSpeculation(prediction());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool shouldSpeculateNotCell()
- {
- return isNotCellSpeculation(prediction());
- }
-
</del><span class="cx"> static bool shouldSpeculateBoolean(Node* op1, Node* op2)
</span><span class="cx"> {
</span><span class="cx"> return op1->shouldSpeculateBoolean() && op2->shouldSpeculateBoolean();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (164650 => 164651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2014-02-25 17:15:18 UTC (rev 164650)
+++ trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2014-02-25 17:47:29 UTC (rev 164651)
</span><span class="lines">@@ -337,7 +337,6 @@
</span><span class="cx"> case StringOrStringObjectUse:
</span><span class="cx"> case FinalObjectUse:
</span><span class="cx"> case NotCellUse:
</span><del>- case OtherUse:
</del><span class="cx"> // These are OK.
</span><span class="cx"> break;
</span><span class="cx"> default:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (164650 => 164651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-02-25 17:15:18 UTC (rev 164650)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-02-25 17:47:29 UTC (rev 164651)
</span><span class="lines">@@ -3927,7 +3927,7 @@
</span><span class="cx">
</span><span class="cx"> m_out.appendTo(leftNotCellCase, continuation);
</span><span class="cx"> FTL_TYPE_CHECK(
</span><del>- jsValueValue(leftValue), leftChild, SpecOther | SpecCell, isNotOther(leftValue));
</del><ins>+ jsValueValue(leftValue), leftChild, SpecOther | SpecCell, isNotNully(leftValue));
</ins><span class="cx"> ValueFromBlock notCellResult = m_out.anchor(m_out.booleanFalse);
</span><span class="cx"> m_out.jump(continuation);
</span><span class="cx">
</span><span class="lines">@@ -4261,11 +4261,11 @@
</span><span class="cx"> primitiveResult = m_out.equal(value, m_out.constInt64(ValueUndefined));
</span><span class="cx"> break;
</span><span class="cx"> case EqualNullOrUndefined:
</span><del>- primitiveResult = isOther(value);
</del><ins>+ primitiveResult = isNully(value);
</ins><span class="cx"> break;
</span><span class="cx"> case SpeculateNullOrUndefined:
</span><span class="cx"> FTL_TYPE_CHECK(
</span><del>- jsValueValue(value), edge, SpecCell | SpecOther, isNotOther(value));
</del><ins>+ jsValueValue(value), edge, SpecCell | SpecOther, isNotNully(value));
</ins><span class="cx"> primitiveResult = m_out.booleanTrue;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -4914,13 +4914,13 @@
</span><span class="cx"> value, m_out.constInt64(ValueTrue), m_out.constInt64(ValueFalse));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LValue isNotOther(LValue value)
</del><ins>+ LValue isNotNully(LValue value)
</ins><span class="cx"> {
</span><span class="cx"> return m_out.notEqual(
</span><span class="cx"> m_out.bitAnd(value, m_out.constInt64(~TagBitUndefined)),
</span><span class="cx"> m_out.constInt64(ValueNull));
</span><span class="cx"> }
</span><del>- LValue isOther(LValue value)
</del><ins>+ LValue isNully(LValue value)
</ins><span class="cx"> {
</span><span class="cx"> return m_out.equal(
</span><span class="cx"> m_out.bitAnd(value, m_out.constInt64(~TagBitUndefined)),
</span><span class="lines">@@ -4973,9 +4973,6 @@
</span><span class="cx"> case MachineIntUse:
</span><span class="cx"> speculateMachineInt(edge);
</span><span class="cx"> break;
</span><del>- case OtherUse:
- speculateOther(edge);
- break;
</del><span class="cx"> case BooleanUse:
</span><span class="cx"> speculateBoolean(edge);
</span><span class="cx"> break;
</span><span class="lines">@@ -5123,7 +5120,7 @@
</span><span class="cx"> m_out.appendTo(primitiveCase, continuation);
</span><span class="cx">
</span><span class="cx"> FTL_TYPE_CHECK(
</span><del>- jsValueValue(value), edge, SpecCell | SpecOther, isNotOther(value));
</del><ins>+ jsValueValue(value), edge, SpecCell | SpecOther, isNotNully(value));
</ins><span class="cx">
</span><span class="cx"> m_out.jump(continuation);
</span><span class="cx">
</span><span class="lines">@@ -5246,15 +5243,6 @@
</span><span class="cx"> lowWhicheverInt52(edge, kind);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void speculateOther(Edge edge)
- {
- if (!m_interpreter.needsTypeCheck(edge))
- return;
-
- LValue value = lowJSValue(edge, ManualOperandSpeculation);
- typeCheck(jsValueValue(value), edge, SpecOther, isNotOther(value));
- }
-
</del><span class="cx"> void speculateBoolean(Edge edge)
</span><span class="cx"> {
</span><span class="cx"> lowBoolean(edge);
</span><span class="lines">@@ -5265,7 +5253,7 @@
</span><span class="cx"> if (!m_interpreter.needsTypeCheck(edge))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- LValue value = lowJSValue(edge, ManualOperandSpeculation);
</del><ins>+ LValue value = lowJSValue(edge);
</ins><span class="cx"> typeCheck(jsValueValue(value), edge, ~SpecCell, isCell(value));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>