<!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>[201340] 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/201340">201340</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-05-24 12:01:35 -0700 (Tue, 24 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Map should not be in JSGlobalObject's static hashtable because it's initialized eagerly via FOR_EACH_SIMPLE_BUILTIN_TYPE_WITH_CONSTRUCTOR
https://bugs.webkit.org/show_bug.cgi?id=158031
rdar://problem/26353661
Reviewed by Geoffrey Garen.
We were listing Map as being a lazy class structure. It's not. m_mapStructure is a WriteBarrier<>
not a LazyClassStructure<> and there is nothing lazy about it.
* runtime/JSGlobalObject.cpp: The fix is to remove Map here.
* runtime/Lookup.cpp: Add some dumping on the assert path.
(JSC::setUpStaticFunctionSlot):
* tests/stress/override-map-constructor.js: Added. This test used to crash.
(Map):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeLookupcpp">trunk/Source/JavaScriptCore/runtime/Lookup.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressoverridemapconstructorjs">trunk/Source/JavaScriptCore/tests/stress/override-map-constructor.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (201339 => 201340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-05-24 19:00:51 UTC (rev 201339)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-05-24 19:01:35 UTC (rev 201340)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2016-05-24 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ Map should not be in JSGlobalObject's static hashtable because it's initialized eagerly via FOR_EACH_SIMPLE_BUILTIN_TYPE_WITH_CONSTRUCTOR
+ https://bugs.webkit.org/show_bug.cgi?id=158031
+ rdar://problem/26353661
+
+ Reviewed by Geoffrey Garen.
+
+ We were listing Map as being a lazy class structure. It's not. m_mapStructure is a WriteBarrier<>
+ not a LazyClassStructure<> and there is nothing lazy about it.
+
+ * runtime/JSGlobalObject.cpp: The fix is to remove Map here.
+ * runtime/Lookup.cpp: Add some dumping on the assert path.
+ (JSC::setUpStaticFunctionSlot):
+ * tests/stress/override-map-constructor.js: Added. This test used to crash.
+ (Map):
+
+2016-05-24 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> LLInt64 should have typed array fast paths for get_by_val
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=157931
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (201339 => 201340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2016-05-24 19:00:51 UTC (rev 201339)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2016-05-24 19:01:35 UTC (rev 201340)
</span><span class="lines">@@ -239,7 +239,6 @@
</span><span class="cx"> Float64Array JSGlobalObject::m_typedArrayFloat64 DontEnum|ClassStructure
</span><span class="cx"> DataView JSGlobalObject::m_typedArrayDataView DontEnum|ClassStructure
</span><span class="cx"> Set JSGlobalObject::m_setStructure DontEnum|ClassStructure
</span><del>- Map JSGlobalObject::m_mapStructure DontEnum|ClassStructure
</del><span class="cx"> Date JSGlobalObject::m_dateStructure DontEnum|ClassStructure
</span><span class="cx"> Boolean JSGlobalObject::m_booleanObjectStructure DontEnum|ClassStructure
</span><span class="cx"> Number JSGlobalObject::m_numberObjectStructure DontEnum|ClassStructure
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeLookupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Lookup.cpp (201339 => 201340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Lookup.cpp 2016-05-24 19:00:51 UTC (rev 201339)
+++ trunk/Source/JavaScriptCore/runtime/Lookup.cpp 2016-05-24 19:01:35 UTC (rev 201340)
</span><span class="lines">@@ -77,11 +77,16 @@
</span><span class="cx"> } else if (entry->attributes() & PropertyCallback) {
</span><span class="cx"> JSValue result = entry->lazyPropertyCallback()(vm, thisObj);
</span><span class="cx"> thisObj->putDirect(vm, propertyName, result, attributesForStructure(entry->attributes()));
</span><del>- } else
</del><ins>+ } else {
+ dataLog("Static hashtable entry for ", propertyName, " has weird attributes: ", entry->attributes(), "\n");
</ins><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> offset = thisObj->getDirectOffset(vm, propertyName, attributes);
</span><del>- RELEASE_ASSERT(isValidOffset(offset));
</del><ins>+ if (!isValidOffset(offset)) {
+ dataLog("Static hashtable initialiation for ", propertyName, " did not produce a property.\n");
+ RELEASE_ASSERT_NOT_REACHED();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (isAccessor)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressoverridemapconstructorjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/override-map-constructor.js (0 => 201340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/override-map-constructor.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/override-map-constructor.js 2016-05-24 19:01:35 UTC (rev 201340)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+function Map() {
+}
</ins></span></pre>
</div>
</div>
</body>
</html>