<!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>[213033] releases/WebKitGTK/webkit-2.16</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/213033">213033</a></dd>

<dt>Author</dt> <dd>carlosgc@webkit.org</dd>

<dt>Date</dt> <dd>2017-02-26 23:56:42 -0800 (Sun, 26 Feb 2017)</dd>

</dl>

<h3>Log Message</h3>

<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/212710">r212710</a> - ASSERTION FAILED: &quot;!scope.exception()&quot; with Object.isSealed/isFrozen and uninitialized module bindings

https://bugs.webkit.org/show_bug.cgi?id=168605

Reviewed by Saam Barati.

JSTests:

* modules/module-namespace-is-frozen.js: Added.

(from.string_appeared_here.shouldThrow):

(export.b):

* modules/module-namespace-is-sealed.js: Added.

(from.string_appeared_here.shouldThrow):

(export.b):

Source/JavaScriptCore:

We should check exception state after calling getOwnPropertyDescriptor() since it can throw errors.

* runtime/ObjectConstructor.cpp:

(JSC::objectConstructorIsSealed):

(JSC::objectConstructorIsFrozen):</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#releasesWebKitGTKwebkit216JSTestsChangeLog">releases/WebKitGTK/webkit-2.16/JSTests/ChangeLog</a></li>

<li><a href="#releasesWebKitGTKwebkit216SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore/ChangeLog</a></li>

<li><a href="#releasesWebKitGTKwebkit216SourceJavaScriptCoreruntimeObjectConstructorcpp">releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore/runtime/ObjectConstructor.cpp</a></li>

</ul>

<h3>Added Paths</h3>

<ul>

<li><a href="#releasesWebKitGTKwebkit216JSTestsmodulesmodulenamespaceisfrozenjs">releases/WebKitGTK/webkit-2.16/JSTests/modules/module-namespace-is-frozen.js</a></li>

<li><a href="#releasesWebKitGTKwebkit216JSTestsmodulesmodulenamespaceissealedjs">releases/WebKitGTK/webkit-2.16/JSTests/modules/module-namespace-is-sealed.js</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="releasesWebKitGTKwebkit216JSTestsChangeLog"></a>

<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/JSTests/ChangeLog (213032 => 213033)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.16/JSTests/ChangeLog        2017-02-27 07:55:01 UTC (rev 213032)

+++ releases/WebKitGTK/webkit-2.16/JSTests/ChangeLog        2017-02-27 07:56:42 UTC (rev 213033)

</span><span class="lines">@@ -1,3 +1,17 @@

</span><ins>+2017-02-21  Yusuke Suzuki  &lt;utatane.tea@gmail.com&gt;

+

+        ASSERTION FAILED: &quot;!scope.exception()&quot; with Object.isSealed/isFrozen and uninitialized module bindings

+        https://bugs.webkit.org/show_bug.cgi?id=168605

+

+        Reviewed by Saam Barati.

+

+        * modules/module-namespace-is-frozen.js: Added.

+        (from.string_appeared_here.shouldThrow):

+        (export.b):

+        * modules/module-namespace-is-sealed.js: Added.

+        (from.string_appeared_here.shouldThrow):

+        (export.b):

+

</ins><span class="cx"> 2017-02-19  Commit Queue  &lt;commit-queue@webkit.org&gt;

</span><span class="cx"> 

<span class="cx">         Unreviewed, rolling out r212466.

</span></span></pre></div>

<a id="releasesWebKitGTKwebkit216JSTestsmodulesmodulenamespaceisfrozenjs"></a>

<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/JSTests/modules/module-namespace-is-frozen.js (0 => 213033)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.16/JSTests/modules/module-namespace-is-frozen.js                                (rev 0)

+++ releases/WebKitGTK/webkit-2.16/JSTests/modules/module-namespace-is-frozen.js        2017-02-27 07:56:42 UTC (rev 213033)

</span><span class="lines">@@ -0,0 +1,9 @@

</span><ins>+import * as ns from &quot;./module-namespace-is-frozen.js&quot;

+import {shouldThrow} from &quot;./resources/assert.js&quot;

+

+shouldThrow(() =&gt; {

+    Object.isFrozen(ns);

+}, `ReferenceError: Cannot access uninitialized variable.`);

+

+export let a;

+export function b () { }

</ins></span></pre></div>

<a id="releasesWebKitGTKwebkit216JSTestsmodulesmodulenamespaceissealedjs"></a>

<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/JSTests/modules/module-namespace-is-sealed.js (0 => 213033)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.16/JSTests/modules/module-namespace-is-sealed.js                                (rev 0)

+++ releases/WebKitGTK/webkit-2.16/JSTests/modules/module-namespace-is-sealed.js        2017-02-27 07:56:42 UTC (rev 213033)

</span><span class="lines">@@ -0,0 +1,9 @@

</span><ins>+import * as ns from &quot;./module-namespace-is-sealed.js&quot;

+import {shouldThrow} from &quot;./resources/assert.js&quot;

+

+shouldThrow(() =&gt; {

+    Object.isSealed(ns);

+}, `ReferenceError: Cannot access uninitialized variable.`);

+

+export let a;

+export function b () { }

</ins></span></pre></div>

<a id="releasesWebKitGTKwebkit216SourceJavaScriptCoreChangeLog"></a>

<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore/ChangeLog (213032 => 213033)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore/ChangeLog        2017-02-27 07:55:01 UTC (rev 213032)

+++ releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore/ChangeLog        2017-02-27 07:56:42 UTC (rev 213033)

