<!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>[203096] 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/203096">203096</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-07-11 16:39:29 -0700 (Mon, 11 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>defineProperty on a index of a TypedArray should throw if configurable
https://bugs.webkit.org/show_bug.cgi?id=159653
Reviewed by Saam Barati.
When I fixed this before I misread the spec and thought it said we
should throw if the descriptor said the proprety is not
configurable. This is the opposite. We should throw if the
descriptor says the property is configurable.
* runtime/JSGenericTypedArrayViewInlines.h:
(JSC::JSGenericTypedArrayView<Adaptor>::defineOwnProperty):
* tests/stress/typedarray-access-monomorphic-neutered.js:
* tests/stress/typedarray-access-neutered.js:
* tests/stress/typedarray-configure-index.js: Added.
(assert):
(assertThrows):
(makeDescriptor):
(test):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewInlinesh">trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstresstypedarrayaccessmonomorphicneuteredjs">trunk/Source/JavaScriptCore/tests/stress/typedarray-access-monomorphic-neutered.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstresstypedarrayaccessneuteredjs">trunk/Source/JavaScriptCore/tests/stress/typedarray-access-neutered.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstresstypedarrayconfigureindexjs">trunk/Source/JavaScriptCore/tests/stress/typedarray-configure-index.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (203095 => 203096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-07-11 23:34:22 UTC (rev 203095)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-07-11 23:39:29 UTC (rev 203096)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-07-11 Keith Miller <keith_miller@apple.com>
+
+ defineProperty on a index of a TypedArray should throw if configurable
+ https://bugs.webkit.org/show_bug.cgi?id=159653
+
+ Reviewed by Saam Barati.
+
+ When I fixed this before I misread the spec and thought it said we
+ should throw if the descriptor said the proprety is not
+ configurable. This is the opposite. We should throw if the
+ descriptor says the property is configurable.
+
+ * runtime/JSGenericTypedArrayViewInlines.h:
+ (JSC::JSGenericTypedArrayView<Adaptor>::defineOwnProperty):
+ * tests/stress/typedarray-access-monomorphic-neutered.js:
+ * tests/stress/typedarray-access-neutered.js:
+ * tests/stress/typedarray-configure-index.js: Added.
+ (assert):
+ (assertThrows):
+ (makeDescriptor):
+ (test):
+
</ins><span class="cx"> 2016-07-11 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> some paths in Array.prototype.splice don't account for the array not having certain indexed properties
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h (203095 => 203096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h 2016-07-11 23:34:22 UTC (rev 203095)
+++ trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h 2016-07-11 23:39:29 UTC (rev 203096)
</span><span class="lines">@@ -348,9 +348,12 @@
</span><span class="cx"> if (descriptor.isAccessorDescriptor())
</span><span class="cx"> return reject(exec, shouldThrow, "Attempting to store accessor indexed property on a typed array.");
</span><span class="cx">
</span><del>- if (descriptor.attributes() & (DontEnum | DontDelete | ReadOnly))
- return reject(exec, shouldThrow, "Attempting to store non-enumerable, non-configurable or non-writable indexed property on a typed array.");
</del><ins>+ if (descriptor.configurable())
+ return reject(exec, shouldThrow, "Attempting to configure non-configurable property.");
</ins><span class="cx">
</span><ins>+ if (!descriptor.enumerable() || !descriptor.writable())
+ return reject(exec, shouldThrow, "Attempting to store non-enumerable or non-writable indexed property on a typed array.");
+
</ins><span class="cx"> if (descriptor.value()) {
</span><span class="cx"> PutPropertySlot unused(JSValue(thisObject), shouldThrow);
</span><span class="cx"> return thisObject->put(thisObject, exec, propertyName, descriptor.value(), unused);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresstypedarrayaccessmonomorphicneuteredjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/typedarray-access-monomorphic-neutered.js (203095 => 203096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/typedarray-access-monomorphic-neutered.js 2016-07-11 23:34:22 UTC (rev 203095)
+++ trunk/Source/JavaScriptCore/tests/stress/typedarray-access-monomorphic-neutered.js 2016-07-11 23:39:29 UTC (rev 203096)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> test("array[0]", array);
</span><span class="cx"> test("delete array[0]", array);
</span><span class="cx"> test("Object.getOwnPropertyDescriptor(array, 0)", array);
</span><del>- test("Object.defineProperty(array, 0, { value: 1, writable: true, configurable: true, enumerable: true })", array);
</del><ins>+ test("Object.defineProperty(array, 0, { value: 1, writable: true, configurable: false, enumerable: true })", array);
</ins><span class="cx"> test("array[0] = 1", array);
</span><span class="cx"> test("array[i] = 1", array);
</span><span class="cx"> }
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> testFTL("array[0]", array, failArray);
</span><span class="cx"> testFTL("delete array[0]", array, failArray);
</span><span class="cx"> testFTL("Object.getOwnPropertyDescriptor(array, 0)", array, failArray);
</span><del>- testFTL("Object.defineProperty(array, 0, { value: 1, writable: true, configurable: true, enumerable: true })", array, failArray);
</del><ins>+ testFTL("Object.defineProperty(array, 0, { value: 1, writable: true, configurable: false, enumerable: true })", array, failArray);
</ins><span class="cx"> testFTL("array[0] = 1", array, failArray);
</span><span class="cx"> testFTL("array[i] = 1", array, failArray);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresstypedarrayaccessneuteredjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/typedarray-access-neutered.js (203095 => 203096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/typedarray-access-neutered.js 2016-07-11 23:34:22 UTC (rev 203095)
+++ trunk/Source/JavaScriptCore/tests/stress/typedarray-access-neutered.js 2016-07-11 23:39:29 UTC (rev 203096)
</span><span class="lines">@@ -25,6 +25,6 @@
</span><span class="cx"> test((array) => array[0], i);
</span><span class="cx"> test((array) => delete array[0], i);
</span><span class="cx"> test((array) => Object.getOwnPropertyDescriptor(array, 0), i);
</span><del>- test((array) => Object.defineProperty(array, 0, { value: 1, writable: true, configurable: true, enumerable: true }), i)
</del><ins>+ test((array) => Object.defineProperty(array, 0, { value: 1, writable: true, configurable: false, enumerable: true }), i)
</ins><span class="cx"> test((array) => array[0] = 1, i);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresstypedarrayconfigureindexjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/typedarray-configure-index.js (0 => 203096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/typedarray-configure-index.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/typedarray-configure-index.js 2016-07-11 23:39:29 UTC (rev 203096)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+typedArrays = [Int8Array, Uint8Array, Uint8ClampedArray, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array];
+
+function assert(cond) {
+ if (!cond)
+ throw new Error("bad assertion!");
+}
+
+function assertThrows(thunk, error) {
+ let failed = true;
+ try {
+ thunk();
+ } catch (e) {
+ if (error && e != error)
+ throw new Error("bad assertion!");
+ failed = false;
+ }
+ if (failed)
+ throw new Error("bad assertion!");
+}
+
+function makeDescriptor(accessor, configurable, writable, enumerable) {
+ let o = {writable, configurable, enumerable}
+ if (accessor)
+ o.get = () => 1;
+ else
+ o.value = 1;
+ return o;
+}
+
+let bools = [true, false];
+
+function test(array, a, c, error ) {
+ for (w of bools) {
+ for (e of bools) {
+ assertThrows(() => Object.defineProperty(a, 0, makeDescriptor(a, c, w, e), error));
+ }
+ }
+}
+
+function foo() {
+ for (constructor of typedArrays) {
+ let a = new constructor(10);
+ Object.defineProperty(a, 0, makeDescriptor(false, false, true, true));
+ assert(a[0] === 1);
+ assertThrows(() => Object.defineProperty(a, 0, makeDescriptor(false, false, true, false), "TypeError: Attempting to store non-enumerable or non-writable indexed property on a typed array."));
+ assertThrows(() => Object.defineProperty(a, 0, makeDescriptor(false, false, false, false), "TypeError: Attempting to store non-enumerable or non-writable indexed property on a typed array."));
+ assertThrows(() => Object.defineProperty(a, 0, makeDescriptor(false, false, false, true), "TypeError: Attempting to store non-enumerable or non-writable indexed property on a typed array."));
+
+ test(a, false, true, "TypeError: Attempting to configure non-configurable property.");
+ for (c of bools) {
+ test(a, true, c, "TypeError: Attempting to store accessor indexed property on a typed array.")
+ }
+ }
+}
+
+for (let i = 0; i < 100; i++)
+ foo();
</ins></span></pre>
</div>
</div>
</body>
</html>