<!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>[202796] 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/202796">202796</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-03 20:25:04 -0700 (Sun, 03 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] __lookupGetter__ and __lookupSetter__ should not ignore exceptions
https://bugs.webkit.org/show_bug.cgi?id=159390
Patch by Benjamin Poulain <bpoulain@apple.com> on 2016-07-03
Reviewed by Mark Lam.
Source/JavaScriptCore:
See:
-https://tc39.github.io/ecma262/#sec-object.prototype.__lookupGetter__
-https://tc39.github.io/ecma262/#sec-object.prototype.__lookupSetter__
They are both supposed to be regular [[GetOwnProperty]].
* runtime/ObjectPrototype.cpp:
(JSC::objectProtoFuncLookupGetter):
(JSC::objectProtoFuncLookupSetter):
LayoutTests:
* js/property-getters-and-setters-expected.txt:
* js/script-tests/property-getters-and-setters.js:
(getter17):
(get getter17):
(getOwnPropertyDescriptor):
(setter18):
(set setter18):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjspropertygettersandsettersexpectedtxt">trunk/LayoutTests/js/property-getters-and-setters-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestspropertygettersandsettersjs">trunk/LayoutTests/js/script-tests/property-getters-and-setters.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeObjectPrototypecpp">trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202795 => 202796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-03 21:36:48 UTC (rev 202795)
+++ trunk/LayoutTests/ChangeLog 2016-07-04 03:25:04 UTC (rev 202796)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-07-03 Benjamin Poulain <bpoulain@apple.com>
+
+ [JSC] __lookupGetter__ and __lookupSetter__ should not ignore exceptions
+ https://bugs.webkit.org/show_bug.cgi?id=159390
+
+ Reviewed by Mark Lam.
+
+ * js/property-getters-and-setters-expected.txt:
+ * js/script-tests/property-getters-and-setters.js:
+ (getter17):
+ (get getter17):
+ (getOwnPropertyDescriptor):
+ (setter18):
+ (set setter18):
+
</ins><span class="cx"> 2016-07-03 Frederic Wang <fred.wang@free.fr>
</span><span class="cx">
</span><span class="cx"> Update windows test expectations for some MathML tests.
</span></span></pre></div>
<a id="trunkLayoutTestsjspropertygettersandsettersexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/property-getters-and-setters-expected.txt (202795 => 202796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/property-getters-and-setters-expected.txt 2016-07-03 21:36:48 UTC (rev 202795)
+++ trunk/LayoutTests/js/property-getters-and-setters-expected.txt 2016-07-04 03:25:04 UTC (rev 202796)
</span><span class="lines">@@ -58,6 +58,31 @@
</span><span class="cx"> PASS o16.__defineSetter__('a', function(){}) did not throw exception.
</span><span class="cx"> PASS o16.__defineSetter__('b', function(){}) threw exception TypeError: Attempting to change configurable attribute of unconfigurable property..
</span><span class="cx"> PASS o16.__defineSetter__('b', function(){}) threw exception TypeError: Attempting to change configurable attribute of unconfigurable property..
</span><ins>+__lookupGetter__ can be interrupted by a proxy throwing an exception
+PASS o17.property is "WebKit!"
+PASS o17.__lookupGetter__('property') is getter17
+PASS o17.__lookupSetter__('property') is undefined
+PASS o17Proxy.__lookupGetter__('property') threw exception o17 Proxy raised exception.
+PASS o17Proxy.__lookupSetter__('property') threw exception o17 Proxy raised exception.
+PASS o17Proxy.property is "WebKit!"
+PASS o17.property is "WebKit!"
+PASS o17.__lookupGetter__('property') is getter17
+__lookupSetter__ can be interrupted by a proxy throwing an exception
+PASS o18.property = 5 is 5
+PASS o18.property is undefined
+PASS o18.value is 5
+PASS o18.__lookupGetter__('property') is undefined
+PASS o18.__lookupSetter__('property') is setter18
+PASS o18Proxy.__lookupGetter__('property') threw exception o18 Proxy raised exception.
+PASS o18Proxy.__lookupSetter__('property') threw exception o18 Proxy raised exception.
+PASS o18Proxy.property = 'JavaScriptCore!' threw exception o18 Proxy raised exception.
+PASS o18Proxy.property is undefined
+PASS o18Proxy.value is 5
+PASS o18.property = 'JavaScriptCore!' is "JavaScriptCore!"
+PASS o18.property is undefined
+PASS o18.value is "JavaScriptCore!"
+PASS o18.__lookupGetter__('property') is undefined
+PASS o18.__lookupSetter__('property') is setter18
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestspropertygettersandsettersjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/property-getters-and-setters.js (202795 => 202796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/property-getters-and-setters.js 2016-07-03 21:36:48 UTC (rev 202795)
+++ trunk/LayoutTests/js/script-tests/property-getters-and-setters.js 2016-07-04 03:25:04 UTC (rev 202796)
</span><span class="lines">@@ -123,3 +123,40 @@
</span><span class="cx"> shouldNotThrow("o16.__defineSetter__('a', function(){})");
</span><span class="cx"> shouldThrow("o16.__defineSetter__('b', function(){})");
</span><span class="cx"> shouldThrow("o16.__defineSetter__('b', function(){})");
</span><ins>+
+debug("__lookupGetter__ can be interrupted by a proxy throwing an exception");
+var getter17 = () => { return "WebKit!"}
+var o17 = Object.defineProperty(new Object, 'property', { get: getter17 });
+shouldBeEqualToString("o17.property", "WebKit!");
+shouldBe("o17.__lookupGetter__('property')", "getter17");
+shouldBe("o17.__lookupSetter__('property')", "undefined");
+
+var o17Exception = { toString: () => { return "o17 Proxy raised exception"; } };
+var o17Proxy = new Proxy(o17, { getOwnPropertyDescriptor: () => { throw o17Exception; } });
+shouldThrow("o17Proxy.__lookupGetter__('property')", o17Exception);
+shouldThrow("o17Proxy.__lookupSetter__('property')", o17Exception);
+shouldBeEqualToString("o17Proxy.property", "WebKit!");
+shouldBeEqualToString("o17.property", "WebKit!");
+shouldBe("o17.__lookupGetter__('property')", "getter17");
+
+debug("__lookupSetter__ can be interrupted by a proxy throwing an exception");
+var setter18 = function (newValue) { return this.value = newValue; }
+var o18 = Object.defineProperty(new Object, 'property', { set: setter18 });
+shouldBe("o18.property = 5", "5");
+shouldBe("o18.property", "undefined");
+shouldBe("o18.value", "5");
+shouldBe("o18.__lookupGetter__('property')", "undefined");
+shouldBe("o18.__lookupSetter__('property')", "setter18");
+
+var o18Exception = { toString: () => { return "o18 Proxy raised exception"; } };
+var o18Proxy = new Proxy(o18, { getOwnPropertyDescriptor: () => { throw o18Exception; } });
+shouldThrow("o18Proxy.__lookupGetter__('property')", o18Exception);
+shouldThrow("o18Proxy.__lookupSetter__('property')", o18Exception);
+shouldThrow("o18Proxy.property = 'JavaScriptCore!'", o18Exception);
+shouldBe("o18Proxy.property", "undefined");
+shouldBe("o18Proxy.value", "5");
+shouldBeEqualToString("o18.property = 'JavaScriptCore!'", "JavaScriptCore!");
+shouldBe("o18.property", "undefined");
+shouldBeEqualToString("o18.value", "JavaScriptCore!");
+shouldBe("o18.__lookupGetter__('property')", "undefined");
+shouldBe("o18.__lookupSetter__('property')", "setter18");
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202795 => 202796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-07-03 21:36:48 UTC (rev 202795)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-07-04 03:25:04 UTC (rev 202796)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-07-03 Benjamin Poulain <bpoulain@apple.com>
+
+ [JSC] __lookupGetter__ and __lookupSetter__ should not ignore exceptions
+ https://bugs.webkit.org/show_bug.cgi?id=159390
+
+ Reviewed by Mark Lam.
+
+ See:
+ -https://tc39.github.io/ecma262/#sec-object.prototype.__lookupGetter__
+ -https://tc39.github.io/ecma262/#sec-object.prototype.__lookupSetter__
+
+ They are both supposed to be regular [[GetOwnProperty]].
+
+ * runtime/ObjectPrototype.cpp:
+ (JSC::objectProtoFuncLookupGetter):
+ (JSC::objectProtoFuncLookupSetter):
+
</ins><span class="cx"> 2016-07-03 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> BytecodeGenerator::getVariablesUnderTDZ is too conservative
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeObjectPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp (202795 => 202796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp 2016-07-03 21:36:48 UTC (rev 202795)
+++ trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp 2016-07-04 03:25:04 UTC (rev 202796)
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><del>- PropertySlot slot(thisObject, PropertySlot::InternalMethodType::VMInquiry);
</del><ins>+ PropertySlot slot(thisObject, PropertySlot::InternalMethodType::GetOwnProperty);
</ins><span class="cx"> if (thisObject->getPropertySlot(exec, propertyName, slot)) {
</span><span class="cx"> if (slot.isAccessor()) {
</span><span class="cx"> GetterSetter* getterSetter = slot.getterSetter();
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><del>- PropertySlot slot(thisObject, PropertySlot::InternalMethodType::VMInquiry);
</del><ins>+ PropertySlot slot(thisObject, PropertySlot::InternalMethodType::GetOwnProperty);
</ins><span class="cx"> if (thisObject->getPropertySlot(exec, propertyName, slot)) {
</span><span class="cx"> if (slot.isAccessor()) {
</span><span class="cx"> GetterSetter* getterSetter = slot.getterSetter();
</span></span></pre>
</div>
</div>
</body>
</html>