<!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>[164281] releases/WebKitGTK/webkit-2.2/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/164281">164281</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-18 03:38:05 -0800 (Tue, 18 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/155466">r155466</a> - SpecType should have SpecInt48AsDouble
https://bugs.webkit.org/show_bug.cgi?id=121065
Reviewed by Oliver Hunt.
* bytecode/SpeculatedType.cpp:
(JSC::dumpSpeculation):
(JSC::speculationToAbbreviatedString):
(JSC::speculationFromValue):
* bytecode/SpeculatedType.h:
(JSC::isInt48AsDoubleSpeculation):
(JSC::isIntegerSpeculation):
(JSC::isDoubleRealSpeculation):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit22SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceJavaScriptCorebytecodeSpeculatedTypecpp">releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/bytecode/SpeculatedType.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceJavaScriptCorebytecodeSpeculatedTypeh">releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/bytecode/SpeculatedType.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit22SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/ChangeLog (164280 => 164281)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/ChangeLog 2014-02-18 11:10:27 UTC (rev 164280)
+++ releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/ChangeLog 2014-02-18 11:38:05 UTC (rev 164281)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2013-09-10 Filip Pizlo <fpizlo@apple.com>
+
+ SpecType should have SpecInt48AsDouble
+ https://bugs.webkit.org/show_bug.cgi?id=121065
+
+ Reviewed by Oliver Hunt.
+
+ * bytecode/SpeculatedType.cpp:
+ (JSC::dumpSpeculation):
+ (JSC::speculationToAbbreviatedString):
+ (JSC::speculationFromValue):
+ * bytecode/SpeculatedType.h:
+ (JSC::isInt48AsDoubleSpeculation):
+ (JSC::isIntegerSpeculation):
+ (JSC::isDoubleRealSpeculation):
+
</ins><span class="cx"> 2014-01-18 Alberto Garcia <berto@igalia.com>
</span><span class="cx">
</span><span class="cx"> JavaScriptCore uses PLATFORM(MAC) when it means OS(DARWIN)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceJavaScriptCorebytecodeSpeculatedTypecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/bytecode/SpeculatedType.cpp (164280 => 164281)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/bytecode/SpeculatedType.cpp 2014-02-18 11:10:27 UTC (rev 164280)
+++ releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/bytecode/SpeculatedType.cpp 2014-02-18 11:38:05 UTC (rev 164281)
</span><span class="lines">@@ -161,11 +161,16 @@
</span><span class="cx"> if ((value & SpecDouble) == SpecDouble)
</span><span class="cx"> myOut.print("Double");
</span><span class="cx"> else {
</span><del>- if (value & SpecDoubleReal)
- myOut.print("Doublereal");
</del><ins>+ if (value & SpecInt48AsDouble)
+ myOut.print("Int48asdouble");
</ins><span class="cx"> else
</span><span class="cx"> isTop = false;
</span><span class="cx">
</span><ins>+ if (value & SpecNonIntAsDouble)
+ myOut.print("Nonintasdouble");
+ else
+ isTop = false;
+
</ins><span class="cx"> if (value & SpecDoubleNaN)
</span><span class="cx"> myOut.print("Doublenan");
</span><span class="cx"> else
</span><span class="lines">@@ -233,6 +238,8 @@
</span><span class="cx"> return "<Cell>";
</span><span class="cx"> if (isInt32Speculation(prediction))
</span><span class="cx"> return "<Int32>";
</span><ins>+ if (isInt48AsDoubleSpeculation(prediction))
+ return "<Int48AsDouble>";
</ins><span class="cx"> if (isDoubleSpeculation(prediction))
</span><span class="cx"> return "<Double>";
</span><span class="cx"> if (isNumberSpeculation(prediction))
</span><span class="lines">@@ -331,8 +338,14 @@
</span><span class="cx"> return SpecInt32;
</span><span class="cx"> if (value.isDouble()) {
</span><span class="cx"> double number = value.asNumber();
</span><del>- if (number == number)
</del><ins>+ if (number == number) {
+ int64_t asInt64 = static_cast<int64_t>(number);
+ if (asInt64 == number && (!asInt64 || std::signbit(number))
+ && asInt64 < (static_cast<int64_t>(1) << 47)
+ && asInt64 >= -(static_cast<int64_t>(1) << 47))
+ return SpecInt48AsDouble;
</ins><span class="cx"> return SpecDoubleReal;
</span><ins>+ }
</ins><span class="cx"> return SpecDoubleNaN;
</span><span class="cx"> }
</span><span class="cx"> if (value.isCell())
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceJavaScriptCorebytecodeSpeculatedTypeh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/bytecode/SpeculatedType.h (164280 => 164281)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/bytecode/SpeculatedType.h 2014-02-18 11:10:27 UTC (rev 164280)
+++ releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/bytecode/SpeculatedType.h 2014-02-18 11:38:05 UTC (rev 164281)
</span><span class="lines">@@ -62,17 +62,19 @@
</span><span class="cx"> static const SpeculatedType SpecCellOther = 0x00040000; // It's definitely a JSCell but not a subclass of JSObject and definitely not a JSString.
</span><span class="cx"> static const SpeculatedType SpecCell = 0x0007ffff; // It's definitely a JSCell.
</span><span class="cx"> static const SpeculatedType SpecInt32 = 0x00800000; // It's definitely an Int32.
</span><del>-static const SpeculatedType SpecDoubleReal = 0x01000000; // It's definitely a non-NaN double.
-static const SpeculatedType SpecDoubleNaN = 0x02000000; // It's definitely a NaN.
-static const SpeculatedType SpecDouble = 0x03000000; // It's either a non-NaN or a NaN double.
-static const SpeculatedType SpecRealNumber = 0x01800000; // It's either an Int32 or a DoubleReal.
-static const SpeculatedType SpecNumber = 0x03800000; // It's either an Int32 or a Double.
-static const SpeculatedType SpecBoolean = 0x04000000; // It's definitely a Boolean.
-static const SpeculatedType SpecOther = 0x08000000; // It's definitely none of the above.
-static const SpeculatedType SpecTop = 0x0fffffff; // It can be any of the above.
-static const SpeculatedType SpecEmpty = 0x10000000; // It's definitely an empty value marker.
-static const SpeculatedType SpecEmptyOrTop = 0x1fffffff; // It can be any of the above.
-static const SpeculatedType FixedIndexedStorageMask = SpecInt8Array | SpecInt16Array | SpecInt32Array | SpecUint8Array | SpecUint8ClampedArray | SpecUint16Array | SpecUint32Array | SpecFloat32Array | SpecFloat64Array;
</del><ins>+static const SpeculatedType SpecInt48AsDouble = 0x01000000; // It's definitely an Int48 and it's inside a double.
+static const SpeculatedType SpecInteger = 0x01800000; // It's definitely some kind of integer.
+static const SpeculatedType SpecNonIntAsDouble = 0x02000000; // It's definitely not an Int48 but it's a real number and it's a double.
+static const SpeculatedType SpecDoubleReal = 0x03000000; // It's definitely a non-NaN double.
+static const SpeculatedType SpecDoubleNaN = 0x04000000; // It's definitely a NaN.
+static const SpeculatedType SpecDouble = 0x07000000; // It's either a non-NaN or a NaN double.
+static const SpeculatedType SpecRealNumber = 0x03800000; // It's either an Int32 or a DoubleReal.
+static const SpeculatedType SpecNumber = 0x07800000; // It's either an Int32 or a Double.
+static const SpeculatedType SpecBoolean = 0x08000000; // It's definitely a Boolean.
+static const SpeculatedType SpecOther = 0x10000000; // It's definitely none of the above.
+static const SpeculatedType SpecTop = 0x1fffffff; // It can be any of the above.
+static const SpeculatedType SpecEmpty = 0x20000000; // It's definitely an empty value marker.
+static const SpeculatedType SpecEmptyOrTop = 0x3fffffff; // It can be any of the above.
</ins><span class="cx">
</span><span class="cx"> typedef bool (*SpeculatedTypeChecker)(SpeculatedType);
</span><span class="cx">
</span><span class="lines">@@ -107,11 +109,6 @@
</span><span class="cx"> return !!(value & (SpecFinalObject | SpecOther)) && !(value & ~(SpecFinalObject | SpecOther));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool isFixedIndexedStorageObjectSpeculation(SpeculatedType value)
-{
- return !!value && (value & FixedIndexedStorageMask) == value;
-}
-
</del><span class="cx"> inline bool isStringIdentSpeculation(SpeculatedType value)
</span><span class="cx"> {
</span><span class="cx"> return value == SpecStringIdent;
</span><span class="lines">@@ -248,9 +245,19 @@
</span><span class="cx"> return isInt32Speculation(value & ~SpecOther);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool isInt48AsDoubleSpeculation(SpeculatedType value)
+{
+ return value == SpecInt48AsDouble;
+}
+
+inline bool isIntegerSpeculation(SpeculatedType value)
+{
+ return !!value && (value & SpecInteger) == value;
+}
+
</ins><span class="cx"> inline bool isDoubleRealSpeculation(SpeculatedType value)
</span><span class="cx"> {
</span><del>- return value == SpecDoubleReal;
</del><ins>+ return !!value && (value & SpecDoubleReal) == value;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool isDoubleSpeculation(SpeculatedType value)
</span></span></pre>
</div>
</div>
</body>
</html>