<!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>[204663] 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/204663">204663</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-19 15:49:26 -0700 (Fri, 19 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make custom Error properties (line, column, sourceURL) configurable and writable
https://bugs.webkit.org/show_bug.cgi?id=160984
<rdar://problem/27905979>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-08-19
Reviewed by Saam Barati.
JSTests:
* stress/native-error-properties.js: Added.
(assert):
(shouldNotThrow):
(checkEmptyErrorPropertiesDescriptors):
(checkNonEmptyErrorPropertiesDescriptors):
The spec only describes the "message" property, so
ensure it has the right descriptor attributes.
(checkErrorPropertiesWritable):
Ensure common error property names are writable.
In strict mode this would have thrown an exception
if they were readonly.
Source/JavaScriptCore:
* runtime/Error.cpp:
(JSC::addErrorInfoAndGetBytecodeOffset):
(JSC::addErrorInfo):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeErrorcpp">trunk/Source/JavaScriptCore/runtime/Error.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressnativeerrorpropertiesjs">trunk/JSTests/stress/native-error-properties.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (204662 => 204663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-08-19 22:44:08 UTC (rev 204662)
+++ trunk/JSTests/ChangeLog 2016-08-19 22:49:26 UTC (rev 204663)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-08-19 Joseph Pecoraro <pecoraro@apple.com>
+
+ Make custom Error properties (line, column, sourceURL) configurable and writable
+ https://bugs.webkit.org/show_bug.cgi?id=160984
+ <rdar://problem/27905979>
+
+ Reviewed by Saam Barati.
+
+ * stress/native-error-properties.js: Added.
+ (assert):
+ (shouldNotThrow):
+
+ (checkEmptyErrorPropertiesDescriptors):
+ (checkNonEmptyErrorPropertiesDescriptors):
+ The spec only describes the "message" property, so
+ ensure it has the right descriptor attributes.
+
+ (checkErrorPropertiesWritable):
+ Ensure common error property names are writable.
+ In strict mode this would have thrown an exception
+ if they were readonly.
+
</ins><span class="cx"> 2016-08-18 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> ScopedArguments is using the wrong owner object for a write barrier.
</span></span></pre></div>
<a id="trunkJSTestsstressnativeerrorpropertiesjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/native-error-properties.js (0 => 204663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/native-error-properties.js (rev 0)
+++ trunk/JSTests/stress/native-error-properties.js 2016-08-19 22:49:26 UTC (rev 204663)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+"use strict";
+
+function assert(b) {
+ if (!b)
+ throw new Error("Bad assertion");
+}
+
+function shouldNotThrow(expr) {
+ let testFunc = new Function(expr);
+ let error;
+ try {
+ testFunc();
+ } catch (e) {
+ error = e;
+ }
+ assert(!error);
+}
+
+function checkEmptyErrorPropertiesDescriptors(error) {
+ let descriptor = Object.getOwnPropertyDescriptor(error, "message");
+ assert(descriptor === undefined);
+}
+
+function checkNonEmptyErrorPropertiesDescriptors(error) {
+ let descriptor = Object.getOwnPropertyDescriptor(error, "message");
+ assert(descriptor.configurable);
+ assert(!descriptor.enumerable);
+ assert(descriptor.writable);
+}
+
+function checkErrorPropertiesWritable(error) {
+ let properties = ["name", "message", "line", "lineNumber", "column", "columnNumber", "sourceURL", "stack"];
+ for (let p of properties) {
+ assert(error[p] !== 999);
+ error[p] = 999;
+ assert(error[p] === 999);
+ }
+}
+
+// User created error instances.
+let errorConstructors = [Error, EvalError, RangeError, ReferenceError, SyntaxError, TypeError, URIError];
+for (let constructor of errorConstructors) {
+ shouldNotThrow(`checkErrorPropertiesWritable(new ${constructor.name})`);
+ shouldNotThrow(`checkEmptyErrorPropertiesDescriptors(new ${constructor.name})`);
+ shouldNotThrow(`checkNonEmptyErrorPropertiesDescriptors(new ${constructor.name}('message'))`);
+}
+
+// Engine created error instances.
+var globalError = null;
+
+try {
+ eval("{");
+} catch (e) {
+ globalError = e;
+ assert(e.name === "SyntaxError");
+ assert(e.message.length);
+ shouldNotThrow("checkNonEmptyErrorPropertiesDescriptors(globalError)");
+ shouldNotThrow("checkErrorPropertiesWritable(globalError)");
+}
+
+try {
+ a.b.c;
+} catch (e) {
+ globalError = e;
+ assert(e.name === "ReferenceError");
+ assert(e.message.length);
+ shouldNotThrow("checkNonEmptyErrorPropertiesDescriptors(globalError)");
+ shouldNotThrow("checkErrorPropertiesWritable(globalError)");
+}
+
+try {
+ undefined.x;
+} catch (e) {
+ globalError = e;
+ assert(e.name === "TypeError");
+ assert(e.message.length);
+ shouldNotThrow("checkNonEmptyErrorPropertiesDescriptors(globalError)");
+ shouldNotThrow("checkErrorPropertiesWritable(globalError)");
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (204662 => 204663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-08-19 22:44:08 UTC (rev 204662)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-08-19 22:49:26 UTC (rev 204663)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-08-19 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Make custom Error properties (line, column, sourceURL) configurable and writable
+ https://bugs.webkit.org/show_bug.cgi?id=160984
+ <rdar://problem/27905979>
+
+ Reviewed by Saam Barati.
+
+ * runtime/Error.cpp:
+ (JSC::addErrorInfoAndGetBytecodeOffset):
+ (JSC::addErrorInfo):
+
+2016-08-19 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Remove empty files and empty namespace blocks
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160990
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeErrorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Error.cpp (204662 => 204663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Error.cpp 2016-08-19 22:44:08 UTC (rev 204662)
+++ trunk/Source/JavaScriptCore/runtime/Error.cpp 2016-08-19 22:49:26 UTC (rev 204663)
</span><span class="lines">@@ -159,12 +159,12 @@
</span><span class="cx"> unsigned line;
</span><span class="cx"> unsigned column;
</span><span class="cx"> firstNonNativeFrame->computeLineAndColumn(line, column);
</span><del>- obj->putDirect(vm, vm.propertyNames->line, jsNumber(line), ReadOnly | DontDelete);
- obj->putDirect(vm, vm.propertyNames->column, jsNumber(column), ReadOnly | DontDelete);
</del><ins>+ obj->putDirect(vm, vm.propertyNames->line, jsNumber(line));
+ obj->putDirect(vm, vm.propertyNames->column, jsNumber(column));
</ins><span class="cx">
</span><span class="cx"> String frameSourceURL = firstNonNativeFrame->sourceURL();
</span><span class="cx"> if (!frameSourceURL.isEmpty())
</span><del>- obj->putDirect(vm, vm.propertyNames->sourceURL, jsString(&vm, frameSourceURL), ReadOnly | DontDelete);
</del><ins>+ obj->putDirect(vm, vm.propertyNames->sourceURL, jsString(&vm, frameSourceURL));
</ins><span class="cx">
</span><span class="cx"> obj->putDirect(vm, vm.propertyNames->stack, Interpreter::stackTraceAsString(vm, stackTrace), DontEnum);
</span><span class="cx">
</span><span class="lines">@@ -185,9 +185,9 @@
</span><span class="cx"> const String& sourceURL = source.provider()->url();
</span><span class="cx">
</span><span class="cx"> if (line != -1)
</span><del>- error->putDirect(*vm, Identifier::fromString(vm, linePropertyName), jsNumber(line), ReadOnly | DontDelete);
</del><ins>+ error->putDirect(*vm, Identifier::fromString(vm, linePropertyName), jsNumber(line));
</ins><span class="cx"> if (!sourceURL.isNull())
</span><del>- error->putDirect(*vm, Identifier::fromString(vm, sourceURLPropertyName), jsString(vm, sourceURL), ReadOnly | DontDelete);
</del><ins>+ error->putDirect(*vm, Identifier::fromString(vm, sourceURLPropertyName), jsString(vm, sourceURL));
</ins><span class="cx"> return error;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>