<!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>[196775] 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/196775">196775</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-02-18 13:55:40 -0800 (Thu, 18 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Follow up fix to Implement Proxy.[[GetOwnProperty]]
https://bugs.webkit.org/show_bug.cgi?id=154314
Reviewed by Filip Pizlo.
Part of the implementation was broken because
of how JSObject::getOwnPropertyDescriptor worked.
I've fixed JSObject::getOwnPropertyDescriptor to
be able to handle ProxyObject.
* runtime/JSObject.cpp:
(JSC::JSObject::getOwnPropertyDescriptor):
* runtime/ProxyObject.cpp:
(JSC::ProxyObject::performInternalMethodGetOwnProperty):
* tests/stress/proxy-get-own-property.js:
(assert):
(assert.let.handler.get getOwnPropertyDescriptor):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjectcpp">trunk/Source/JavaScriptCore/runtime/JSObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeProxyObjectcpp">trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressproxygetownpropertyjs">trunk/Source/JavaScriptCore/tests/stress/proxy-get-own-property.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (196774 => 196775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-18 21:30:23 UTC (rev 196774)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-18 21:55:40 UTC (rev 196775)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2016-02-18 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><ins>+ Follow up fix to Implement Proxy.[[GetOwnProperty]]
+ https://bugs.webkit.org/show_bug.cgi?id=154314
+
+ Reviewed by Filip Pizlo.
+
+ Part of the implementation was broken because
+ of how JSObject::getOwnPropertyDescriptor worked.
+ I've fixed JSObject::getOwnPropertyDescriptor to
+ be able to handle ProxyObject.
+
+ * runtime/JSObject.cpp:
+ (JSC::JSObject::getOwnPropertyDescriptor):
+ * runtime/ProxyObject.cpp:
+ (JSC::ProxyObject::performInternalMethodGetOwnProperty):
+ * tests/stress/proxy-get-own-property.js:
+ (assert):
+ (assert.let.handler.get getOwnPropertyDescriptor):
+
+2016-02-18 Saam Barati <sbarati@apple.com>
+
</ins><span class="cx"> Implement Proxy.[[GetOwnProperty]]
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154314
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.cpp (196774 => 196775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2016-02-18 21:30:23 UTC (rev 196774)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2016-02-18 21:55:40 UTC (rev 196775)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "PropertyDescriptor.h"
</span><span class="cx"> #include "PropertyNameArray.h"
</span><ins>+#include "ProxyObject.h"
</ins><span class="cx"> #include "Reject.h"
</span><span class="cx"> #include "SlotVisitorInlines.h"
</span><span class="cx"> #include <math.h>
</span><span class="lines">@@ -2560,9 +2561,13 @@
</span><span class="cx"> // but getOwnPropertyDescriptor() should only work for 'own' properties so we exit early if we detect that
</span><span class="cx"> // the property is not an own property.
</span><span class="cx"> if (slot.slotBase() != this && slot.slotBase()) {
</span><del>- auto* proxy = jsDynamicCast<JSProxy*>(this);
- if (!proxy || proxy->target() != slot.slotBase())
- return false;
</del><ins>+ JSProxy* jsProxy = jsDynamicCast<JSProxy*>(this);
+ if (!jsProxy || jsProxy->target() != slot.slotBase()) {
+ // Try ProxyObject.
+ ProxyObject* proxyObject = jsDynamicCast<ProxyObject*>(this);
+ if (!proxyObject || proxyObject->target() != slot.slotBase())
+ return false;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (slot.isAccessor())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeProxyObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp (196774 => 196775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2016-02-18 21:30:23 UTC (rev 196774)
+++ trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2016-02-18 21:55:40 UTC (rev 196775)
</span><span class="lines">@@ -143,6 +143,8 @@
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType;
</span><span class="cx"> JSValue getOwnPropertyDescriptorMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "getOwnPropertyDescriptor"), ASCIILiteral("'getOwnPropertyDescriptor' property of a Proxy's handler should be callable."));
</span><ins>+ if (exec->hadException())
+ return false;
</ins><span class="cx"> JSObject* target = this->target();
</span><span class="cx"> if (getOwnPropertyDescriptorMethod.isUndefined())
</span><span class="cx"> return target->methodTable(vm)->getOwnPropertySlot(target, exec, propertyName, slot);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressproxygetownpropertyjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/proxy-get-own-property.js (196774 => 196775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/proxy-get-own-property.js 2016-02-18 21:30:23 UTC (rev 196774)
+++ trunk/Source/JavaScriptCore/tests/stress/proxy-get-own-property.js 2016-02-18 21:55:40 UTC (rev 196775)
</span><span class="lines">@@ -186,3 +186,27 @@
</span><span class="cx"> assert(pDesc.enumerable === true);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+{
+ let target = {};
+ let error = null;
+ let handler = { get getOwnPropertyDescriptor() {
+ error = new Error("blah");
+ throw error;
+ }};
+ Object.defineProperty(target, "x", {
+ enumerable: true,
+ configurable: false
+ });
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let threw = false;
+ try {
+ let pDesc = Object.getOwnPropertyDescriptor(proxy, "x");
+ } catch(e) {
+ threw = true;
+ assert(e === error);
+ }
+ assert(threw);
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>