<!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>[202734] 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/202734">202734</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-01 08:25:35 -0700 (Fri, 01 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ES6: Implement HasRestrictedGlobalProperty when checking for global lexical tier conflicts
https://bugs.webkit.org/show_bug.cgi?id=148763
Patch by Caio Lima <ticaiolima@gmail.com> on 2016-07-01
Reviewed by Saam Barati
I've implemented the ES6 spec 8.1.1.4.14
(http://www.ecma-international.org/ecma-262/6.0/index.html#sec-hasrestrictedglobalproperty)
that defines when a global property can be shadowed.
Added some test cases into global-lexical-redeclare-variable.js
* runtime/Executable.cpp:
(JSC::ProgramExecutable::initializeGlobalProperties):
* tests/stress/global-lexical-redeclare-variable.js:
(catch):
* tests/stress/multiple-files-tests/global-lexical-redeclare-variable/eighth.js: Added.
* tests/stress/multiple-files-tests/global-lexical-redeclare-variable/nineth.js: Added.
* tests/stress/multiple-files-tests/global-lexical-redeclare-variable/seventh.js: Added.
* tests/stress/multiple-files-tests/global-lexical-redeclare-variable/sixth.js:
* tests/stress/multiple-files-tests/global-lexical-redeclare-variable/tenth.js: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExecutablecpp">trunk/Source/JavaScriptCore/runtime/Executable.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressgloballexicalredeclarevariablejs">trunk/Source/JavaScriptCore/tests/stress/global-lexical-redeclare-variable.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressmultiplefilestestsgloballexicalredeclarevariablesixthjs">trunk/Source/JavaScriptCore/tests/stress/multiple-files-tests/global-lexical-redeclare-variable/sixth.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressmultiplefilestestsgloballexicalredeclarevariableeighthjs">trunk/Source/JavaScriptCore/tests/stress/multiple-files-tests/global-lexical-redeclare-variable/eighth.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressmultiplefilestestsgloballexicalredeclarevariableninthjs">trunk/Source/JavaScriptCore/tests/stress/multiple-files-tests/global-lexical-redeclare-variable/ninth.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressmultiplefilestestsgloballexicalredeclarevariableseventhjs">trunk/Source/JavaScriptCore/tests/stress/multiple-files-tests/global-lexical-redeclare-variable/seventh.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressmultiplefilestestsgloballexicalredeclarevariabletenthjs">trunk/Source/JavaScriptCore/tests/stress/multiple-files-tests/global-lexical-redeclare-variable/tenth.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202733 => 202734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-07-01 12:46:58 UTC (rev 202733)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-07-01 15:25:35 UTC (rev 202734)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-07-01 Caio Lima <ticaiolima@gmail.com>
+
+ ES6: Implement HasRestrictedGlobalProperty when checking for global lexical tier conflicts
+ https://bugs.webkit.org/show_bug.cgi?id=148763
+
+ Reviewed by Saam Barati
+
+ I've implemented the ES6 spec 8.1.1.4.14
+ (http://www.ecma-international.org/ecma-262/6.0/index.html#sec-hasrestrictedglobalproperty)
+ that defines when a global property can be shadowed.
+
+ Added some test cases into global-lexical-redeclare-variable.js
+
+ * runtime/Executable.cpp:
+ (JSC::ProgramExecutable::initializeGlobalProperties):
+ * tests/stress/global-lexical-redeclare-variable.js:
+ (catch):
+ * tests/stress/multiple-files-tests/global-lexical-redeclare-variable/eighth.js: Added.
+ * tests/stress/multiple-files-tests/global-lexical-redeclare-variable/nineth.js: Added.
+ * tests/stress/multiple-files-tests/global-lexical-redeclare-variable/seventh.js: Added.
+ * tests/stress/multiple-files-tests/global-lexical-redeclare-variable/sixth.js:
+ * tests/stress/multiple-files-tests/global-lexical-redeclare-variable/tenth.js: Added.
+
</ins><span class="cx"> 2016-07-01 Youenn Fablet <youennf@gmail.com>
</span><span class="cx">
</span><span class="cx"> Add a runtime flag for DOM iterators
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExecutablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Executable.cpp (202733 => 202734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Executable.cpp 2016-07-01 12:46:58 UTC (rev 202733)
+++ trunk/Source/JavaScriptCore/runtime/Executable.cpp 2016-07-01 15:25:35 UTC (rev 202734)
</span><span class="lines">@@ -605,9 +605,16 @@
</span><span class="cx"> // Check if any new "let"/"const"/"class" will shadow any pre-existing global property names, or "var"/"let"/"const" variables.
</span><span class="cx"> // It's an error to introduce a shadow.
</span><span class="cx"> for (auto& entry : lexicalDeclarations) {
</span><del>- if (globalObject->hasProperty(exec, entry.key.get()))
- return createSyntaxError(exec, makeString("Can't create duplicate variable that shadows a global property: '", String(entry.key.get()), "'"));
-
</del><ins>+ if (globalObject->hasProperty(exec, entry.key.get())) {
+ // The ES6 spec says that just RestrictedGlobalProperty can't be shadowed
+ // This carried out section 8.1.1.4.14 of the ES6 spec: http://www.ecma-international.org/ecma-262/6.0/index.html#sec-hasrestrictedglobalproperty
+ PropertyDescriptor descriptor;
+ globalObject->getOwnPropertyDescriptor(exec, entry.key.get(), descriptor);
+
+ if (descriptor.value() != jsUndefined() && !descriptor.configurable())
+ return createSyntaxError(exec, makeString("Can't create duplicate variable that shadows a global property: '", String(entry.key.get()), "'"));
+ }
+
</ins><span class="cx"> if (globalLexicalEnvironment->hasProperty(exec, entry.key.get())) {
</span><span class="cx"> if (UNLIKELY(entry.value.isConst() && !vm.globalConstRedeclarationShouldThrow() && !isStrictMode())) {
</span><span class="cx"> // We only allow "const" duplicate declarations under this setting.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressgloballexicalredeclarevariablejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/global-lexical-redeclare-variable.js (202733 => 202734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/global-lexical-redeclare-variable.js 2016-07-01 12:46:58 UTC (rev 202733)
+++ trunk/Source/JavaScriptCore/tests/stress/global-lexical-redeclare-variable.js 2016-07-01 15:25:35 UTC (rev 202734)
</span><span class="lines">@@ -64,11 +64,52 @@
</span><span class="cx"> }
</span><span class="cx"> assertExpectations();
</span><span class="cx">
</span><ins>+// Checking if the implementation is following
+// ES6 spec 8.1.1.4.14 http://www.ecma-international.org/ecma-262/6.0/index.html#sec-hasrestrictedglobalproperty
+
</ins><span class="cx"> try {
</span><ins>+ sentinel = "bad";
+ assert(Object.getOwnPropertyDescriptor(this, "globalProperty").configurable);
</ins><span class="cx"> load("./multiple-files-tests/global-lexical-redeclare-variable/sixth.js");
</span><span class="cx"> } catch(e) {
</span><ins>+ assert(false);
+}
+assertExpectations();
+
+try {
+ sentinel = "bad";
+ assert(Object.getOwnPropertyDescriptor(this, "Array").configurable);
+ load("./multiple-files-tests/global-lexical-redeclare-variable/seventh.js");
+} catch(e) {
+ assert(false);
+}
+assertExpectations();
+
+try {
+ sentinel = "bad";
+ Object.defineProperty(this, 'foo', {value: 5, configurable: true, writable: true});
+ load("./multiple-files-tests/global-lexical-redeclare-variable/eighth.js");
+} catch(e) {
+ assert(false);
+}
+assertExpectations();
+
+try {
+ Object.defineProperty(this, 'bar', {value: 5, configurable: false, writable: true});
+ load("./multiple-files-tests/global-lexical-redeclare-variable/ninth.js");
+} catch(e) {
</ins><span class="cx"> assertProperError(e);
</span><span class="cx"> }
</span><span class="cx"> assertExpectations();
</span><span class="cx">
</span><span class="cx"> assert(errorCount === 6);
</span><ins>+
+try {
+ sentinel = "bad";
+ Object.defineProperty(this, 'zoo', {value: undefined, configurable: false, writable: true});
+ load("./multiple-files-tests/global-lexical-redeclare-variable/tenth.js");
+} catch(e) {
+ assert(false);
+}
+assertExpectations();
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressmultiplefilestestsgloballexicalredeclarevariableeighthjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/multiple-files-tests/global-lexical-redeclare-variable/eighth.js (0 => 202734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/multiple-files-tests/global-lexical-redeclare-variable/eighth.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/multiple-files-tests/global-lexical-redeclare-variable/eighth.js 2016-07-01 15:25:35 UTC (rev 202734)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+let foo = 10;
+sentinel = "__s__";
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressmultiplefilestestsgloballexicalredeclarevariableninthjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/multiple-files-tests/global-lexical-redeclare-variable/ninth.js (0 => 202734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/multiple-files-tests/global-lexical-redeclare-variable/ninth.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/multiple-files-tests/global-lexical-redeclare-variable/ninth.js 2016-07-01 15:25:35 UTC (rev 202734)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+let bar = 10;
+sentinel = "__s__";
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressmultiplefilestestsgloballexicalredeclarevariableseventhjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/multiple-files-tests/global-lexical-redeclare-variable/seventh.js (0 => 202734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/multiple-files-tests/global-lexical-redeclare-variable/seventh.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/multiple-files-tests/global-lexical-redeclare-variable/seventh.js 2016-07-01 15:25:35 UTC (rev 202734)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+let Array = 2;
+sentinel = "__s__";
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressmultiplefilestestsgloballexicalredeclarevariablesixthjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/multiple-files-tests/global-lexical-redeclare-variable/sixth.js (202733 => 202734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/multiple-files-tests/global-lexical-redeclare-variable/sixth.js 2016-07-01 12:46:58 UTC (rev 202733)
+++ trunk/Source/JavaScriptCore/tests/stress/multiple-files-tests/global-lexical-redeclare-variable/sixth.js 2016-07-01 15:25:35 UTC (rev 202734)
</span><span class="lines">@@ -1,2 +1,2 @@
</span><del>-let globalProperty = "bad";
-sentinel = "bad";
</del><ins>+let globalProperty = "good";
+sentinel = "__s__";
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressmultiplefilestestsgloballexicalredeclarevariabletenthjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/multiple-files-tests/global-lexical-redeclare-variable/tenth.js (0 => 202734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/multiple-files-tests/global-lexical-redeclare-variable/tenth.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/multiple-files-tests/global-lexical-redeclare-variable/tenth.js 2016-07-01 15:25:35 UTC (rev 202734)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+let zoo = 2;
+sentinel = "__s__";
</ins></span></pre>
</div>
</div>
</body>
</html>