</span><span class="lines">@@ -1,3 +1,16 @@

</span><ins>+2017-02-21  Yusuke Suzuki  &lt;utatane.tea@gmail.com&gt;

+

+        ASSERTION FAILED: &quot;!scope.exception()&quot; with Object.isSealed/isFrozen and uninitialized module bindings

+        https://bugs.webkit.org/show_bug.cgi?id=168605

+

+        Reviewed by Saam Barati.

+

+        We should check exception state after calling getOwnPropertyDescriptor() since it can throw errors.

+

+        * runtime/ObjectConstructor.cpp:

+        (JSC::objectConstructorIsSealed):

+        (JSC::objectConstructorIsFrozen):

+

</ins><span class="cx"> 2017-02-20  Mark Lam  &lt;mark.lam@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         [Re-landing] CachedCall should let GC know to keep its arguments alive.

</span></span></pre></div>

<a id="releasesWebKitGTKwebkit216SourceJavaScriptCoreruntimeObjectConstructorcpp"></a>

<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore/runtime/ObjectConstructor.cpp (213032 => 213033)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore/runtime/ObjectConstructor.cpp        2017-02-27 07:55:01 UTC (rev 213032)

+++ releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore/runtime/ObjectConstructor.cpp        2017-02-27 07:56:42 UTC (rev 213033)

</span><span class="lines">@@ -631,7 +631,7 @@

</span><span class="cx">     // 2. For each named own property name P of O,

</span><span class="cx">     PropertyNameArray properties(exec, PropertyNameMode::StringsAndSymbols);

</span><span class="cx">     object-&gt;methodTable(vm)-&gt;getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));

</span><del>-    RETURN_IF_EXCEPTION(scope, encodedJSValue());

</del><ins>+    RETURN_IF_EXCEPTION(scope, { });

</ins><span class="cx">     PropertyNameArray::const_iterator end = properties.end();

</span><span class="cx">     for (PropertyNameArray::const_iterator iter = properties.begin(); iter != end; ++iter) {

</span><span class="cx">         Identifier propertyName = *iter;

</span><span class="lines">@@ -639,7 +639,9 @@

</span><span class="cx">             continue;

<span class="cx">         // a. Let desc be the result of calling the [[GetOwnProperty]] internal method of O with P.

</span><span class="cx">         PropertyDescriptor desc;

</span><del>-        if (!object-&gt;getOwnPropertyDescriptor(exec, propertyName, desc))

</del><ins>+        bool didGetDescriptor = object-&gt;getOwnPropertyDescriptor(exec, propertyName, desc);

+        RETURN_IF_EXCEPTION(scope, { });

+        if (!didGetDescriptor)

</ins><span class="cx">             continue;

<span class="cx">         // b. If desc.[[Configurable]] is true, then return false.

</span><span class="cx">         if (desc.configurable())

</span><span class="lines">@@ -649,7 +651,7 @@

<span class="cx">     // 3. If the [[Extensible]] internal property of O is false, then return true.

<span class="cx">     // 4. Otherwise, return false.

</span><span class="cx">     bool isExtensible = object-&gt;isExtensible(exec);

</span><del>-    RETURN_IF_EXCEPTION(scope, encodedJSValue());

</del><ins>+    RETURN_IF_EXCEPTION(scope, { });

</ins><span class="cx">     return JSValue::encode(jsBoolean(!isExtensible));

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -670,7 +672,7 @@

</span><span class="cx">     // 2. For each named own property name P of O,

</span><span class="cx">     PropertyNameArray properties(exec, PropertyNameMode::StringsAndSymbols);

</span><span class="cx">     object-&gt;methodTable(vm)-&gt;getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));

</span><del>-    RETURN_IF_EXCEPTION(scope, encodedJSValue());

</del><ins>+    RETURN_IF_EXCEPTION(scope, { });

</ins><span class="cx">     PropertyNameArray::const_iterator end = properties.end();

</span><span class="cx">     for (PropertyNameArray::const_iterator iter = properties.begin(); iter != end; ++iter) {

</span><span class="cx">         Identifier propertyName = *iter;

</span><span class="lines">@@ -678,7 +680,9 @@

</span><span class="cx">             continue;

<span class="cx">         // a. Let desc be the result of calling the [[GetOwnProperty]] internal method of O with P.

</span><span class="cx">         PropertyDescriptor desc;

</span><del>-        if (!object-&gt;getOwnPropertyDescriptor(exec, propertyName, desc))

</del><ins>+        bool didGetDescriptor = object-&gt;getOwnPropertyDescriptor(exec, propertyName, desc);

+        RETURN_IF_EXCEPTION(scope, { });

+        if (!didGetDescriptor)

</ins><span class="cx">             continue;

</span><span class="cx">         // b. If IsDataDescriptor(desc) is true then

<span class="cx">         // i. If desc.[[Writable]] is true, return false. c. If desc.[[Configurable]] is true, then return false.

</span><span class="lines">@@ -689,7 +693,7 @@

<span class="cx">     // 3. If the [[Extensible]] internal property of O is false, then return true.

<span class="cx">     // 4. Otherwise, return false.

</span><span class="cx">     bool isExtensible = object-&gt;isExtensible(exec);

</span><del>-    RETURN_IF_EXCEPTION(scope, encodedJSValue());

</del><ins>+    RETURN_IF_EXCEPTION(scope, { });

</ins><span class="cx">     return JSValue::encode(jsBoolean(!isExtensible));

</span><span class="cx"> }

</span><span class="cx"> 

</span></span></pre>

</div>

</div>

</body>

</html>