<!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>[204868] 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/204868">204868</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-08-23 16:24:47 -0700 (Tue, 23 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>%TypedArray%.prototype.slice needs to check that the source and destination have not been detached.
https://bugs.webkit.org/show_bug.cgi?id=161031
<rdar://problem/27937019>
Reviewed by Geoffrey Garen.
JSTests:
* stress/typedarray-slice.js:
(get let):
(get try):
(testSpeciesWithTransferring):
Source/JavaScriptCore:
* runtime/JSGenericTypedArrayViewPrototypeFunctions.h:
(JSC::speciesConstruct):
(JSC::genericTypedArrayViewProtoFuncSlice):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTestsstresstypedarrayslicejs">trunk/JSTests/stress/typedarray-slice.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewPrototypeFunctionsh">trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (204867 => 204868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-08-23 23:21:53 UTC (rev 204867)
+++ trunk/JSTests/ChangeLog 2016-08-23 23:24:47 UTC (rev 204868)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-08-23 Keith Miller <keith_miller@apple.com>
+
+ %TypedArray%.prototype.slice needs to check that the source and destination have not been detached.
+ https://bugs.webkit.org/show_bug.cgi?id=161031
+ <rdar://problem/27937019>
+
+ Reviewed by Geoffrey Garen.
+
+ * stress/typedarray-slice.js:
+ (get let):
+ (get try):
+ (testSpeciesWithTransferring):
+
</ins><span class="cx"> 2016-08-22 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Butterflies should be allocated in Auxiliary MarkedSpace instead of CopiedSpace and we should rewrite as much of the GC as needed to make this not a regression
</span></span></pre></div>
<a id="trunkJSTestsstresstypedarrayslicejs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/stress/typedarray-slice.js (204867 => 204868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/typedarray-slice.js 2016-08-23 23:21:53 UTC (rev 204867)
+++ trunk/JSTests/stress/typedarray-slice.js 2016-08-23 23:24:47 UTC (rev 204868)
</span><span class="lines">@@ -135,8 +135,38 @@
</span><span class="cx"> return false;
</span><span class="cx"> });
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> shouldBeTrue("forEachTypedArray(subclasses, testSpeciesWithSameBuffer)");
</span><span class="cx">
</span><ins>+function testSpeciesWithTransferring(unused, constructor) {
</ins><span class="cx">
</span><ins>+ let array = new constructor(10);
+ Object.defineProperty(constructor, Symbol.species, { get() {
+ transferArrayBuffer(array.buffer);
+ return undefined;
+ }, configurable: true });
+
+ try {
+ array.slice(0,1);
+ return false;
+ } catch (e) { }
+
+ array = new constructor(10);
+ Object.defineProperty(constructor, Symbol.species, { get() {
+ return function(len) {
+ let a = new constructor(len);
+ transferArrayBuffer(a.buffer);
+ return a;
+ }
+ }, configurable: true });
+
+ try {
+ array.slice(0,1);
+ return false;
+ } catch (e) { }
+
+ return true;
+}
+
+shouldBeTrue("forEachTypedArray(typedArrays, testSpeciesWithTransferring)");
+
</ins><span class="cx"> finishJSTest();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (204867 => 204868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-08-23 23:21:53 UTC (rev 204867)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-08-23 23:24:47 UTC (rev 204868)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-08-23 Keith Miller <keith_miller@apple.com>
+
+ %TypedArray%.prototype.slice needs to check that the source and destination have not been detached.
+ https://bugs.webkit.org/show_bug.cgi?id=161031
+ <rdar://problem/27937019>
+
+ Reviewed by Geoffrey Garen.
+
+ * runtime/JSGenericTypedArrayViewPrototypeFunctions.h:
+ (JSC::speciesConstruct):
+ (JSC::genericTypedArrayViewProtoFuncSlice):
+
</ins><span class="cx"> 2016-08-23 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(204854): ASan is unhappy
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewPrototypeFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h (204867 => 204868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h 2016-08-23 23:21:53 UTC (rev 204867)
+++ trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h 2016-08-23 23:24:47 UTC (rev 204868)
</span><span class="lines">@@ -69,9 +69,14 @@
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- if (JSArrayBufferView* view = jsDynamicCast<JSArrayBufferView*>(result))
- return view;
</del><ins>+ if (JSArrayBufferView* view = jsDynamicCast<JSArrayBufferView*>(result)) {
+ if (!view->isNeutered())
+ return view;
</ins><span class="cx">
</span><ins>+ throwTypeError(exec, typedArrayBufferHasBeenDetachedErrorMessage);
+ return nullptr;
+ }
+
</ins><span class="cx"> throwTypeError(exec, ASCIILiteral("species constructor did not return a TypedArray View"));
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -441,6 +446,10 @@
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><ins>+ ASSERT(!result->isNeutered());
+ if (thisObject->isNeutered())
+ return throwVMTypeError(exec, typedArrayBufferHasBeenDetachedErrorMessage);
+
</ins><span class="cx"> // We return early here since we don't allocate a backing store if length is 0 and memmove does not like nullptrs
</span><span class="cx"> if (!length)
</span><span class="cx"> return JSValue::encode(result);
</span></span></pre>
</div>
</div>
</body>
</html>