<!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>[163896] 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/163896">163896</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-02-11 12:28:59 -0800 (Tue, 11 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL should support CompareEq(ObjectOrOther:, Object:)
https://bugs.webkit.org/show_bug.cgi?id=127752
Reviewed by Oliver Hunt.
Also introduce some helpers for reasoning about nullness and truthyness.
* ftl/FTLCapabilities.cpp:
(JSC::FTL::canCompile):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::compileCompareEq):
(JSC::FTL::LowerDFGToLLVM::compareEqObjectOrOtherToObject):
(JSC::FTL::LowerDFGToLLVM::speculateTruthyObject):
(JSC::FTL::LowerDFGToLLVM::equalNullOrUndefined):
(JSC::FTL::LowerDFGToLLVM::isNotNully):
(JSC::FTL::LowerDFGToLLVM::isNully):
(JSC::FTL::LowerDFGToLLVM::speculateObjectOrOther):
* tests/stress/compare-eq-object-or-other-to-object.js: Added.
(foo):
(test):
* tests/stress/compare-eq-object-to-object-or-other.js: Added.
(foo):
(test):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstresscompareeqobjectorothertoobjectjs">trunk/Source/JavaScriptCore/tests/stress/compare-eq-object-or-other-to-object.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstresscompareeqobjecttoobjectorotherjs">trunk/Source/JavaScriptCore/tests/stress/compare-eq-object-to-object-or-other.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163895 => 163896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-11 20:26:43 UTC (rev 163895)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-11 20:28:59 UTC (rev 163896)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-02-11 Filip Pizlo <fpizlo@apple.com>
+
+ FTL should support CompareEq(ObjectOrOther:, Object:)
+ https://bugs.webkit.org/show_bug.cgi?id=127752
+
+ Reviewed by Oliver Hunt.
+
+ Also introduce some helpers for reasoning about nullness and truthyness.
+
+ * ftl/FTLCapabilities.cpp:
+ (JSC::FTL::canCompile):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compileCompareEq):
+ (JSC::FTL::LowerDFGToLLVM::compareEqObjectOrOtherToObject):
+ (JSC::FTL::LowerDFGToLLVM::speculateTruthyObject):
+ (JSC::FTL::LowerDFGToLLVM::equalNullOrUndefined):
+ (JSC::FTL::LowerDFGToLLVM::isNotNully):
+ (JSC::FTL::LowerDFGToLLVM::isNully):
+ (JSC::FTL::LowerDFGToLLVM::speculateObjectOrOther):
+ * tests/stress/compare-eq-object-or-other-to-object.js: Added.
+ (foo):
+ (test):
+ * tests/stress/compare-eq-object-to-object-or-other.js: Added.
+ (foo):
+ (test):
+
</ins><span class="cx"> 2014-02-11 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> 32-bit LLInt writeBarrierOnGlobalObject is wrong
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (163895 => 163896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2014-02-11 20:26:43 UTC (rev 163895)
+++ trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2014-02-11 20:28:59 UTC (rev 163896)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2014 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">@@ -226,6 +226,12 @@
</span><span class="cx"> break;
</span><span class="cx"> if (node->isBinaryUseKind(UntypedUse))
</span><span class="cx"> break;
</span><ins>+ if (node->child1().useKind() == ObjectUse
+ && node->child2().useKind() == ObjectOrOtherUse)
+ break;
+ if (node->child1().useKind() == ObjectOrOtherUse
+ && node->child2().useKind() == ObjectUse)
+ break;
</ins><span class="cx"> return CannotCompile;
</span><span class="cx"> case CompareStrictEq:
</span><span class="cx"> if (node->isBinaryUseKind(Int32Use))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (163895 => 163896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-02-11 20:26:43 UTC (rev 163895)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-02-11 20:28:59 UTC (rev 163896)
</span><span class="lines">@@ -3208,6 +3208,18 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (m_node->child1().useKind() == ObjectUse
+ && m_node->child2().useKind() == ObjectOrOtherUse) {
+ compareEqObjectOrOtherToObject(m_node->child2(), m_node->child1());
+ return;
+ }
+
+ if (m_node->child1().useKind() == ObjectOrOtherUse
+ && m_node->child2().useKind() == ObjectUse) {
+ compareEqObjectOrOtherToObject(m_node->child2(), m_node->child1());
+ return;
+ }
+
</ins><span class="cx"> if (m_node->isBinaryUseKind(UntypedUse)) {
</span><span class="cx"> nonSpeculativeCompare(LLVMIntEQ, operationCompareEq);
</span><span class="cx"> return;
</span><span class="lines">@@ -3606,6 +3618,52 @@
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void compareEqObjectOrOtherToObject(Edge leftChild, Edge rightChild)
+ {
+ LValue rightCell = lowCell(rightChild);
+ LValue leftValue = lowJSValue(leftChild);
+
+ speculateTruthyObject(rightChild, rightCell, SpecObject);
+
+ LBasicBlock leftCellCase = FTL_NEW_BLOCK(m_out, ("CompareEqObjectOrOtherToObject left cell case"));
+ LBasicBlock leftNotCellCase = FTL_NEW_BLOCK(m_out, ("CompareEqObjectOrOtherToObject left not cell case"));
+ LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("CompareEqObjectOrOtherToObject continuation"));
+
+ m_out.branch(isCell(leftValue), leftCellCase, leftNotCellCase);
+
+ LBasicBlock lastNext = m_out.appendTo(leftCellCase, leftNotCellCase);
+ speculateTruthyObject(leftChild, leftValue, SpecObject | (~SpecCell));
+ ValueFromBlock cellResult = m_out.anchor(m_out.equal(rightCell, leftValue));
+ m_out.jump(continuation);
+
+ m_out.appendTo(leftNotCellCase, continuation);
+ FTL_TYPE_CHECK(
+ jsValueValue(leftValue), leftChild, SpecOther | SpecCell, isNotNully(leftValue));
+ ValueFromBlock notCellResult = m_out.anchor(m_out.booleanFalse);
+ m_out.jump(continuation);
+
+ m_out.appendTo(continuation, lastNext);
+ setBoolean(m_out.phi(m_out.boolean, cellResult, notCellResult));
+ }
+
+ void speculateTruthyObject(Edge edge, LValue cell, SpeculatedType filter)
+ {
+ if (masqueradesAsUndefinedWatchpointIsStillValid()) {
+ FTL_TYPE_CHECK(jsValueValue(cell), edge, filter, isNotObject(cell));
+ return;
+ }
+
+ LValue structure = m_out.loadPtr(cell, m_heaps.JSCell_structure);
+ FTL_TYPE_CHECK(
+ jsValueValue(cell), edge, filter,
+ m_out.equal(structure, m_out.constIntPtr(vm().stringStructure.get())));
+ speculate(
+ BadType, jsValueValue(cell), edge.node(),
+ m_out.testNonZero8(
+ m_out.load8(structure, m_heaps.Structure_typeInfoFlags),
+ m_out.constInt8(MasqueradesAsUndefined)));
+ }
+
</ins><span class="cx"> void nonSpeculativeCompare(LIntPredicate intCondition, S_JITOperation_EJJ helperFunction)
</span><span class="cx"> {
</span><span class="cx"> LValue left = lowJSValue(m_node->child1());
</span><span class="lines">@@ -3912,16 +3970,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 = m_out.equal(
- m_out.bitAnd(value, m_out.constInt64(~TagBitUndefined)),
- m_out.constInt64(ValueNull));
</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,
- m_out.notEqual(
- m_out.bitAnd(value, m_out.constInt64(~TagBitUndefined)),
- m_out.constInt64(ValueNull)));
</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">@@ -4567,6 +4620,19 @@
</span><span class="cx"> return m_out.select(
</span><span class="cx"> value, m_out.constInt64(ValueTrue), m_out.constInt64(ValueFalse));
</span><span class="cx"> }
</span><ins>+
+ LValue isNotNully(LValue value)
+ {
+ return m_out.notEqual(
+ m_out.bitAnd(value, m_out.constInt64(~TagBitUndefined)),
+ m_out.constInt64(ValueNull));
+ }
+ LValue isNully(LValue value)
+ {
+ return m_out.equal(
+ m_out.bitAnd(value, m_out.constInt64(~TagBitUndefined)),
+ m_out.constInt64(ValueNull));
+ }
</ins><span class="cx">
</span><span class="cx"> void speculate(Edge edge)
</span><span class="cx"> {
</span><span class="lines">@@ -4754,20 +4820,14 @@
</span><span class="cx"> LBasicBlock lastNext = m_out.appendTo(cellCase, primitiveCase);
</span><span class="cx">
</span><span class="cx"> FTL_TYPE_CHECK(
</span><del>- jsValueValue(value), edge, (~SpecCell) | SpecObject,
- m_out.equal(
- m_out.loadPtr(value, m_heaps.JSCell_structure),
- m_out.constIntPtr(vm().stringStructure.get())));
</del><ins>+ jsValueValue(value), edge, (~SpecCell) | SpecObject, isNotObject(value));
</ins><span class="cx">
</span><span class="cx"> m_out.jump(continuation);
</span><span class="cx">
</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,
- m_out.notEqual(
- m_out.bitAnd(value, m_out.constInt64(~TagBitUndefined)),
- m_out.constInt64(ValueNull)));
</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></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresscompareeqobjectorothertoobjectjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/compare-eq-object-or-other-to-object.js (0 => 163896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/compare-eq-object-or-other-to-object.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/compare-eq-object-or-other-to-object.js 2014-02-11 20:28:59 UTC (rev 163896)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+function foo(a, b) {
+ return a == b;
+}
+
+noInline(foo);
+
+function test(a, b, expected) {
+ var result = foo(a, b);
+ if (result != expected)
+ throw new Error("Unexpected result: " + result);
+}
+
+for (var i = 0; i < 100000; ++i) {
+ var o = {f:42};
+ var p = {g:43};
+ test(o, o, true);
+ test(o, p, false);
+ test(p, o, false);
+ test(p, p, true);
+ test(null, o, false);
+ test(null, p, false);
+ test(void 0, o, false);
+ test(void 0, p, false);
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresscompareeqobjecttoobjectorotherjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/compare-eq-object-to-object-or-other.js (0 => 163896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/compare-eq-object-to-object-or-other.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/compare-eq-object-to-object-or-other.js 2014-02-11 20:28:59 UTC (rev 163896)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+function foo(a, b) {
+ return a == b;
+}
+
+noInline(foo);
+
+function test(a, b, expected) {
+ var result = foo(a, b);
+ if (result != expected)
+ throw new Error("Unexpected result: " + result);
+}
+
+for (var i = 0; i < 100000; ++i) {
+ var o = {f:42};
+ var p = {g:43};
+ test(o, o, true);
+ test(o, p, false);
+ test(p, o, false);
+ test(p, p, true);
+ test(o, null, false);
+ test(p, null, false);
+ test(o, void 0, false);
+ test(p, void 0, false);
+}
</ins></span></pre>
</div>
</div>
</body>
</html>