<!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>[198572] 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/198572">198572</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-22 19:12:17 -0700 (Tue, 22 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] correctly handle indexed properties in Object.getOwnPropertyDescriptors
https://bugs.webkit.org/show_bug.cgi?id=155563
Patch by Caitlin Potter <caitp@igalia.com> on 2016-03-22
Reviewed by Saam Barati.
* runtime/JSObject.h:
(JSC::JSObject::putOwnDataPropertyMayBeIndex):
* runtime/ObjectConstructor.cpp:
(JSC::objectConstructorGetOwnPropertyDescriptors):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjecth">trunk/Source/JavaScriptCore/runtime/JSObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeObjectConstructorcpp">trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretestses6Object_static_methods_ObjectgetOwnPropertyDescriptorsjs">trunk/Source/JavaScriptCore/tests/es6/Object_static_methods_Object.getOwnPropertyDescriptors.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (198571 => 198572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-23 01:39:36 UTC (rev 198571)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-23 02:12:17 UTC (rev 198572)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-22 Caitlin Potter <caitp@igalia.com>
+
+ [JSC] correctly handle indexed properties in Object.getOwnPropertyDescriptors
+ https://bugs.webkit.org/show_bug.cgi?id=155563
+
+ Reviewed by Saam Barati.
+
+ * runtime/JSObject.h:
+ (JSC::JSObject::putOwnDataPropertyMayBeIndex):
+ * runtime/ObjectConstructor.cpp:
+ (JSC::objectConstructorGetOwnPropertyDescriptors):
+
</ins><span class="cx"> 2016-03-22 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> We should FTL compile code when the debugger is enabled
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.h (198571 => 198572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.h 2016-03-23 01:39:36 UTC (rev 198571)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.h 2016-03-23 02:12:17 UTC (rev 198572)
</span><span class="lines">@@ -627,6 +627,7 @@
</span><span class="cx"> // - does not walk the prototype chain (to check for accessors or non-writable properties).
</span><span class="cx"> // This is used by JSLexicalEnvironment.
</span><span class="cx"> bool putOwnDataProperty(VM&, PropertyName, JSValue, PutPropertySlot&);
</span><ins>+ bool putOwnDataPropertyMayBeIndex(ExecState*, PropertyName, JSValue, PutPropertySlot&);
</ins><span class="cx">
</span><span class="cx"> // Fast access to known property offsets.
</span><span class="cx"> JSValue getDirect(PropertyOffset offset) const { return locationForOffset(offset)->get(); }
</span><span class="lines">@@ -1482,6 +1483,19 @@
</span><span class="cx"> return putDirectInternal<PutModePut>(vm, propertyName, value, 0, slot);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool JSObject::putOwnDataPropertyMayBeIndex(ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
+{
+ ASSERT(value);
+ ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
+ ASSERT(!structure()->hasGetterSetterProperties());
+ ASSERT(!structure()->hasCustomGetterSetterProperties());
+
+ if (Optional<uint32_t> index = parseIndex(propertyName))
+ return putDirectIndex(exec, index.value(), value, 0, PutDirectIndexLikePutDirect);
+
+ return putDirectInternal<PutModePut>(exec->vm(), propertyName, value, 0, slot);
+}
+
</ins><span class="cx"> inline bool JSObject::putDirect(VM& vm, PropertyName propertyName, JSValue value, unsigned attributes)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!value.isGetterSetter() && !(attributes & Accessor));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeObjectConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp (198571 => 198572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp 2016-03-23 01:39:36 UTC (rev 198571)
+++ trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp 2016-03-23 02:12:17 UTC (rev 198572)
</span><span class="lines">@@ -243,13 +243,17 @@
</span><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> JSObject* descriptors = constructEmptyObject(exec);
</span><ins>+ if (exec->hadException())
+ return jsUndefined();
</ins><span class="cx">
</span><span class="cx"> for (auto& propertyName : properties) {
</span><span class="cx"> JSValue fromDescriptor = objectConstructorGetOwnPropertyDescriptor(exec, object, propertyName);
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><del>- descriptors->putDirect(exec->vm(), propertyName, fromDescriptor, 0);
</del><ins>+ PutPropertySlot slot(descriptors);
+ descriptors->putOwnDataPropertyMayBeIndex(exec, propertyName, fromDescriptor, slot);
+ ASSERT(!exec->hadException());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return descriptors;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestses6Object_static_methods_ObjectgetOwnPropertyDescriptorsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/es6/Object_static_methods_Object.getOwnPropertyDescriptors.js (198571 => 198572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/es6/Object_static_methods_Object.getOwnPropertyDescriptors.js 2016-03-23 01:39:36 UTC (rev 198571)
+++ trunk/Source/JavaScriptCore/tests/es6/Object_static_methods_Object.getOwnPropertyDescriptors.js 2016-03-23 02:12:17 UTC (rev 198572)
</span><span class="lines">@@ -51,6 +51,8 @@
</span><span class="cx"> function F() {};
</span><span class="cx"> F.prototype.a = 'A';
</span><span class="cx"> F.prototype.b = 'B';
</span><ins>+ F.prototype[9999] = '0';
+ F.prototype[0] = '0';
</ins><span class="cx">
</span><span class="cx"> var F2 = new F();
</span><span class="cx"> Object.defineProperties(F2, {
</span><span class="lines">@@ -65,10 +67,26 @@
</span><span class="cx"> configurable: true,
</span><span class="cx"> writable: false,
</span><span class="cx"> value: 'C'
</span><ins>+ },
+ 9998: {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: 'X'
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> var result = Object.getOwnPropertyDescriptors(F2);
</span><ins>+
+ shouldBe(undefined, result[0]);
+
+ shouldBe(result[9998].enumerable, true);
+ shouldBe(result[9998].configurable, true);
+ shouldBe(result[9998].writable, true);
+ shouldBe(result[9998].value, 'X')
+
+ shouldBe(undefined, result[9999]);
+
</ins><span class="cx"> shouldBe(undefined, result.a);
</span><span class="cx">
</span><span class="cx"> shouldBe(result.b.enumerable, false);
</span><span class="lines">@@ -91,3 +109,40 @@
</span><span class="cx"> shouldBeDataProperty(result[symbol], 'Symbol(test)', 'global[Symbol(test)]');
</span><span class="cx"> delete global[symbol];
</span><span class="cx"> })(this);
</span><ins>+
+(function testIndexedProperties() {
+ var object = { 0: 'test' };
+ var result = Object.getOwnPropertyDescriptors(object);
+ shouldBeDataProperty(result[0], 'test', 'result[0]');
+ shouldBeDataProperty(result['0'], 'test', 'result["0"]');
+ shouldBe(result[0], result['0']);
+})();
+
+
+(function testPropertiesIndexedSetterOnPrototypeThrows() {
+ var symbol = Symbol('test');
+ Object.defineProperties(Object.prototype, {
+ 0: {
+ configurable: true,
+ get() { return; },
+ set(v) { throw new Error("Setter on prototype should be unreachable!"); }
+ },
+ a: {
+ configurable: true,
+ get() { return; },
+ set(v) { throw new Error("Setter on prototype should be unreachable!"); }
+ },
+ [symbol]: {
+ configurable: true,
+ get() { return; },
+ set(v) { throw new Error("Setter on prototype should be unreachable!"); }
+ }
+ });
+ var result = Object.getOwnPropertyDescriptors({ 0: 1, a: 2, [symbol]: 3 })
+ delete Object.prototype[0];
+ delete Object.prototype.a;
+ delete Object.prototype[symbol];
+ shouldBeDataProperty(result[0], 1, 'result[0]');
+ shouldBeDataProperty(result.a, 2, 'result["a"]');
+ shouldBeDataProperty(result[symbol], 3, 'result[symbol]');
+})();
</ins></span></pre>
</div>
</div>
</body>
</html>