<!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>[211116] branches/safari-603-branch</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/211116">211116</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-24 15:29:30 -0800 (Tue, 24 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211070">r211070</a>. rdar://problem/30121809</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchJSTestsChangeLog">branches/safari-603-branch/JSTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoreChangeLog">branches/safari-603-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoredfgDFGOperationscpp">branches/safari-603-branch/Source/JavaScriptCore/dfg/DFGOperations.cpp</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCorejsccpp">branches/safari-603-branch/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoreruntimeCommonSlowPathscpp">branches/safari-603-branch/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoreruntimeJSArrayh">branches/safari-603-branch/Source/JavaScriptCore/runtime/JSArray.h</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoreruntimeJSArrayInlinesh">branches/safari-603-branch/Source/JavaScriptCore/runtime/JSArrayInlines.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchJSTestsstressspreadconsultscorrectglobalobjectjs">branches/safari-603-branch/JSTests/stress/spread-consults-correct-global-object.js</a></li>
<li><a href="#branchessafari603branchJSTestsstressspreadcorrectglobalobjectonexceptionjs">branches/safari-603-branch/JSTests/stress/spread-correct-global-object-on-exception.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/JSTests/ChangeLog (211115 => 211116)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/JSTests/ChangeLog 2017-01-24 23:29:25 UTC (rev 211115)
+++ branches/safari-603-branch/JSTests/ChangeLog 2017-01-24 23:29:30 UTC (rev 211116)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-01-24 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r211070. rdar://problem/30121809
+
+ 2017-01-23 Saam Barati <sbarati@apple.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=167247
+ JSC: operationSpreadGeneric uses the wrong global object for the builtin function and slow_path_spread consults the wrong global object to prove if the iterator protocol is unobservable
+ <rdar://problem/30121809>
+
+ Reviewed by Filip Pizlo.
+
+ * stress/spread-consults-correct-global-object.js: Added.
+ (assert):
+ (spread):
+ * stress/spread-correct-global-object-on-exception.js: Added.
+ (assert):
+ (spread):
+ (const.objectText.let.o.Symbol.iterator):
+ (catch):
+
</ins><span class="cx"> 2017-01-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r210844. rdar://problem/29993906
</span></span></pre></div>
<a id="branchessafari603branchJSTestsstressspreadconsultscorrectglobalobjectjs"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/JSTests/stress/spread-consults-correct-global-object.js (0 => 211116)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/JSTests/stress/spread-consults-correct-global-object.js (rev 0)
+++ branches/safari-603-branch/JSTests/stress/spread-consults-correct-global-object.js 2017-01-24 23:29:30 UTC (rev 211116)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+function assert(b) {
+ if (!b)
+ throw new Error("Bad assertion");
+}
+function spread(a) {
+ return [...a];
+}
+noInline(spread);
+
+const foo = {};
+
+let secondGlobalObject = createGlobalObject();
+secondGlobalObject.Array.prototype[0] = foo;
+let x = secondGlobalObject.Function("return [, 20];")();
+let result = spread(x);
+assert(result.length === 2);
+assert(result[0] === foo);
+assert(result[1] === 20);
</ins></span></pre></div>
<a id="branchessafari603branchJSTestsstressspreadcorrectglobalobjectonexceptionjs"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/JSTests/stress/spread-correct-global-object-on-exception.js (0 => 211116)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/JSTests/stress/spread-correct-global-object-on-exception.js (rev 0)
+++ branches/safari-603-branch/JSTests/stress/spread-correct-global-object-on-exception.js 2017-01-24 23:29:30 UTC (rev 211116)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+function assert(b) {
+ if (!b)
+ throw new Error("Bad assertion");
+}
+function spread(a) {
+ return [...a];
+}
+noInline(spread);
+
+const objectText = `
+ let o = {
+ [Symbol.iterator]() {
+ return {
+ next() {
+ return {done: true};
+ }
+ };
+ }
+ };
+ o;
+`;
+
+let o = eval(objectText);
+for (let i = 0; i < 1000; i++) {
+ if (i % 23 === 0)
+ o = eval(objectText);
+ spread(o);
+}
+
+let myGlobalObject = globalObjectForObject(new Object);
+
+let secondGlobalObject = createGlobalObject();
+let o2 = secondGlobalObject.Function("return {};")();
+
+let error = null;
+try {
+ spread(o2);
+} catch(e) {
+ error = e;
+}
+
+assert(error);
+assert(globalObjectForObject(error) === myGlobalObject);
</ins></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/ChangeLog (211115 => 211116)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2017-01-24 23:29:25 UTC (rev 211115)
+++ branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2017-01-24 23:29:30 UTC (rev 211116)
</span><span class="lines">@@ -1,5 +1,48 @@
</span><span class="cx"> 2017-01-24 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211070. rdar://problem/30121809
+
+ 2017-01-23 Saam Barati <sbarati@apple.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=167247
+ JSC: operationSpreadGeneric uses the wrong global object for the builtin function and slow_path_spread consults the wrong global object to prove if the iterator protocol is unobservable
+ <rdar://problem/30121809>
+
+ Reviewed by Filip Pizlo.
+
+ There were two bugs in the different tiers with respect to how
+ spread handled global objects.
+
+ The first was in the LLInt/baseline inside slow_path_spread:
+
+ We consulted the lexical global object instead of the thing we're
+ spreading's global object to determine if the array iterator protocol
+ is unobservable. This is wrong if the incoming array is from a different
+ global object. We must consult the incoming array's global object
+ to determine if it can be spread using the fast path.
+
+ The second was in operationSpreadGeneric in the DFG/FTL:
+
+ We were always using the incoming array's global object, even
+ when going down the slow path. This is wrong because we were
+ fetching the builtin iteration function helper from the incoming
+ array's global object, which meant that if the iterator function
+ were to throw an exception, it could leak objects from a different
+ global object. We should be executing the iterator function with
+ the lexical global object.
+
+ * dfg/DFGOperations.cpp:
+ * jsc.cpp:
+ (GlobalObject::finishCreation):
+ (functionGlobalObjectForObject):
+ * runtime/CommonSlowPaths.cpp:
+ (JSC::SLOW_PATH_DECL):
+ * runtime/JSArray.h:
+ * runtime/JSArrayInlines.h:
+ (JSC::JSArray::isIteratorProtocolFastAndNonObservable):
+
+2017-01-24 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211069. rdar://problem/30173274
</span><span class="cx">
</span><span class="cx"> 2017-01-22 Filip Pizlo <fpizlo@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoredfgDFGOperationscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/dfg/DFGOperations.cpp (211115 => 211116)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/dfg/DFGOperations.cpp 2017-01-24 23:29:25 UTC (rev 211115)
+++ branches/safari-603-branch/Source/JavaScriptCore/dfg/DFGOperations.cpp 2017-01-24 23:29:30 UTC (rev 211116)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> #include "Interpreter.h"
</span><span class="cx"> #include "JIT.h"
</span><span class="cx"> #include "JITExceptions.h"
</span><ins>+#include "JSArrayInlines.h"
</ins><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "JSFixedArray.h"
</span><span class="cx"> #include "JSGenericTypedArrayViewConstructorInlines.h"
</span><span class="lines">@@ -1984,19 +1985,18 @@
</span><span class="cx">
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><del>- JSGlobalObject* globalObject = iterable->structure(vm)->globalObject();
- if (!globalObject)
- globalObject = exec->lexicalGlobalObject();
-
- if (isJSArray(iterable) && globalObject->isArrayIteratorProtocolFastAndNonObservable()) {
</del><ins>+ if (isJSArray(iterable)) {
</ins><span class="cx"> JSArray* array = jsCast<JSArray*>(iterable);
</span><del>- throwScope.release();
- return JSFixedArray::createFromArray(exec, vm, array);
</del><ins>+ if (array->isIteratorProtocolFastAndNonObservable()) {
+ throwScope.release();
+ return JSFixedArray::createFromArray(exec, vm, array);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: we can probably make this path faster by having our caller JS code call directly into
</span><span class="cx"> // the iteration protocol builtin: https://bugs.webkit.org/show_bug.cgi?id=164520
</span><span class="cx">
</span><ins>+ JSGlobalObject* globalObject = exec->lexicalGlobalObject();
</ins><span class="cx"> JSArray* array;
</span><span class="cx"> {
</span><span class="cx"> JSFunction* iterationFunction = globalObject->iteratorProtocolFunction();
</span><span class="lines">@@ -2022,7 +2022,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(isJSArray(cell));
</span><span class="cx"> JSArray* array = jsCast<JSArray*>(cell);
</span><del>- ASSERT(array->globalObject()->isArrayIteratorProtocolFastAndNonObservable());
</del><ins>+ ASSERT(array->isIteratorProtocolFastAndNonObservable());
</ins><span class="cx">
</span><span class="cx"> return JSFixedArray::createFromArray(exec, vm, array);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/jsc.cpp (211115 => 211116)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/jsc.cpp 2017-01-24 23:29:25 UTC (rev 211115)
+++ branches/safari-603-branch/Source/JavaScriptCore/jsc.cpp 2017-01-24 23:29:30 UTC (rev 211116)
</span><span class="lines">@@ -1007,6 +1007,7 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL functionGetRandomSeed(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL functionSetRandomSeed(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL functionIsRope(ExecState*);
</span><ins>+static EncodedJSValue JSC_HOST_CALL functionGlobalObjectForObject(ExecState*);
</ins><span class="cx">
</span><span class="cx"> struct Script {
</span><span class="cx"> enum class StrictMode {
</span><span class="lines">@@ -1231,6 +1232,8 @@
</span><span class="cx"> addFunction(vm, "setRandomSeed", functionSetRandomSeed, 1);
</span><span class="cx"> addFunction(vm, "isRope", functionIsRope, 1);
</span><span class="cx">
</span><ins>+ addFunction(vm, "globalObjectForObject", functionGlobalObjectForObject, 1);
+
</ins><span class="cx"> addFunction(vm, "is32BitPlatform", functionIs32BitPlatform, 0);
</span><span class="cx">
</span><span class="cx"> addFunction(vm, "loadModule", functionLoadModule, 1);
</span><span class="lines">@@ -2104,6 +2107,15 @@
</span><span class="cx"> return JSValue::encode(jsBoolean(!impl));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+EncodedJSValue JSC_HOST_CALL functionGlobalObjectForObject(ExecState* exec)
+{
+ JSValue value = exec->argument(0);
+ RELEASE_ASSERT(value.isObject());
+ JSGlobalObject* globalObject = jsCast<JSObject*>(value)->globalObject();
+ RELEASE_ASSERT(globalObject);
+ return JSValue::encode(globalObject);
+}
+
</ins><span class="cx"> EncodedJSValue JSC_HOST_CALL functionReadline(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> Vector<char, 256> line;
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreruntimeCommonSlowPathscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp (211115 => 211116)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp 2017-01-24 23:29:25 UTC (rev 211115)
+++ branches/safari-603-branch/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp 2017-01-24 23:29:30 UTC (rev 211116)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include "Interpreter.h"
</span><span class="cx"> #include "IteratorOperations.h"
</span><span class="cx"> #include "JIT.h"
</span><ins>+#include "JSArrayInlines.h"
</ins><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "JSCJSValue.h"
</span><span class="cx"> #include "JSFixedArray.h"
</span><span class="lines">@@ -1034,16 +1035,18 @@
</span><span class="cx">
</span><span class="cx"> JSValue iterable = OP_C(2).jsValue();
</span><span class="cx">
</span><del>- JSGlobalObject* globalObject = exec->lexicalGlobalObject();
-
- if (iterable.isCell() && isJSArray(iterable.asCell()) && globalObject->isArrayIteratorProtocolFastAndNonObservable()) {
- // JSFixedArray::createFromArray does not consult the prototype chain,
- // so we must be sure that not consulting the prototype chain would
- // produce the same value during iteration.
</del><ins>+ if (iterable.isCell() && isJSArray(iterable.asCell())) {
</ins><span class="cx"> JSArray* array = jsCast<JSArray*>(iterable);
</span><del>- RETURN(JSFixedArray::createFromArray(exec, vm, array));
</del><ins>+ if (array->isIteratorProtocolFastAndNonObservable()) {
+ // JSFixedArray::createFromArray does not consult the prototype chain,
+ // so we must be sure that not consulting the prototype chain would
+ // produce the same value during iteration.
+ RETURN(JSFixedArray::createFromArray(exec, vm, array));
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ JSGlobalObject* globalObject = exec->lexicalGlobalObject();
+
</ins><span class="cx"> JSArray* array;
</span><span class="cx"> {
</span><span class="cx"> JSFunction* iterationFunction = globalObject->iteratorProtocolFunction();
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreruntimeJSArrayh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/runtime/JSArray.h (211115 => 211116)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/runtime/JSArray.h 2017-01-24 23:29:25 UTC (rev 211115)
+++ branches/safari-603-branch/Source/JavaScriptCore/runtime/JSArray.h 2017-01-24 23:29:30 UTC (rev 211116)
</span><span class="lines">@@ -150,6 +150,8 @@
</span><span class="cx"> JS_EXPORT_PRIVATE void fillArgList(ExecState*, MarkedArgumentBuffer&);
</span><span class="cx"> JS_EXPORT_PRIVATE void copyToArguments(ExecState*, VirtualRegister firstElementDest, unsigned offset, unsigned length);
</span><span class="cx">
</span><ins>+ bool isIteratorProtocolFastAndNonObservable();
+
</ins><span class="cx"> static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype, IndexingType indexingType)
</span><span class="cx"> {
</span><span class="cx"> return Structure::create(vm, globalObject, prototype, TypeInfo(ArrayType, StructureFlags), info(), indexingType);
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreruntimeJSArrayInlinesh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/runtime/JSArrayInlines.h (211115 => 211116)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/runtime/JSArrayInlines.h 2017-01-24 23:29:25 UTC (rev 211115)
+++ branches/safari-603-branch/Source/JavaScriptCore/runtime/JSArrayInlines.h 2017-01-24 23:29:30 UTC (rev 211116)
</span><span class="lines">@@ -93,4 +93,9 @@
</span><span class="cx"> return lengthValue.toLength(exec);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ALWAYS_INLINE bool JSArray::isIteratorProtocolFastAndNonObservable()
+{
+ return globalObject()->isArrayIteratorProtocolFastAndNonObservable();
+}
+
</ins><span class="cx"> } // namespace JSC
</span></span></pre>
</div>
</div>
</body>
</html>