<!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>[169740] 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/169740">169740</a></dd>
<dt>Author</dt> <dd>mhahnenberg@apple.com</dd>
<dt>Date</dt> <dd>2014-06-09 20:01:42 -0700 (Mon, 09 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Global HashTables contain references to atomic StringImpls
https://bugs.webkit.org/show_bug.cgi?id=133661
Reviewed by Geoffrey Garen.
This was a long-standing bug revealed by bug 133558. The issue is that the global static HashTables
cache their set of keys as StringImpls that are associated with a particular VM. This is obviously
incompatible with using multiple VMs on multiple threads (e.g. when using workers). The fix is to
change the "keys" field of the static HashTables to be char** instead of StringImpl**.
* runtime/JSObject.cpp:
(JSC::getClassPropertyNames):
* runtime/Lookup.cpp:
(JSC::HashTable::createTable):
(JSC::HashTable::deleteTable):
* runtime/Lookup.h:
(JSC::HashTable::ConstIterator::key):
(JSC::HashTable::entry):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjectcpp">trunk/Source/JavaScriptCore/runtime/JSObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeLookupcpp">trunk/Source/JavaScriptCore/runtime/Lookup.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeLookuph">trunk/Source/JavaScriptCore/runtime/Lookup.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (169739 => 169740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-06-10 02:31:28 UTC (rev 169739)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-06-10 03:01:42 UTC (rev 169740)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-06-09 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><ins>+ Global HashTables contain references to atomic StringImpls
+ https://bugs.webkit.org/show_bug.cgi?id=133661
+
+ Reviewed by Geoffrey Garen.
+
+ This was a long-standing bug revealed by bug 133558. The issue is that the global static HashTables
+ cache their set of keys as StringImpls that are associated with a particular VM. This is obviously
+ incompatible with using multiple VMs on multiple threads (e.g. when using workers). The fix is to
+ change the "keys" field of the static HashTables to be char** instead of StringImpl**.
+
+ * runtime/JSObject.cpp:
+ (JSC::getClassPropertyNames):
+ * runtime/Lookup.cpp:
+ (JSC::HashTable::createTable):
+ (JSC::HashTable::deleteTable):
+ * runtime/Lookup.h:
+ (JSC::HashTable::ConstIterator::key):
+ (JSC::HashTable::entry):
+
+2014-06-09 Mark Hahnenberg <mhahnenberg@apple.com>
+
</ins><span class="cx"> Build fix after r169703
</span><span class="cx">
</span><span class="cx"> * JavaScriptCore.xcodeproj/project.pbxproj:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.cpp (169739 => 169740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2014-06-10 02:31:28 UTC (rev 169739)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2014-06-10 03:01:42 UTC (rev 169740)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> for (auto iter = table->begin(vm); iter != table->end(vm); ++iter) {
</span><span class="cx"> if ((!(iter->attributes() & DontEnum) || (mode == IncludeDontEnumProperties)) && !((iter->attributes() & BuiltinOrFunction) && didReify))
</span><del>- propertyNames.add(iter.key());
</del><ins>+ propertyNames.add(Identifier(&vm, iter.key()));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeLookupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Lookup.cpp (169739 => 169740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Lookup.cpp 2014-06-10 02:31:28 UTC (rev 169739)
+++ trunk/Source/JavaScriptCore/runtime/Lookup.cpp 2014-06-10 03:01:42 UTC (rev 169740)
</span><span class="lines">@@ -26,14 +26,14 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-void HashTable::createTable(VM& vm) const
</del><ins>+void HashTable::createTable(VM&) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!keys);
</span><del>- keys = static_cast<StringImpl**>(fastMalloc(sizeof(StringImpl*) * numberOfValues));
</del><ins>+ keys = static_cast<const char**>(fastMalloc(sizeof(char*) * numberOfValues));
</ins><span class="cx">
</span><span class="cx"> for (int i = 0; i < numberOfValues; ++i) {
</span><span class="cx"> if (values[i].m_key)
</span><del>- keys[i] = &Identifier::add(&vm, values[i].m_key).leakRef();
</del><ins>+ keys[i] = values[i].m_key;
</ins><span class="cx"> else
</span><span class="cx"> keys[i] = 0;
</span><span class="cx"> }
</span><span class="lines">@@ -42,10 +42,6 @@
</span><span class="cx"> void HashTable::deleteTable() const
</span><span class="cx"> {
</span><span class="cx"> if (keys) {
</span><del>- for (int i = 0; i != numberOfValues; ++i) {
- if (keys[i])
- keys[i]->deref();
- }
</del><span class="cx"> fastFree(keys);
</span><span class="cx"> keys = nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeLookuph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Lookup.h (169739 => 169740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Lookup.h 2014-06-10 02:31:28 UTC (rev 169739)
+++ trunk/Source/JavaScriptCore/runtime/Lookup.h 2014-06-10 03:01:42 UTC (rev 169740)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> bool hasSetterOrReadonlyProperties;
</span><span class="cx">
</span><span class="cx"> const HashTableValue* values; // Fixed values generated by script.
</span><del>- mutable StringImpl** keys; // Table allocated at runtime.
</del><ins>+ mutable const char** keys; // Table allocated at runtime.
</ins><span class="cx"> const CompactHashIndex* index;
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE HashTable copy() const
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> return &m_table->values[m_position];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- StringImpl* key()
</del><ins>+ const char* key()
</ins><span class="cx"> {
</span><span class="cx"> return m_table->keys[m_position];
</span><span class="cx"> }
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> while (true) {
</span><del>- if (keys[valueIndex] == impl)
</del><ins>+ if (WTF::equal(impl, keys[valueIndex]))
</ins><span class="cx"> return &values[valueIndex];
</span><span class="cx">
</span><span class="cx"> indexEntry = index[indexEntry].next;
</span></span></pre>
</div>
</div>
</body>
</html>