<!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>[201628] 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/201628">201628</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-06-02 16:52:03 -0700 (Thu, 02 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>global lexical environment variables are not accessible through functions created using the function constructor
https://bugs.webkit.org/show_bug.cgi?id=158319
Reviewed by Filip Pizlo.
When creating a function using the Function constructor, we were
using the global object instead of the global lexical environment
as the function's scope. We should be using the global lexical environment.
* runtime/FunctionConstructor.cpp:
(JSC::constructFunctionSkippingEvalEnabledCheck):
* tests/stress/function-constructor-reading-from-global-lexical-environment.js: Added.
(assert):
(test):
(ClassTDZ):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeFunctionConstructorcpp">trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressfunctionconstructorreadingfromgloballexicalenvironmentjs">trunk/Source/JavaScriptCore/tests/stress/function-constructor-reading-from-global-lexical-environment.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (201627 => 201628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-06-02 23:45:31 UTC (rev 201627)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-06-02 23:52:03 UTC (rev 201628)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-06-02 Saam Barati <sbarati@apple.com>
+
+ global lexical environment variables are not accessible through functions created using the function constructor
+ https://bugs.webkit.org/show_bug.cgi?id=158319
+
+ Reviewed by Filip Pizlo.
+
+ When creating a function using the Function constructor, we were
+ using the global object instead of the global lexical environment
+ as the function's scope. We should be using the global lexical environment.
+
+ * runtime/FunctionConstructor.cpp:
+ (JSC::constructFunctionSkippingEvalEnabledCheck):
+ * tests/stress/function-constructor-reading-from-global-lexical-environment.js: Added.
+ (assert):
+ (test):
+ (ClassTDZ):
+
</ins><span class="cx"> 2016-06-02 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> JS parser incorrectly handles invalid utf8 in error messages.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeFunctionConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp (201627 => 201628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp 2016-06-02 23:45:31 UTC (rev 201627)
+++ trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp 2016-06-02 23:52:03 UTC (rev 201628)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return JSFunction::create(exec->vm(), function, globalObject, subclassStructure);
</del><ins>+ return JSFunction::create(exec->vm(), function, globalObject->globalScope(), subclassStructure);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ECMA 15.3.2 The Function Constructor
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressfunctionconstructorreadingfromgloballexicalenvironmentjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/function-constructor-reading-from-global-lexical-environment.js (0 => 201628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/function-constructor-reading-from-global-lexical-environment.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/function-constructor-reading-from-global-lexical-environment.js 2016-06-02 23:52:03 UTC (rev 201628)
</span><span class="lines">@@ -0,0 +1,133 @@
</span><ins>+function assert(b, m) {
+ if (!b)
+ throw new Error(m);
+}
+
+function test(f, iters = 1000) {
+ noInline(f);
+ for (let i = 0; i < iters; i++)
+ f(i);
+}
+
+const globalConst = {};
+class GlobalClass { }
+let globalLet = {};
+let f = new Function("", "return globalConst;");
+test(function() {
+ assert(f() === globalConst);
+});
+
+f = new Function("", "return GlobalClass;");
+test(function() {
+ let ctor = f();
+ assert(ctor === GlobalClass);
+ assert((new GlobalClass) instanceof GlobalClass);
+});
+
+
+f = new Function("", "return globalLet;");
+test(function() {
+ assert(f() === globalLet);
+});
+
+f = new Function("prop", "x", "globalLet[prop] = x;");
+test(function(i) {
+ f(i, i);
+ assert(globalLet[i] === i);
+});
+
+f = new Function("prop", "x", "globalConst[prop] = x;");
+test(function(i) {
+ f(i, i);
+ assert(globalConst[i] === i);
+});
+
+f = new Function("", "globalConst = 25");
+test(function() {
+ let threw = false;
+ try {
+ f();
+ } catch(e) {
+ threw = true;
+ assert(e.toString() === "TypeError: Attempted to assign to readonly property.")
+ }
+ assert(threw);
+});
+
+f = new Function("", "globalConst = 25");
+test(function() {
+ let threw = false;
+ try {
+ f();
+ } catch(e) {
+ threw = true;
+ assert(e.toString() === "TypeError: Attempted to assign to readonly property.")
+ }
+ assert(threw);
+});
+
+f = new Function("", "constTDZ = 25");
+test(function() {
+ let threw = false;
+ try {
+ f();
+ } catch(e) {
+ threw = true;
+ assert(e.toString() === "ReferenceError: Cannot access uninitialized variable.")
+ }
+ assert(threw);
+});
+
+f = new Function("", "constTDZ;");
+test(function() {
+ let threw = false;
+ try {
+ f();
+ } catch(e) {
+ threw = true;
+ assert(e.toString() === "ReferenceError: Cannot access uninitialized variable.")
+ }
+ assert(threw);
+});
+
+f = new Function("", "letTDZ;");
+test(function() {
+ let threw = false;
+ try {
+ f();
+ } catch(e) {
+ threw = true;
+ assert(e.toString() === "ReferenceError: Cannot access uninitialized variable.")
+ }
+ assert(threw);
+});
+
+f = new Function("", "letTDZ = 20;");
+test(function() {
+ let threw = false;
+ try {
+ f();
+ } catch(e) {
+ threw = true;
+ assert(e.toString() === "ReferenceError: Cannot access uninitialized variable.")
+ }
+ assert(threw);
+});
+
+f = new Function("", "ClassTDZ");
+test(function() {
+ let threw = false;
+ try {
+ f();
+ } catch(e) {
+ threw = true;
+ assert(e.toString() === "ReferenceError: Cannot access uninitialized variable.")
+ }
+ assert(threw);
+});
+
+
+const constTDZ = 25;
+let letTDZ = 25;
+class ClassTDZ { }
+
</ins></span></pre>
</div>
</div>
</body>
</html>