<!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>[208640] 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/208640">208640</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-11 20:00:55 -0800 (Fri, 11 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>test262: DataView with explicit undefined byteLength should be the same as it not being present
https://bugs.webkit.org/show_bug.cgi?id=164453
Reviewed by Darin Adler.
JSTests:
* stress/dataview-construct.js: Added.
(assert):
(shouldThrow):
* test262.yaml:
Source/JavaScriptCore:
* runtime/JSGenericTypedArrayViewConstructorInlines.h:
(JSC::constructGenericTypedArrayView):
Handle the special case of DataView construction with an undefined byteLength value.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTeststest262yaml">trunk/JSTests/test262.yaml</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewConstructorInlinesh">trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressdataviewconstructjs">trunk/JSTests/stress/dataview-construct.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (208639 => 208640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog        2016-11-12 03:10:31 UTC (rev 208639)
+++ trunk/JSTests/ChangeLog        2016-11-12 04:00:55 UTC (rev 208640)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-11-11 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ test262: DataView with explicit undefined byteLength should be the same as it not being present
+ https://bugs.webkit.org/show_bug.cgi?id=164453
+
+ Reviewed by Darin Adler.
+
+ * stress/dataview-construct.js: Added.
+ (assert):
+ (shouldThrow):
+ * test262.yaml:
+
+2016-11-11 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> test262: DataView get methods should allow for missing offset, set methods should allow for missing value
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=164451
</span><span class="cx">
</span></span></pre></div>
<a id="trunkJSTestsstressdataviewconstructjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/dataview-construct.js (0 => 208640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/dataview-construct.js         (rev 0)
+++ trunk/JSTests/stress/dataview-construct.js        2016-11-12 04:00:55 UTC (rev 208640)
</span><span class="lines">@@ -0,0 +1,76 @@
</span><ins>+function assert(condition) {
+ if (!condition)
+ throw new Error("Bad assertion");
+}
+
+function shouldThrow(func, message) {
+ var errorThrown = false;
+ var error = null;
+ try {
+ func();
+ } catch (e) {
+ errorThrown = true;
+ error = e;
+ }
+ if (!errorThrown)
+ throw new Error('not thrown');
+ if (String(error) !== message)
+ throw new Error("bad error: " + String(error));
+}
+
+var buffer = new ArrayBuffer(128);
+var dataView = null;
+
+dataView = new DataView(buffer);
+assert(dataView.byteOffset === 0);
+assert(dataView.byteLength === 128);
+
+dataView = new DataView(buffer, undefined);
+assert(dataView.byteOffset === 0);
+assert(dataView.byteLength === 128);
+
+dataView = new DataView(buffer, 10);
+assert(dataView.byteOffset === 10);
+assert(dataView.byteLength === 118);
+
+dataView = new DataView(buffer, 10, undefined);
+assert(dataView.byteOffset === 10);
+assert(dataView.byteLength === 118);
+
+dataView = new DataView(buffer, 10, 20);
+assert(dataView.byteOffset === 10);
+assert(dataView.byteLength === 20);
+
+assert(new DataView(buffer, 10).byteLength === new DataView(buffer, 10, undefined).byteLength);
+
+shouldThrow(() => {
+ new DataView;
+}, "TypeError: DataView constructor requires at least one argument.");
+
+shouldThrow(() => {
+ new DataView(1);
+}, "TypeError: Expected ArrayBuffer for the first argument.");
+
+shouldThrow(() => {
+ new DataView(buffer, 256);
+}, "RangeError: Length out of range of buffer");
+
+shouldThrow(() => {
+ new DataView(buffer, -1);
+}, "RangeError: byteOffset cannot be negative");
+
+shouldThrow(() => {
+ new DataView(buffer, Infinity);
+}, "RangeError: byteOffset too large");
+
+shouldThrow(() => {
+ new DataView(buffer, 0, 256);
+}, "RangeError: Length out of range of buffer");
+
+shouldThrow(() => {
+ new DataView(buffer, 0, -1);
+}, "RangeError: byteLength cannot be negative");
+
+shouldThrow(() => {
+ new DataView(buffer, 0, Infinity);
+}, "RangeError: byteLength too large");
</ins></span></pre></div>
<a id="trunkJSTeststest262yaml"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/test262.yaml (208639 => 208640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/test262.yaml        2016-11-12 03:10:31 UTC (rev 208639)
+++ trunk/JSTests/test262.yaml        2016-11-12 04:00:55 UTC (rev 208640)
</span><span class="lines">@@ -13542,9 +13542,9 @@
</span><span class="cx"> - path: test262/test/built-ins/DataView/defined-bytelength-and-byteoffset.js
</span><span class="cx"> cmd: runTest262 :normal, "NoException", ["../../../harness/assert.js", "../../../harness/sta.js"], [:strict]
</span><span class="cx"> - path: test262/test/built-ins/DataView/defined-byteoffset-undefined-bytelength.js
</span><del>- cmd: runTest262 :fail, "NoException", ["../../../harness/assert.js", "../../../harness/sta.js"], []
</del><ins>+ cmd: runTest262 :normal, "NoException", ["../../../harness/assert.js", "../../../harness/sta.js"], []
</ins><span class="cx"> - path: test262/test/built-ins/DataView/defined-byteoffset-undefined-bytelength.js
</span><del>- cmd: runTest262 :fail, "NoException", ["../../../harness/assert.js", "../../../harness/sta.js"], [:strict]
</del><ins>+ cmd: runTest262 :normal, "NoException", ["../../../harness/assert.js", "../../../harness/sta.js"], [:strict]
</ins><span class="cx"> - path: test262/test/built-ins/DataView/defined-byteoffset.js
</span><span class="cx"> cmd: runTest262 :normal, "NoException", ["../../../harness/assert.js", "../../../harness/sta.js"], []
</span><span class="cx"> - path: test262/test/built-ins/DataView/defined-byteoffset.js
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (208639 => 208640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-11-12 03:10:31 UTC (rev 208639)
+++ trunk/Source/JavaScriptCore/ChangeLog        2016-11-12 04:00:55 UTC (rev 208640)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-11-11 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ test262: DataView with explicit undefined byteLength should be the same as it not being present
+ https://bugs.webkit.org/show_bug.cgi?id=164453
+
+ Reviewed by Darin Adler.
+
+ * runtime/JSGenericTypedArrayViewConstructorInlines.h:
+ (JSC::constructGenericTypedArrayView):
+ Handle the special case of DataView construction with an undefined byteLength value.
+
+2016-11-11 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> test262: DataView get methods should allow for missing offset, set methods should allow for missing value
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=164451
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewConstructorInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h (208639 => 208640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h        2016-11-12 03:10:31 UTC (rev 208639)
+++ trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h        2016-11-12 04:00:55 UTC (rev 208640)
</span><span class="lines">@@ -237,8 +237,17 @@
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx">
</span><span class="cx"> if (argCount > 2) {
</span><del>- length = exec->uncheckedArgument(2).toIndex(exec, ViewClass::TypedArrayStorageType == TypeDataView ? "byteLength" : "length");
- RETURN_IF_EXCEPTION(scope, encodedJSValue());
</del><ins>+ if (ViewClass::TypedArrayStorageType == TypeDataView) {
+ // If the DataView byteLength is present but undefined, treat it as missing.
+ JSValue byteLengthValue = exec->uncheckedArgument(2);
+ if (!byteLengthValue.isUndefined()) {
+ length = byteLengthValue.toIndex(exec, "byteLength");
+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
+ }
+ } else {
+ length = exec->uncheckedArgument(2).toIndex(exec, "length");
+ RETURN_IF_EXCEPTION(scope, encodedJSValue());
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>