<!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>[165098] trunk</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/165098">165098</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-04 23:25:02 -0800 (Tue, 04 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/165085">r165085</a>.
http://trac.webkit.org/changeset/165085
https://bugs.webkit.org/show_bug.cgi?id=129729
Broke imported/w3c/html-templates/template-element/template-
content.html (Requested by ap on #webkit).
Source/JavaScriptCore:
* bytecode/SpeculatedType.cpp:
(JSC::speculationToAbbreviatedString):
* bytecode/SpeculatedType.h:
* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
* dfg/DFGArrayMode.cpp:
(JSC::DFG::ArrayMode::refine):
* dfg/DFGArrayMode.h:
* dfg/DFGFixupPhase.cpp:
(JSC::DFG::FixupPhase::fixupNode):
(JSC::DFG::FixupPhase::attemptToMakeGetArrayLength):
* dfg/DFGNode.h:
(JSC::DFG::Node::shouldSpeculateBoolean):
* dfg/DFGSafeToExecute.h:
(JSC::DFG::SafeToExecuteEdge::operator()):
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileStrictEq):
(JSC::DFG::SpeculativeJIT::speculate):
* dfg/DFGSpeculativeJIT.h:
* dfg/DFGSpeculativeJIT32_64.cpp:
* dfg/DFGSpeculativeJIT64.cpp:
* dfg/DFGUseKind.cpp:
(WTF::printInternal):
* dfg/DFGUseKind.h:
(JSC::DFG::typeFilterFor):
* ftl/FTLCapabilities.cpp:
(JSC::FTL::canCompile):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::compileNode):
(JSC::FTL::LowerDFGToLLVM::compileCompareEq):
(JSC::FTL::LowerDFGToLLVM::compileCompareStrictEq):
(JSC::FTL::LowerDFGToLLVM::speculate):
* tests/stress/float32-array-out-of-bounds.js: Removed.
* tests/stress/weird-equality-folding-cases.js: Removed.
LayoutTests:
* js/regress/fold-strict-eq-expected.txt: Removed.
* js/regress/fold-strict-eq.html: Removed.
* js/regress/misc-strict-eq-expected.txt: Removed.
* js/regress/misc-strict-eq.html: Removed.
* js/regress/script-tests/fold-strict-eq.js: Removed.
* js/regress/script-tests/misc-strict-eq.js: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<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="#trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGArrayModecpp">trunk/Source/JavaScriptCore/dfg/DFGArrayMode.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGArrayModeh">trunk/Source/JavaScriptCore/dfg/DFGArrayMode.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="#trunkSourceJavaScriptCoredfgDFGSafeToExecuteh">trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITh">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGUseKindcpp">trunk/Source/JavaScriptCore/dfg/DFGUseKind.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGUseKindh">trunk/Source/JavaScriptCore/dfg/DFGUseKind.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>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsregressfoldstricteqexpectedtxt">trunk/LayoutTests/js/regress/fold-strict-eq-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregressfoldstricteqhtml">trunk/LayoutTests/js/regress/fold-strict-eq.html</a></li>
<li><a href="#trunkLayoutTestsjsregressmiscstricteqexpectedtxt">trunk/LayoutTests/js/regress/misc-strict-eq-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregressmiscstricteqhtml">trunk/LayoutTests/js/regress/misc-strict-eq.html</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsfoldstricteqjs">trunk/LayoutTests/js/regress/script-tests/fold-strict-eq.js</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsmiscstricteqjs">trunk/LayoutTests/js/regress/script-tests/misc-strict-eq.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressfloat32arrayoutofboundsjs">trunk/Source/JavaScriptCore/tests/stress/float32-array-out-of-bounds.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressweirdequalityfoldingcasesjs">trunk/Source/JavaScriptCore/tests/stress/weird-equality-folding-cases.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/LayoutTests/ChangeLog 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-03-04 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r165085.
+ http://trac.webkit.org/changeset/165085
+ https://bugs.webkit.org/show_bug.cgi?id=129729
+
+ Broke imported/w3c/html-templates/template-element/template-
+ content.html (Requested by ap on #webkit).
+
+ * js/regress/fold-strict-eq-expected.txt: Removed.
+ * js/regress/fold-strict-eq.html: Removed.
+ * js/regress/misc-strict-eq-expected.txt: Removed.
+ * js/regress/misc-strict-eq.html: Removed.
+ * js/regress/script-tests/fold-strict-eq.js: Removed.
+ * js/regress/script-tests/misc-strict-eq.js: Removed.
+
</ins><span class="cx"> 2014-03-04 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable device pixel repaint rect tracking.
</span></span></pre></div>
<a id="trunkLayoutTestsjsregressfoldstricteqexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/js/regress/fold-strict-eq-expected.txt (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/fold-strict-eq-expected.txt 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/LayoutTests/js/regress/fold-strict-eq-expected.txt 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>-JSRegress/fold-strict-eq
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS no exception thrown
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestsjsregressfoldstricteqhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/js/regress/fold-strict-eq.html (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/fold-strict-eq.html 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/LayoutTests/js/regress/fold-strict-eq.html 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src="../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script src="resources/regress-pre.js"></script>
-<script src="script-tests/fold-strict-eq.js"></script>
-<script src="resources/regress-post.js"></script>
-<script src="../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsjsregressmiscstricteqexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/js/regress/misc-strict-eq-expected.txt (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/misc-strict-eq-expected.txt 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/LayoutTests/js/regress/misc-strict-eq-expected.txt 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>-JSRegress/misc-strict-eq
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS no exception thrown
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestsjsregressmiscstricteqhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/js/regress/misc-strict-eq.html (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/misc-strict-eq.html 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/LayoutTests/js/regress/misc-strict-eq.html 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src="../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script src="resources/regress-pre.js"></script>
-<script src="script-tests/misc-strict-eq.js"></script>
-<script src="resources/regress-post.js"></script>
-<script src="../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsfoldstricteqjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/js/regress/script-tests/fold-strict-eq.js (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/fold-strict-eq.js 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/LayoutTests/js/regress/script-tests/fold-strict-eq.js 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>-function foo(a, b) {
- return a === b;
-}
-
-function test(actual, expected) {
- if (actual !== expected)
- throw new Error("bad result: " + actual);
-}
-
-for (var i = 0; i < 10000000; ++i) {
- test(foo(true, null), false);
- test(foo(true, false), false);
- test(foo(true, true), true);
- test(foo(5, "hello"), false);
- test(foo(void 0, new Object()), false);
-}
</del></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsmiscstricteqjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/js/regress/script-tests/misc-strict-eq.js (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/misc-strict-eq.js 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/LayoutTests/js/regress/script-tests/misc-strict-eq.js 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-(function() {
- var array = [true, false, null, void 0];
- for (var i = 0; i < 1000000; ++i) {
- for (var j = 0; j < array.length; ++j) {
- for (var k = j ; k < array.length; ++k) {
- var actual = array[j] === array[k];
- var expected = j == k;
- if (actual != expected)
- throw "Error: bad result for j = " + j + ", k = " + k;
- }
- }
- }
-})();
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2014-03-04 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r165085.
+ http://trac.webkit.org/changeset/165085
+ https://bugs.webkit.org/show_bug.cgi?id=129729
+
+ Broke imported/w3c/html-templates/template-element/template-
+ content.html (Requested by ap on #webkit).
+
+ * bytecode/SpeculatedType.cpp:
+ (JSC::speculationToAbbreviatedString):
+ * bytecode/SpeculatedType.h:
+ * dfg/DFGAbstractInterpreterInlines.h:
+ (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+ * dfg/DFGArrayMode.cpp:
+ (JSC::DFG::ArrayMode::refine):
+ * dfg/DFGArrayMode.h:
+ * dfg/DFGFixupPhase.cpp:
+ (JSC::DFG::FixupPhase::fixupNode):
+ (JSC::DFG::FixupPhase::attemptToMakeGetArrayLength):
+ * dfg/DFGNode.h:
+ (JSC::DFG::Node::shouldSpeculateBoolean):
+ * dfg/DFGSafeToExecute.h:
+ (JSC::DFG::SafeToExecuteEdge::operator()):
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileStrictEq):
+ (JSC::DFG::SpeculativeJIT::speculate):
+ * dfg/DFGSpeculativeJIT.h:
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ * dfg/DFGSpeculativeJIT64.cpp:
+ * dfg/DFGUseKind.cpp:
+ (WTF::printInternal):
+ * dfg/DFGUseKind.h:
+ (JSC::DFG::typeFilterFor):
+ * ftl/FTLCapabilities.cpp:
+ (JSC::FTL::canCompile):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compileNode):
+ (JSC::FTL::LowerDFGToLLVM::compileCompareEq):
+ (JSC::FTL::LowerDFGToLLVM::compileCompareStrictEq):
+ (JSC::FTL::LowerDFGToLLVM::speculate):
+ * tests/stress/float32-array-out-of-bounds.js: Removed.
+ * tests/stress/weird-equality-folding-cases.js: Removed.
+
</ins><span class="cx"> 2014-03-04 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Inspector does not restore breakpoints after a page reload
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeSpeculatedTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/SpeculatedType.cpp (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/SpeculatedType.cpp 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/Source/JavaScriptCore/bytecode/SpeculatedType.cpp 2014-03-05 07:25:02 UTC (rev 165098)
</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 (isMiscSpeculation(prediction))
- return "<Misc>";
</del><span class="cx"> return "";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -393,40 +391,5 @@
</span><span class="cx"> return NotTypedArray;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SpeculatedType leastUpperBoundOfStrictlyEquivalentSpeculations(SpeculatedType type)
-{
- if (type & SpecInteger)
- type |= SpecInteger;
- if (type & SpecString)
- type |= SpecString;
- return type;
-}
-
-bool valuesCouldBeEqual(SpeculatedType a, SpeculatedType b)
-{
- a = leastUpperBoundOfStrictlyEquivalentSpeculations(a);
- b = leastUpperBoundOfStrictlyEquivalentSpeculations(b);
-
- // Anything could be equal to a string.
- if (a & SpecString)
- return true;
- if (b & SpecString)
- return true;
-
- // If both sides are definitely only objects, then equality is fairly sane.
- if (isObjectSpeculation(a) && isObjectSpeculation(b))
- return !!(a & b);
-
- // If either side could be an object or not, then we could call toString or
- // valueOf, which could return anything.
- if (a & SpecObject)
- return true;
- if (b & SpecObject)
- return true;
-
- // Neither side is an object or string, so the world is relatively sane.
- return !!(a & b);
-}
-
</del><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeSpeculatedTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/SpeculatedType.h (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/SpeculatedType.h 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/Source/JavaScriptCore/bytecode/SpeculatedType.h 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -75,8 +75,7 @@
</span><span class="cx"> static const SpeculatedType SpecBytecodeNumber = 0x0e800000; // It's either an Int32 or a Double.
</span><span class="cx"> static const SpeculatedType SpecFullNumber = 0x0f800000; // It's either an Int32, Int52, or a Double.
</span><span class="cx"> static const SpeculatedType SpecBoolean = 0x10000000; // It's definitely a Boolean.
</span><del>-static const SpeculatedType SpecOther = 0x20000000; // It's definitely either Null or Undefined.
-static const SpeculatedType SpecMisc = 0x30000000; // It's definitely either a boolean, Null, or Undefined.
</del><ins>+static const SpeculatedType SpecOther = 0x20000000; // It's definitely none of the above.
</ins><span class="cx"> static const SpeculatedType SpecHeapTop = 0x3effffff; // It can be any of the above, except for SpecInt52.
</span><span class="cx"> static const SpeculatedType SpecEmpty = 0x40000000; // It's definitely an empty value marker.
</span><span class="cx"> static const SpeculatedType SpecBytecodeTop = 0x7effffff; // It can be any of the above, except for SpecInt52.
</span><span class="lines">@@ -336,11 +335,6 @@
</span><span class="cx"> return value == SpecOther;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool isMiscSpeculation(SpeculatedType value)
-{
- return !!value && !(value & ~SpecMisc);
-}
-
</del><span class="cx"> inline bool isOtherOrEmptySpeculation(SpeculatedType value)
</span><span class="cx"> {
</span><span class="cx"> return !value || value == SpecOther;
</span><span class="lines">@@ -388,10 +382,6 @@
</span><span class="cx"> SpeculatedType speculationFromTypedArrayType(TypedArrayType); // only valid for typed views.
</span><span class="cx"> TypedArrayType typedArrayTypeFromSpeculation(SpeculatedType);
</span><span class="cx">
</span><del>-SpeculatedType leastUpperBoundOfStrictlyEquivalentSpeculations(SpeculatedType);
-
-bool valuesCouldBeEqual(SpeculatedType, SpeculatedType);
-
</del><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> #endif // SpeculatedType_h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -917,7 +917,8 @@
</span><span class="cx"> if (node->op() == CompareEqConstant || node->op() == CompareEq) {
</span><span class="cx"> SpeculatedType leftType = forNode(node->child1()).m_type;
</span><span class="cx"> SpeculatedType rightType = forNode(node->child2()).m_type;
</span><del>- if (!valuesCouldBeEqual(leftType, rightType)) {
</del><ins>+ if ((isInt32Speculation(leftType) && isOtherSpeculation(rightType))
+ || (isOtherSpeculation(leftType) && isInt32Speculation(rightType))) {
</ins><span class="cx"> setConstant(node, jsBoolean(false));
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -942,28 +943,19 @@
</span><span class="cx"> JSValue left = forNode(leftNode).value();
</span><span class="cx"> JSValue right = forNode(rightNode).value();
</span><span class="cx"> if (left && right) {
</span><ins>+ if (left.isNumber() && right.isNumber()) {
+ setConstant(node, jsBoolean(left.asNumber() == right.asNumber()));
+ break;
+ }
</ins><span class="cx"> if (left.isString() && right.isString()) {
</span><del>- // We need this case because JSValue::strictEqual is otherwise too racy for
- // string comparisons.
</del><span class="cx"> const StringImpl* a = asString(left)->tryGetValueImpl();
</span><span class="cx"> const StringImpl* b = asString(right)->tryGetValueImpl();
</span><span class="cx"> if (a && b) {
</span><span class="cx"> setConstant(node, jsBoolean(WTF::equal(a, b)));
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- } else {
- setConstant(node, jsBoolean(JSValue::strictEqual(0, left, right)));
- break;
</del><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- SpeculatedType leftLUB = leastUpperBoundOfStrictlyEquivalentSpeculations(forNode(leftNode).m_type);
- SpeculatedType rightLUB = leastUpperBoundOfStrictlyEquivalentSpeculations(forNode(rightNode).m_type);
- if (!(leftLUB & rightLUB)) {
- setConstant(node, jsBoolean(false));
- break;
- }
-
</del><span class="cx"> forNode(node).setType(SpecBoolean);
</span><span class="cx"> node->setCanExit(true); // This is overly conservative.
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGArrayModecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGArrayMode.cpp (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGArrayMode.cpp 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/Source/JavaScriptCore/dfg/DFGArrayMode.cpp 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012, 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 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">@@ -132,7 +132,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ArrayMode ArrayMode::refine(
</span><del>- Graph& graph, Node* node,
</del><ins>+ Graph& graph, CodeOrigin codeOrigin,
</ins><span class="cx"> SpeculatedType base, SpeculatedType index, SpeculatedType value,
</span><span class="cx"> NodeFlags flags) const
</span><span class="cx"> {
</span><span class="lines">@@ -199,18 +199,10 @@
</span><span class="cx"> return withType(Array::Arguments);
</span><span class="cx">
</span><span class="cx"> ArrayMode result;
</span><del>- switch (node->op()) {
- case PutByVal:
- if (graph.hasExitSite(node->origin.semantic, OutOfBounds) || !isInBounds())
- result = withSpeculation(Array::OutOfBounds);
- else
- result = withSpeculation(Array::InBounds);
- break;
-
- default:
</del><ins>+ if (graph.hasExitSite(codeOrigin, OutOfBounds) || !isInBounds())
+ result = withSpeculation(Array::OutOfBounds);
+ else
</ins><span class="cx"> result = withSpeculation(Array::InBounds);
</span><del>- break;
- }
</del><span class="cx">
</span><span class="cx"> if (isInt8ArraySpeculation(base))
</span><span class="cx"> return result.withType(Array::Int8Array);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGArrayModeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGArrayMode.h (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGArrayMode.h 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/Source/JavaScriptCore/dfg/DFGArrayMode.h 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012, 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 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">@@ -220,7 +220,7 @@
</span><span class="cx"> return ArrayMode(type, arrayClass(), speculation(), conversion);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ArrayMode refine(Graph&, Node*, SpeculatedType base, SpeculatedType index, SpeculatedType value = SpecNone, NodeFlags = 0) const;
</del><ins>+ ArrayMode refine(Graph&, CodeOrigin, SpeculatedType base, SpeculatedType index, SpeculatedType value = SpecNone, NodeFlags = 0) const;
</ins><span class="cx">
</span><span class="cx"> bool alreadyChecked(Graph&, Node*, AbstractValue&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -432,11 +432,6 @@
</span><span class="cx"> fixEdge<ObjectUse>(node->child2());
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- if (node->child1()->shouldSpeculateMisc() && node->child2()->shouldSpeculateMisc()) {
- fixEdge<MiscUse>(node->child1());
- fixEdge<MiscUse>(node->child2());
- break;
- }
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -457,7 +452,7 @@
</span><span class="cx"> case GetByVal: {
</span><span class="cx"> node->setArrayMode(
</span><span class="cx"> node->arrayMode().refine(
</span><del>- m_graph, node,
</del><ins>+ m_graph, node->origin.semantic,
</ins><span class="cx"> node->child1()->prediction(),
</span><span class="cx"> node->child2()->prediction(),
</span><span class="cx"> SpecNone, node->flags()));
</span><span class="lines">@@ -515,7 +510,7 @@
</span><span class="cx">
</span><span class="cx"> node->setArrayMode(
</span><span class="cx"> node->arrayMode().refine(
</span><del>- m_graph, node,
</del><ins>+ m_graph, node->origin.semantic,
</ins><span class="cx"> child1->prediction(),
</span><span class="cx"> child2->prediction(),
</span><span class="cx"> child3->prediction()));
</span><span class="lines">@@ -601,7 +596,7 @@
</span><span class="cx"> // that would break things.
</span><span class="cx"> node->setArrayMode(
</span><span class="cx"> node->arrayMode().refine(
</span><del>- m_graph, node,
</del><ins>+ m_graph, node->origin.semantic,
</ins><span class="cx"> node->child1()->prediction() & SpecCell,
</span><span class="cx"> SpecInt32,
</span><span class="cx"> node->child2()->prediction()));
</span><span class="lines">@@ -1755,7 +1750,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> arrayMode = arrayMode.refine(
</span><del>- m_graph, node, node->child1()->prediction(), node->prediction());
</del><ins>+ m_graph, node->origin.semantic, node->child1()->prediction(), node->prediction());
</ins><span class="cx">
</span><span class="cx"> if (arrayMode.type() == Array::Generic) {
</span><span class="cx"> // Check if the input is something that we can't get array length for, but for which we
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGNode.h (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGNode.h 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/Source/JavaScriptCore/dfg/DFGNode.h 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -1399,11 +1399,6 @@
</span><span class="cx"> {
</span><span class="cx"> return isBooleanSpeculation(prediction());
</span><span class="cx"> }
</span><del>-
- bool shouldSpeculateMisc()
- {
- return isMiscSpeculation(prediction());
- }
</del><span class="cx">
</span><span class="cx"> bool shouldSpeculateStringIdent()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSafeToExecuteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx"> case StringOrStringObjectUse:
</span><span class="cx"> case NotCellUse:
</span><span class="cx"> case OtherUse:
</span><del>- case MiscUse:
</del><span class="cx"> case MachineIntUse:
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -3802,11 +3802,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case MiscUse: {
- compileMiscStrictEq(node);
- return false;
- }
-
</del><span class="cx"> case UntypedUse: {
</span><span class="cx"> return nonSpeculativeStrictEq(node);
</span><span class="cx"> }
</span><span class="lines">@@ -4835,31 +4830,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SpeculativeJIT::speculateMisc(Edge edge, JSValueRegs regs)
-{
-#if USE(JSVALUE64)
- typeCheck(
- regs, edge, SpecMisc,
- m_jit.branch64(MacroAssembler::Above, regs.gpr(), MacroAssembler::TrustedImm64(TagBitTypeOther | TagBitBool | TagBitUndefined)));
-#else
- typeCheck(
- regs, edge, SpecMisc | SpecInt32,
- m_jit.branch32(MacroAssembler::Equal, regs.tagGPR(), MacroAssembler::TrustedImm32(JSValue::Int32Tag)));
- typeCheck(
- regs, edge, SpecMisc,
- m_jit.branch32(MacroAssembler::Below, regs.tagGPR(), MacroAssembler::TrustedImm32(JSValue::UndefinedTag)));
-#endif
-}
-
-void SpeculativeJIT::speculateMisc(Edge edge)
-{
- if (!needsTypeCheck(edge, SpecMisc))
- return;
-
- JSValueOperand operand(this, edge, ManualOperandSpeculation);
- speculateMisc(edge, operand.jsValueRegs());
-}
-
</del><span class="cx"> void SpeculativeJIT::speculate(Node*, Edge edge)
</span><span class="cx"> {
</span><span class="cx"> switch (edge.useKind()) {
</span><span class="lines">@@ -4922,9 +4892,6 @@
</span><span class="cx"> case OtherUse:
</span><span class="cx"> speculateOther(edge);
</span><span class="cx"> break;
</span><del>- case MiscUse:
- speculateMisc(edge);
- break;
</del><span class="cx"> default:
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -1985,7 +1985,6 @@
</span><span class="cx"> void compileStringEquality(Node*);
</span><span class="cx"> void compileStringIdentEquality(Node*);
</span><span class="cx"> void compileStringZeroLength(Node*);
</span><del>- void compileMiscStrictEq(Node*);
</del><span class="cx">
</span><span class="cx"> void emitObjectOrOtherBranch(Edge value, BasicBlock* taken, BasicBlock* notTaken);
</span><span class="cx"> void emitBranch(Node*);
</span><span class="lines">@@ -2204,8 +2203,6 @@
</span><span class="cx"> void speculateStringOrStringObject(Edge);
</span><span class="cx"> void speculateNotCell(Edge);
</span><span class="cx"> void speculateOther(Edge);
</span><del>- void speculateMisc(Edge, JSValueRegs);
- void speculateMisc(Edge);
</del><span class="cx"> void speculate(Node*, Edge);
</span><span class="cx">
</span><span class="cx"> JITCompiler::Jump jumpSlowForUnwantedArrayMode(GPRReg tempWithIndexingTypeReg, ArrayMode, IndexingType);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -613,22 +613,6 @@
</span><span class="cx"> booleanResult(resultPayloadGPR, node, UseChildrenCalledExplicitly);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SpeculativeJIT::compileMiscStrictEq(Node* node)
-{
- JSValueOperand op1(this, node->child1(), ManualOperandSpeculation);
- JSValueOperand op2(this, node->child2(), ManualOperandSpeculation);
- GPRTemporary result(this);
-
- speculateMisc(node->child1(), op1.jsValueRegs());
- speculateMisc(node->child2(), op2.jsValueRegs());
-
- m_jit.move(TrustedImm32(0), result.gpr());
- JITCompiler::Jump notEqual = m_jit.branch32(JITCompiler::NotEqual, op1.tagGPR(), op2.tagGPR());
- m_jit.compare32(JITCompiler::Equal, op1.payloadGPR(), op2.payloadGPR(), result.gpr());
- notEqual.link(&m_jit);
- booleanResult(result.gpr(), node);
-}
-
</del><span class="cx"> void SpeculativeJIT::emitCall(Node* node)
</span><span class="cx"> {
</span><span class="cx"> if (node->op() != Call)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -648,20 +648,6 @@
</span><span class="cx"> jsValueResult(resultGPR, m_currentNode, DataFormatJSBoolean, UseChildrenCalledExplicitly);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SpeculativeJIT::compileMiscStrictEq(Node* node)
-{
- JSValueOperand op1(this, node->child1(), ManualOperandSpeculation);
- JSValueOperand op2(this, node->child2(), ManualOperandSpeculation);
- GPRTemporary result(this);
-
- speculateMisc(node->child1(), op1.jsValueRegs());
- speculateMisc(node->child2(), op2.jsValueRegs());
-
- m_jit.compare32(JITCompiler::Equal, op1.gpr(), op2.gpr(), result.gpr());
- m_jit.or32(TrustedImm32(ValueFalse), result.gpr());
- jsValueResult(result.gpr(), node, DataFormatJSBoolean);
-}
-
</del><span class="cx"> void SpeculativeJIT::emitCall(Node* node)
</span><span class="cx"> {
</span><span class="cx"> if (node->op() != Call)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGUseKindcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGUseKind.cpp (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGUseKind.cpp 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/Source/JavaScriptCore/dfg/DFGUseKind.cpp 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 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">@@ -97,9 +97,6 @@
</span><span class="cx"> case OtherUse:
</span><span class="cx"> out.print("Other");
</span><span class="cx"> break;
</span><del>- case MiscUse:
- out.print("Misc");
- break;
</del><span class="cx"> default:
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGUseKindh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGUseKind.h (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGUseKind.h 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/Source/JavaScriptCore/dfg/DFGUseKind.h 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 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">@@ -54,7 +54,6 @@
</span><span class="cx"> StringOrStringObjectUse,
</span><span class="cx"> NotCellUse,
</span><span class="cx"> OtherUse,
</span><del>- MiscUse,
</del><span class="cx"> LastUseKind // Must always be the last entry in the enum, as it is used to denote the number of enum elements.
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -97,8 +96,6 @@
</span><span class="cx"> return ~SpecCell;
</span><span class="cx"> case OtherUse:
</span><span class="cx"> return SpecOther;
</span><del>- case MiscUse:
- return SpecMisc;
</del><span class="cx"> default:
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> return SpecFullTop;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -141,9 +141,6 @@
</span><span class="cx"> case MultiPutByOffset:
</span><span class="cx"> case ToPrimitive:
</span><span class="cx"> case PhantomArguments:
</span><del>- case Throw:
- case ThrowReferenceError:
- case Unreachable:
</del><span class="cx"> case GetMyArgumentByVal:
</span><span class="cx"> // These are OK.
</span><span class="cx"> break;
</span><span class="lines">@@ -236,8 +233,6 @@
</span><span class="cx"> break;
</span><span class="cx"> if (node->isBinaryUseKind(UntypedUse))
</span><span class="cx"> break;
</span><del>- if (node->isBinaryUseKind(BooleanUse))
- break;
</del><span class="cx"> if (node->child1().useKind() == ObjectUse
</span><span class="cx"> && node->child2().useKind() == ObjectOrOtherUse)
</span><span class="cx"> break;
</span><span class="lines">@@ -254,10 +249,6 @@
</span><span class="cx"> break;
</span><span class="cx"> if (node->isBinaryUseKind(ObjectUse))
</span><span class="cx"> break;
</span><del>- if (node->isBinaryUseKind(MiscUse))
- break;
- if (node->isBinaryUseKind(BooleanUse))
- break;
</del><span class="cx"> return CannotCompile;
</span><span class="cx"> case CompareLess:
</span><span class="cx"> case CompareLessEq:
</span><span class="lines">@@ -350,7 +341,6 @@
</span><span class="cx"> case StringOrStringObjectUse:
</span><span class="cx"> case FinalObjectUse:
</span><span class="cx"> case NotCellUse:
</span><del>- case MiscUse:
</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 (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -559,10 +559,6 @@
</span><span class="cx"> case ForceOSRExit:
</span><span class="cx"> compileForceOSRExit();
</span><span class="cx"> break;
</span><del>- case Throw:
- case ThrowReferenceError:
- compileThrow();
- break;
</del><span class="cx"> case InvalidationPoint:
</span><span class="cx"> compileInvalidationPoint();
</span><span class="cx"> break;
</span><span class="lines">@@ -596,9 +592,6 @@
</span><span class="cx"> case TypedArrayWatchpoint:
</span><span class="cx"> case AllocationProfileWatchpoint:
</span><span class="cx"> break;
</span><del>- case Unreachable:
- RELEASE_ASSERT_NOT_REACHED();
- break;
</del><span class="cx"> default:
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><span class="lines">@@ -3369,8 +3362,7 @@
</span><span class="cx"> if (m_node->isBinaryUseKind(Int32Use)
</span><span class="cx"> || m_node->isBinaryUseKind(MachineIntUse)
</span><span class="cx"> || m_node->isBinaryUseKind(NumberUse)
</span><del>- || m_node->isBinaryUseKind(ObjectUse)
- || m_node->isBinaryUseKind(BooleanUse)) {
</del><ins>+ || m_node->isBinaryUseKind(ObjectUse)) {
</ins><span class="cx"> compileCompareStrictEq();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -3433,21 +3425,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_node->isBinaryUseKind(BooleanUse)) {
- setBoolean(
- m_out.equal(lowBoolean(m_node->child1()), lowBoolean(m_node->child2())));
- return;
- }
-
- if (m_node->isBinaryUseKind(MiscUse)) {
- LValue left = lowJSValue(m_node->child1(), ManualOperandSpeculation);
- LValue right = lowJSValue(m_node->child2(), ManualOperandSpeculation);
- FTL_TYPE_CHECK(jsValueValue(left), m_node->child1(), SpecMisc, isNotMisc(left));
- FTL_TYPE_CHECK(jsValueValue(right), m_node->child2(), SpecMisc, isNotMisc(right));
- setBoolean(m_out.equal(left, right));
- return;
- }
-
</del><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3714,11 +3691,6 @@
</span><span class="cx"> terminate(InadequateCoverage);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void compileThrow()
- {
- terminate(Uncountable);
- }
-
</del><span class="cx"> void compileInvalidationPoint()
</span><span class="cx"> {
</span><span class="cx"> if (verboseCompilationEnabled())
</span><span class="lines">@@ -4991,16 +4963,6 @@
</span><span class="cx"> return m_out.testIsZero64(jsValue, m_tagMask);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LValue isNotMisc(LValue value)
- {
- return m_out.above(value, m_out.constInt64(TagBitTypeOther | TagBitBool | TagBitUndefined));
- }
-
- LValue isMisc(LValue value)
- {
- return m_out.bitNot(isNotMisc(value));
- }
-
</del><span class="cx"> LValue isNotBoolean(LValue jsValue)
</span><span class="cx"> {
</span><span class="cx"> return m_out.testNonZero64(
</span><span class="lines">@@ -5084,9 +5046,6 @@
</span><span class="cx"> case NotCellUse:
</span><span class="cx"> speculateNotCell(edge);
</span><span class="cx"> break;
</span><del>- case MiscUse:
- speculateMisc(edge);
- break;
</del><span class="cx"> default:
</span><span class="cx"> dataLog("Unsupported speculation use kind: ", edge.useKind(), "\n");
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="lines">@@ -5364,15 +5323,6 @@
</span><span class="cx"> typeCheck(jsValueValue(value), edge, ~SpecCell, isCell(value));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void speculateMisc(Edge edge)
- {
- if (!m_interpreter.needsTypeCheck(edge))
- return;
-
- LValue value = lowJSValue(edge);
- typeCheck(jsValueValue(value), edge, SpecMisc, isNotMisc(value));
- }
-
</del><span class="cx"> bool masqueradesAsUndefinedWatchpointIsStillValid()
</span><span class="cx"> {
</span><span class="cx"> return m_graph.masqueradesAsUndefinedWatchpointIsStillValid(m_node->origin.semantic);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressfloat32arrayoutofboundsjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/tests/stress/float32-array-out-of-bounds.js (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/float32-array-out-of-bounds.js 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/Source/JavaScriptCore/tests/stress/float32-array-out-of-bounds.js 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -1,23 +0,0 @@
</span><del>-function foo(a) {
- return a[42];
-}
-
-noInline(foo);
-
-var shortArray = new Float32Array(10);
-var longArray = new Float32Array(100);
-
-function test(array, expected) {
- var result = foo(array);
- if (result != expected)
- throw new Error("bad result: " + result);
-}
-
-for (var i = 0; i < 1000; ++i)
- test(shortArray, void 0);
-
-for (var i = 0; i < 100000; ++i)
- test(longArray, 0);
-
-test(shortArray, void 0);
-
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressweirdequalityfoldingcasesjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/tests/stress/weird-equality-folding-cases.js (165097 => 165098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/weird-equality-folding-cases.js 2014-03-05 06:24:23 UTC (rev 165097)
+++ trunk/Source/JavaScriptCore/tests/stress/weird-equality-folding-cases.js 2014-03-05 07:25:02 UTC (rev 165098)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-function test(actualFunction, expected) {
- var actual = actualFunction();
- if (actual != expected)
- throw new Error("bad in " + actualFunction + " result: " + actual);
-}
-
-noInline(test);
-
-for (var i = 0; i < 10000; ++i) {
- test(function() { return "5" == 5; }, true);
- test(function() { return ({valueOf:function(){return 42;}}) == 42; }, true);
- test(function() { return ({valueOf:function(){return 42;}}) == ({valueOf:function(){return 42;}}) }, false);
-}
</del></span></pre>
</div>
</div>
</body>
</html>