<!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>[198052] 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/198052">198052</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-03-11 15:48:46 -0800 (Fri, 11 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ES6] Make Object.assign spec compliant
https://bugs.webkit.org/show_bug.cgi?id=155375
Reviewed by Michael Saboff.
This is a straight forward implementation of Object.assign
in the spec.
https://tc39.github.io/ecma262/#sec-object.assign
Before, weren't performing all of the specified operations.
Now, we are.
* builtins/ObjectConstructor.js:
(assign):
* runtime/CommonIdentifiers.h:
* runtime/JSGlobalObject.cpp:
(JSC::JSGlobalObject::init):
* tests/es6.yaml:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsObjectConstructorjs">trunk/Source/JavaScriptCore/builtins/ObjectConstructor.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonIdentifiersh">trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretestses6yaml">trunk/Source/JavaScriptCore/tests/es6.yaml</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressobjectassigncorrectnessjs">trunk/Source/JavaScriptCore/tests/stress/object-assign-correctness.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (198051 => 198052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-11 23:24:00 UTC (rev 198051)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-11 23:48:46 UTC (rev 198052)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-03-11 Saam barati <sbarati@apple.com>
+
+ [ES6] Make Object.assign spec compliant
+ https://bugs.webkit.org/show_bug.cgi?id=155375
+
+ Reviewed by Michael Saboff.
+
+ This is a straight forward implementation of Object.assign
+ in the spec.
+ https://tc39.github.io/ecma262/#sec-object.assign
+ Before, weren't performing all of the specified operations.
+ Now, we are.
+
+ * builtins/ObjectConstructor.js:
+ (assign):
+ * runtime/CommonIdentifiers.h:
+ * runtime/JSGlobalObject.cpp:
+ (JSC::JSGlobalObject::init):
+ * tests/es6.yaml:
+
</ins><span class="cx"> 2016-03-11 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement Function.name and Function#toString for ES6 class.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsObjectConstructorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/ObjectConstructor.js (198051 => 198052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/ObjectConstructor.js 2016-03-11 23:24:00 UTC (rev 198051)
+++ trunk/Source/JavaScriptCore/builtins/ObjectConstructor.js 2016-03-11 23:48:46 UTC (rev 198052)
</span><span class="lines">@@ -30,15 +30,17 @@
</span><span class="cx"> if (target == null)
</span><span class="cx"> throw new @TypeError("can't convert " + target + " to object");
</span><span class="cx">
</span><del>- var objTarget = @Object(target);
- for (var s = 1, argumentsLength = arguments.length; s < argumentsLength; ++s) {
- var nextSource = arguments[s];
</del><ins>+ let objTarget = @Object(target);
+ for (let s = 1, argumentsLength = arguments.length; s < argumentsLength; ++s) {
+ let nextSource = arguments[s];
</ins><span class="cx"> if (nextSource != null) {
</span><del>- var from = @Object(nextSource);
- var keys = @ownEnumerablePropertyKeys(from);
- for (var i = 0, keysLength = keys.length; i < keysLength; ++i) {
- var nextKey = keys[i];
- objTarget[nextKey] = from[nextKey];
</del><ins>+ let from = @Object(nextSource);
+ let keys = @Reflect.ownKeys(from);
+ for (let i = 0, keysLength = keys.length; i < keysLength; ++i) {
+ let nextKey = keys[i];
+ let descriptor = @Reflect.getOwnPropertyDescriptor(from, nextKey);
+ if (descriptor !== @undefined && descriptor.enumerable)
+ objTarget[nextKey] = from[nextKey];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonIdentifiersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h (198051 => 198052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h 2016-03-11 23:24:00 UTC (rev 198051)
+++ trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h 2016-03-11 23:48:46 UTC (rev 198052)
</span><span class="lines">@@ -311,6 +311,7 @@
</span><span class="cx"> macro(RegExp) \
</span><span class="cx"> macro(Map) \
</span><span class="cx"> macro(Promise) \
</span><ins>+ macro(Reflect) \
</ins><span class="cx"> macro(InternalPromise) \
</span><span class="cx"> macro(abs) \
</span><span class="cx"> macro(floor) \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (198051 => 198052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2016-03-11 23:24:00 UTC (rev 198051)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2016-03-11 23:48:46 UTC (rev 198052)
</span><span class="lines">@@ -486,7 +486,8 @@
</span><span class="cx"> #endif // ENABLE(INTL)
</span><span class="cx"> putDirectWithoutTransition(vm, vm.propertyNames->JSON, JSONObject::create(vm, JSONObject::createStructure(vm, this, m_objectPrototype.get())), DontEnum);
</span><span class="cx"> putDirectWithoutTransition(vm, vm.propertyNames->Math, MathObject::create(vm, this, MathObject::createStructure(vm, this, m_objectPrototype.get())), DontEnum);
</span><del>- putDirectWithoutTransition(vm, vm.propertyNames->Reflect, ReflectObject::create(vm, this, ReflectObject::createStructure(vm, this, m_objectPrototype.get())), DontEnum);
</del><ins>+ ReflectObject* reflectObject = ReflectObject::create(vm, this, ReflectObject::createStructure(vm, this, m_objectPrototype.get()));
+ putDirectWithoutTransition(vm, vm.propertyNames->Reflect, reflectObject, DontEnum);
</ins><span class="cx">
</span><span class="cx"> JSTypedArrayViewConstructor* typedArraySuperConstructor = JSTypedArrayViewConstructor::create(vm, this, JSTypedArrayViewConstructor::createStructure(vm, this, m_functionPrototype.get()), typedArrayProto, speciesGetterSetter);
</span><span class="cx"> typedArrayProto->putDirectWithoutTransition(vm, vm.propertyNames->constructor, typedArraySuperConstructor, DontEnum);
</span><span class="lines">@@ -566,6 +567,7 @@
</span><span class="cx"> GlobalPropertyInfo(vm.propertyNames->isFinitePrivateName, privateFuncIsFinite, DontEnum | DontDelete | ReadOnly),
</span><span class="cx"> GlobalPropertyInfo(vm.propertyNames->isNaNPrivateName, privateFuncIsNaN, DontEnum | DontDelete | ReadOnly),
</span><span class="cx"> GlobalPropertyInfo(vm.propertyNames->PromisePrivateName, promiseConstructor, DontEnum | DontDelete | ReadOnly),
</span><ins>+ GlobalPropertyInfo(vm.propertyNames->ReflectPrivateName, reflectObject, DontEnum | DontDelete | ReadOnly),
</ins><span class="cx"> GlobalPropertyInfo(vm.propertyNames->InternalPromisePrivateName, internalPromiseConstructor, DontEnum | DontDelete | ReadOnly),
</span><span class="cx">
</span><span class="cx"> GlobalPropertyInfo(vm.propertyNames->isSetPrivateName, JSFunction::create(vm, this, 1, String(), privateFuncIsSet), DontEnum | DontDelete | ReadOnly),
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestses6yaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/es6.yaml (198051 => 198052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/es6.yaml 2016-03-11 23:24:00 UTC (rev 198051)
+++ trunk/Source/JavaScriptCore/tests/es6.yaml 2016-03-11 23:48:46 UTC (rev 198052)
</span><span class="lines">@@ -1025,7 +1025,7 @@
</span><span class="cx"> - path: es6/Proxy_internal_getOwnPropertyDescriptor_calls_Function.prototype.bind.js
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/Proxy_internal_getOwnPropertyDescriptor_calls_Object.assign.js
</span><del>- cmd: runES6 :fail
</del><ins>+ cmd: runES6 :normal
</ins><span class="cx"> - path: es6/Proxy_internal_getOwnPropertyDescriptor_calls_Object.prototype.hasOwnProperty.js
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/Proxy_internal_ownKeys_calls_SerializeJSONObject.js
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressobjectassigncorrectnessjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/object-assign-correctness.js (0 => 198052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/object-assign-correctness.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/object-assign-correctness.js 2016-03-11 23:48:46 UTC (rev 198052)
</span><span class="lines">@@ -0,0 +1,168 @@
</span><ins>+function assert(b) {
+ if (!b)
+ throw new Error("Bad assertion.");
+}
+function test(f) {
+ for (let i = 0; i < 500; i++)
+ f();
+}
+
+test(function() {
+ let ownKeysCalled = false;
+ let getOwnPropertyDescriptorProps = [];
+ let getProps = [];
+ let enumerableCalled = false;
+ let handler = {
+ getOwnPropertyDescriptor: function(target, key) {
+ getOwnPropertyDescriptorProps.push(key);
+ switch(key) {
+ case "foo":
+ return {
+ enumerable: true,
+ configurable: true,
+ value: 45
+ };
+ case "bar":
+ return {
+ enumerable: true,
+ get enumerable() {
+ enumerableCalled = true;
+ return true;
+ },
+ configurable: true,
+ value: 50
+ }
+ case "baz":
+ return {
+ enumerable: false,
+ configurable: true,
+ value: 50
+ }
+ default:
+ assert(false, "should not be reached.");
+ break;
+ }
+ },
+ ownKeys: function(target) {
+ ownKeysCalled = true;
+ return ["foo", "bar", "baz"];
+ },
+ get: function(target, key) {
+ getProps.push(key);
+ switch(key) {
+ case "foo":
+ return 20;
+ case "bar":
+ return "bar";
+ default:
+ assert(false, "should not be reached.");
+ break;
+ }
+ }
+ };
+
+ let proxy = new Proxy({}, handler);
+ let foo = {};
+ Object.assign(foo, proxy);
+
+ assert(enumerableCalled);
+
+ assert(Reflect.ownKeys(foo).length === 2);
+ assert(Reflect.ownKeys(foo)[0] === "foo");
+ assert(Reflect.ownKeys(foo)[1] === "bar");
+ assert(foo.foo === 20);
+ assert(foo.bar === "bar");
+
+ assert(ownKeysCalled);
+ assert(getOwnPropertyDescriptorProps.length === 3);
+ assert(getOwnPropertyDescriptorProps[0] === "foo");
+ assert(getOwnPropertyDescriptorProps[1] === "bar");
+ assert(getOwnPropertyDescriptorProps[2] === "baz");
+
+ assert(getProps.length === 2);
+ assert(getProps[0] === "foo");
+ assert(getProps[1] === "bar");
+});
+
+
+let oldReflect = Reflect;
+Reflect = null;
+assert(Reflect === null); // Make sure Object.assign's use of Reflect is safe.
+
+test(function() {
+ let ownKeysCalled = false;
+ let getOwnPropertyDescriptorProps = [];
+ let getProps = [];
+ let enumerableCalled = false;
+ let handler = {
+ getOwnPropertyDescriptor: function(target, key) {
+ getOwnPropertyDescriptorProps.push(key);
+ switch(key) {
+ case "foo":
+ return {
+ enumerable: true,
+ configurable: true,
+ value: 45
+ };
+ case "bar":
+ return {
+ get enumerable() {
+ enumerableCalled = true;
+ return true;
+ },
+ configurable: true,
+ value: 50
+ }
+ case "baz":
+ return {
+ enumerable: false,
+ configurable: true,
+ value: 50
+ }
+ default:
+ assert(false, "should not be reached.");
+ break;
+ }
+ },
+ ownKeys: function(target) {
+ ownKeysCalled = true;
+ return ["foo", "bar", "baz"];
+ },
+ get: function(target, key) {
+ getProps.push(key);
+ switch(key) {
+ case "foo":
+ return 20;
+ case "bar":
+ return "bar";
+ default:
+ assert(false, "should not be reached.");
+ break;
+ }
+ }
+ };
+
+ let proxy = new Proxy({}, handler);
+ let foo = {};
+ Object.assign(foo, proxy);
+
+ assert(enumerableCalled);
+
+ assert(oldReflect.ownKeys(foo).length === 2);
+ assert(oldReflect.ownKeys(foo)[0] === "foo");
+ assert(oldReflect.ownKeys(foo)[1] === "bar");
+ assert(foo.foo === 20);
+ assert(foo.bar === "bar");
+
+ assert(ownKeysCalled);
+ assert(getOwnPropertyDescriptorProps.length === 3);
+ assert(getOwnPropertyDescriptorProps[0] === "foo");
+ assert(getOwnPropertyDescriptorProps[1] === "bar");
+ assert(getOwnPropertyDescriptorProps[2] === "baz");
+
+ assert(getProps.length === 2);
+ assert(getProps[0] === "foo");
+ assert(getProps[1] === "bar");
+
+});
+
</ins></span></pre>
</div>
</div>
</body>
</html>