<!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>[165690] 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/165690">165690</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-03-15 23:02:43 -0700 (Sat, 15 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL should support CheckHasInstance/InstanceOf
https://bugs.webkit.org/show_bug.cgi?id=130285
Reviewed by Sam Weinig.
Fairly straightforward; I also discovered an inaccurate FIXME in the process.
* dfg/DFGFixupPhase.cpp:
(JSC::DFG::FixupPhase::fixupNode):
* ftl/FTLAbstractHeapRepository.h:
* ftl/FTLCapabilities.cpp:
(JSC::FTL::canCompile):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::compileNode):
(JSC::FTL::LowerDFGToLLVM::compileCheckHasInstance):
(JSC::FTL::LowerDFGToLLVM::compileInstanceOf):
* ftl/FTLOutput.h:
(JSC::FTL::Output::phi):
* tests/stress/instanceof.js: Added.
* tests/stress/instanceof-not-cell.js: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGFixupPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLAbstractHeapRepositoryh">trunk/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.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>
<li><a href="#trunkSourceJavaScriptCoreftlFTLOutputh">trunk/Source/JavaScriptCore/ftl/FTLOutput.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressinstanceofnotcelljs">trunk/Source/JavaScriptCore/tests/stress/instanceof-not-cell.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressinstanceofjs">trunk/Source/JavaScriptCore/tests/stress/instanceof.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (165689 => 165690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-16 04:57:03 UTC (rev 165689)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-16 06:02:43 UTC (rev 165690)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-03-15 Filip Pizlo <fpizlo@apple.com>
+
+ FTL should support CheckHasInstance/InstanceOf
+ https://bugs.webkit.org/show_bug.cgi?id=130285
+
+ Reviewed by Sam Weinig.
+
+ Fairly straightforward; I also discovered an inaccurate FIXME in the process.
+
+ * dfg/DFGFixupPhase.cpp:
+ (JSC::DFG::FixupPhase::fixupNode):
+ * ftl/FTLAbstractHeapRepository.h:
+ * ftl/FTLCapabilities.cpp:
+ (JSC::FTL::canCompile):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compileNode):
+ (JSC::FTL::LowerDFGToLLVM::compileCheckHasInstance):
+ (JSC::FTL::LowerDFGToLLVM::compileInstanceOf):
+ * ftl/FTLOutput.h:
+ (JSC::FTL::Output::phi):
+ * tests/stress/instanceof.js: Added.
+ * tests/stress/instanceof-not-cell.js: Added.
+
</ins><span class="cx"> 2014-03-15 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> It should be possible to adjust DFG and FTL compiler thread priorities
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (165689 => 165690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2014-03-16 04:57:03 UTC (rev 165689)
+++ trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2014-03-16 06:02:43 UTC (rev 165690)
</span><span class="lines">@@ -903,8 +903,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case InstanceOf: {
</span><del>- // FIXME: This appears broken: CheckHasInstance already does an unconditional cell
- // check. https://bugs.webkit.org/show_bug.cgi?id=107479
</del><span class="cx"> if (!(node->child1()->prediction() & ~SpecCell))
</span><span class="cx"> fixEdge<CellUse>(node->child1());
</span><span class="cx"> fixEdge<CellUse>(node->child2());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLAbstractHeapRepositoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.h (165689 => 165690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.h 2014-03-16 04:57:03 UTC (rev 165689)
+++ trunk/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.h 2014-03-16 06:02:43 UTC (rev 165690)
</span><span class="lines">@@ -67,9 +67,10 @@
</span><span class="cx"> macro(MarkedBlock_markBits, MarkedBlock::offsetOfMarks()) \
</span><span class="cx"> macro(StringImpl_data, StringImpl::dataOffset()) \
</span><span class="cx"> macro(StringImpl_hashAndFlags, StringImpl::flagsOffset()) \
</span><del>- macro(Structure_structureID, Structure::structureIDOffset()) \
</del><span class="cx"> macro(Structure_classInfo, Structure::classInfoOffset()) \
</span><span class="cx"> macro(Structure_globalObject, Structure::globalObjectOffset()) \
</span><ins>+ macro(Structure_prototype, Structure::prototypeOffset()) \
+ macro(Structure_structureID, Structure::structureIDOffset())
</ins><span class="cx">
</span><span class="cx"> #define FOR_EACH_INDEXED_ABSTRACT_HEAP(macro) \
</span><span class="cx"> macro(JSRopeString_fibers, JSRopeString::offsetOfFibers(), sizeof(WriteBarrier<JSString>)) \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (165689 => 165690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2014-03-16 04:57:03 UTC (rev 165689)
+++ trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2014-03-16 06:02:43 UTC (rev 165690)
</span><span class="lines">@@ -149,6 +149,8 @@
</span><span class="cx"> case IsString:
</span><span class="cx"> case IsObject:
</span><span class="cx"> case IsFunction:
</span><ins>+ case CheckHasInstance:
+ case InstanceOf:
</ins><span class="cx"> // These are OK.
</span><span class="cx"> break;
</span><span class="cx"> case PutByIdDirect:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (165689 => 165690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-03-16 04:57:03 UTC (rev 165689)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-03-16 06:02:43 UTC (rev 165690)
</span><span class="lines">@@ -593,6 +593,12 @@
</span><span class="cx"> case IsFunction:
</span><span class="cx"> compileIsFunction();
</span><span class="cx"> break;
</span><ins>+ case CheckHasInstance:
+ compileCheckHasInstance();
+ break;
+ case InstanceOf:
+ compileInstanceOf();
+ break;
</ins><span class="cx"> case CountExecution:
</span><span class="cx"> compileCountExecution();
</span><span class="cx"> break;
</span><span class="lines">@@ -3771,6 +3777,66 @@
</span><span class="cx"> setBoolean(m_out.notNull(pointerResult));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void compileCheckHasInstance()
+ {
+ speculate(
+ Uncountable, noValue(), 0,
+ m_out.testIsZero8(
+ m_out.load8(lowCell(m_node->child1()), m_heaps.JSCell_typeInfoFlags),
+ m_out.constInt8(ImplementsDefaultHasInstance)));
+ }
+
+ void compileInstanceOf()
+ {
+ LValue cell;
+
+ if (m_node->child1().useKind() == UntypedUse)
+ cell = lowJSValue(m_node->child1());
+ else
+ cell = lowCell(m_node->child1());
+
+ LValue prototype = lowCell(m_node->child2());
+
+ LBasicBlock isCellCase = FTL_NEW_BLOCK(m_out, ("InstanceOf cell case"));
+ LBasicBlock loop = FTL_NEW_BLOCK(m_out, ("InstanceOf loop"));
+ LBasicBlock notYetInstance = FTL_NEW_BLOCK(m_out, ("InstanceOf not yet instance"));
+ LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("InstanceOf continuation"));
+
+ LValue condition;
+ if (m_node->child1().useKind() == UntypedUse)
+ condition = isCell(cell);
+ else
+ condition = m_out.booleanTrue;
+
+ ValueFromBlock notCellResult = m_out.anchor(m_out.booleanFalse);
+ m_out.branch(condition, unsure(isCellCase), unsure(continuation));
+
+ LBasicBlock lastNext = m_out.appendTo(isCellCase, loop);
+
+ speculate(BadType, noValue(), 0, isNotObject(prototype));
+
+ ValueFromBlock originalValue = m_out.anchor(cell);
+ m_out.jump(loop);
+
+ m_out.appendTo(loop, notYetInstance);
+ LValue value = m_out.phi(m_out.int64, originalValue);
+ LValue structure = loadStructure(value);
+ LValue currentPrototype = m_out.load64(structure, m_heaps.Structure_prototype);
+ ValueFromBlock isInstanceResult = m_out.anchor(m_out.booleanTrue);
+ m_out.branch(
+ m_out.equal(currentPrototype, prototype),
+ unsure(continuation), unsure(notYetInstance));
+
+ m_out.appendTo(notYetInstance, continuation);
+ ValueFromBlock notInstanceResult = m_out.anchor(m_out.booleanFalse);
+ addIncoming(value, m_out.anchor(currentPrototype));
+ m_out.branch(isCell(currentPrototype), unsure(loop), unsure(continuation));
+
+ m_out.appendTo(continuation, lastNext);
+ setBoolean(
+ m_out.phi(m_out.boolean, notCellResult, isInstanceResult, notInstanceResult));
+ }
+
</ins><span class="cx"> void compileCountExecution()
</span><span class="cx"> {
</span><span class="cx"> TypedPointer counter = m_out.absolute(m_node->executionCounter()->address());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLOutputh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLOutput.h (165689 => 165690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLOutput.h 2014-03-16 04:57:03 UTC (rev 165689)
+++ trunk/Source/JavaScriptCore/ftl/FTLOutput.h 2014-03-16 06:02:43 UTC (rev 165690)
</span><span class="lines">@@ -99,14 +99,13 @@
</span><span class="cx"> LValue constDouble(double value) { return constReal(doubleType, value); }
</span><span class="cx">
</span><span class="cx"> LValue phi(LType type) { return buildPhi(m_builder, type); }
</span><del>- LValue phi(LType type, ValueFromBlock value1)
</del><ins>+ template<typename... Params>
+ LValue phi(LType type, ValueFromBlock value, Params... theRest)
</ins><span class="cx"> {
</span><del>- return buildPhi(m_builder, type, value1);
</del><ins>+ LValue result = phi(type, theRest...);
+ addIncoming(result, value);
+ return result;
</ins><span class="cx"> }
</span><del>- LValue phi(LType type, ValueFromBlock value1, ValueFromBlock value2)
- {
- return buildPhi(m_builder, type, value1, value2);
- }
</del><span class="cx"> template<typename VectorType>
</span><span class="cx"> LValue phi(LType type, const VectorType& vector)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressinstanceofnotcelljs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/instanceof-not-cell.js (0 => 165690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/instanceof-not-cell.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/instanceof-not-cell.js 2014-03-16 06:02:43 UTC (rev 165690)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+function foo(o, prototype) {
+ return o instanceof prototype;
+}
+
+noInline(foo);
+
+function test(o, prototype, expected) {
+ var actual = foo(o, prototype);
+ if (actual != expected)
+ throw new Error("bad result: " + actual);
+}
+
+function Foo() { }
+
+function Bar() { }
+Bar.prototype = new Foo();
+
+for (var i = 0; i < 10000; ++i) {
+ test(42, Object, false);
+ test(42, Array, false);
+ test(42, String, false);
+ test(42, Foo, false);
+ test(42, Bar, false);
+ test({}, Object, true);
+ test({}, Array, false);
+ test({}, String, false);
+ test({}, Foo, false);
+ test({}, Bar, false);
+ test([], Object, true);
+ test([], Array, true);
+ test([], String, false);
+ test([], Foo, false);
+ test([], Bar, false);
+ test(new Foo(), Object, true);
+ test(new Foo(), Array, false);
+ test(new Foo(), String, false);
+ test(new Foo(), Foo, true);
+ test(new Foo(), Bar, false);
+ test(new Bar(), Object, true);
+ test(new Bar(), Array, false);
+ test(new Bar(), String, false);
+ test(new Bar(), Foo, true);
+ test(new Bar(), Bar, true);
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressinstanceofjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/instanceof.js (0 => 165690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/instanceof.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/instanceof.js 2014-03-16 06:02:43 UTC (rev 165690)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+function foo(o, prototype) {
+ return o instanceof prototype;
+}
+
+noInline(foo);
+
+function test(o, prototype, expected) {
+ var actual = foo(o, prototype);
+ if (actual != expected)
+ throw new Error("bad result: " + actual);
+}
+
+function Foo() { }
+
+function Bar() { }
+Bar.prototype = new Foo();
+
+for (var i = 0; i < 10000; ++i) {
+ test({}, Object, true);
+ test({}, Array, false);
+ test({}, String, false);
+ test({}, Foo, false);
+ test({}, Bar, false);
+ test([], Object, true);
+ test([], Array, true);
+ test([], String, false);
+ test([], Foo, false);
+ test([], Bar, false);
+ test(new Foo(), Object, true);
+ test(new Foo(), Array, false);
+ test(new Foo(), String, false);
+ test(new Foo(), Foo, true);
+ test(new Foo(), Bar, false);
+ test(new Bar(), Object, true);
+ test(new Bar(), Array, false);
+ test(new Bar(), String, false);
+ test(new Bar(), Foo, true);
+ test(new Bar(), Bar, true);
+}
</ins></span></pre>
</div>
</div>
</body>
</html>