<!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>[192766] trunk</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/192766">192766</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-24 13:37:37 -0800 (Tue, 24 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/192536">r192536</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/192722">r192722</a>, and <a href="http://trac.webkit.org/projects/webkit/changeset/192743">r192743</a>.
https://bugs.webkit.org/show_bug.cgi?id=151593
Still causing trouble. (Requested by kling on #webkit).
Reverted changesets:
"[JSC] JSPropertyNameEnumerator could be destructorless."
https://bugs.webkit.org/show_bug.cgi?id=151242
http://trac.webkit.org/changeset/192536
"REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/192536">r192536</a>): Null pointer dereference in
JSPropertyNameEnumerator::visitChildren()."
https://bugs.webkit.org/show_bug.cgi?id=151495
http://trac.webkit.org/changeset/192722
"REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/192536">r192536</a>): Null pointer dereference in
JSPropertyNameEnumerator::visitChildren()."
https://bugs.webkit.org/show_bug.cgi?id=151495
http://trac.webkit.org/changeset/192743</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCopyTokenh">trunk/Source/JavaScriptCore/heap/CopyToken.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSPropertyNameEnumeratorcpp">trunk/Source/JavaScriptCore/runtime/JSPropertyNameEnumerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSPropertyNameEnumeratorh">trunk/Source/JavaScriptCore/runtime/JSPropertyNameEnumerator.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjspropertynameenumeratorgc151495expectedtxt">trunk/LayoutTests/js/property-name-enumerator-gc-151495-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjspropertynameenumeratorgc151495html">trunk/LayoutTests/js/property-name-enumerator-gc-151495.html</a></li>
<li><a href="#trunkLayoutTestsjsscripttestspropertynameenumeratorgc151495js">trunk/LayoutTests/js/script-tests/property-name-enumerator-gc-151495.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192765 => 192766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-24 18:47:19 UTC (rev 192765)
+++ trunk/LayoutTests/ChangeLog 2015-11-24 21:37:37 UTC (rev 192766)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-11-24 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r192536, r192722, and r192743.
+ https://bugs.webkit.org/show_bug.cgi?id=151593
+
+ Still causing trouble. (Requested by kling on #webkit).
+
+ Reverted changesets:
+
+ "[JSC] JSPropertyNameEnumerator could be destructorless."
+ https://bugs.webkit.org/show_bug.cgi?id=151242
+ http://trac.webkit.org/changeset/192536
+
+ "REGRESSION(r192536): Null pointer dereference in
+ JSPropertyNameEnumerator::visitChildren()."
+ https://bugs.webkit.org/show_bug.cgi?id=151495
+ http://trac.webkit.org/changeset/192722
+
+ "REGRESSION(r192536): Null pointer dereference in
+ JSPropertyNameEnumerator::visitChildren()."
+ https://bugs.webkit.org/show_bug.cgi?id=151495
+ http://trac.webkit.org/changeset/192743
+
</ins><span class="cx"> 2015-11-24 Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Streams API] Implement pipeTo method in readable Stream
</span></span></pre></div>
<a id="trunkLayoutTestsjspropertynameenumeratorgc151495expectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/js/property-name-enumerator-gc-151495-expected.txt (192765 => 192766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/property-name-enumerator-gc-151495-expected.txt 2015-11-24 18:47:19 UTC (rev 192765)
+++ trunk/LayoutTests/js/property-name-enumerator-gc-151495-expected.txt 2015-11-24 21:37:37 UTC (rev 192766)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-Regression test for https://webkit.org/b/151495. - This test should not crash.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestsjspropertynameenumeratorgc151495html"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/js/property-name-enumerator-gc-151495.html (192765 => 192766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/property-name-enumerator-gc-151495.html 2015-11-24 18:47:19 UTC (rev 192765)
+++ trunk/LayoutTests/js/property-name-enumerator-gc-151495.html 2015-11-24 21:37:37 UTC (rev 192766)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src="../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script src="script-tests/property-name-enumerator-gc-151495.js"></script>
-<script src="../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsjsscripttestspropertynameenumeratorgc151495js"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/js/script-tests/property-name-enumerator-gc-151495.js (192765 => 192766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/property-name-enumerator-gc-151495.js 2015-11-24 18:47:19 UTC (rev 192765)
+++ trunk/LayoutTests/js/script-tests/property-name-enumerator-gc-151495.js 2015-11-24 21:37:37 UTC (rev 192766)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-description("Regression test for https://webkit.org/b/151495. - This test should not crash.");
-
-var x = { a: 1, b: 2, c: 3, d: 4, e: 5, f: 6 };
-for (i = 0; i < 2000; ++i) {
- // Keep adding new properties...
- x["foo" + i] = 1;
- // ...to force creation of new JSPropertyNameEnumerator objects.
- for (j in x) { }
-}
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (192765 => 192766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-11-24 18:47:19 UTC (rev 192765)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-11-24 21:37:37 UTC (rev 192766)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-11-24 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r192536, r192722, and r192743.
+ https://bugs.webkit.org/show_bug.cgi?id=151593
+
+ Still causing trouble. (Requested by kling on #webkit).
+
+ Reverted changesets:
+
+ "[JSC] JSPropertyNameEnumerator could be destructorless."
+ https://bugs.webkit.org/show_bug.cgi?id=151242
+ http://trac.webkit.org/changeset/192536
+
+ "REGRESSION(r192536): Null pointer dereference in
+ JSPropertyNameEnumerator::visitChildren()."
+ https://bugs.webkit.org/show_bug.cgi?id=151495
+ http://trac.webkit.org/changeset/192722
+
+ "REGRESSION(r192536): Null pointer dereference in
+ JSPropertyNameEnumerator::visitChildren()."
+ https://bugs.webkit.org/show_bug.cgi?id=151495
+ http://trac.webkit.org/changeset/192743
+
</ins><span class="cx"> 2015-11-23 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix the Mac CMake build after r192793.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCopyTokenh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CopyToken.h (192765 => 192766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CopyToken.h 2015-11-24 18:47:19 UTC (rev 192765)
+++ trunk/Source/JavaScriptCore/heap/CopyToken.h 2015-11-24 21:37:37 UTC (rev 192766)
</span><span class="lines">@@ -32,8 +32,7 @@
</span><span class="cx"> ButterflyCopyToken,
</span><span class="cx"> TypedArrayVectorCopyToken,
</span><span class="cx"> MapBackingStoreCopyToken,
</span><del>- DirectArgumentsOverridesCopyToken,
- JSPropertyNameEnumeratorCopyToken,
</del><ins>+ DirectArgumentsOverridesCopyToken
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSPropertyNameEnumeratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSPropertyNameEnumerator.cpp (192765 => 192766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSPropertyNameEnumerator.cpp 2015-11-24 18:47:19 UTC (rev 192765)
+++ trunk/Source/JavaScriptCore/runtime/JSPropertyNameEnumerator.cpp 2015-11-24 21:37:37 UTC (rev 192766)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSPropertyNameEnumerator.h"
</span><span class="cx">
</span><del>-#include "CopiedBlockInlines.h"
-#include "CopyVisitorInlines.h"
</del><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "StrongInlines.h"
</span><span class="cx">
</span><span class="lines">@@ -72,47 +70,25 @@
</span><span class="cx"> m_endStructurePropertyIndex = endStructurePropertyIndex;
</span><span class="cx"> m_endGenericPropertyIndex = vector.size();
</span><span class="cx">
</span><del>- if (!vector.isEmpty()) {
- void* backingStore;
- RELEASE_ASSERT(vm.heap.tryAllocateStorage(this, propertyNameCacheSize(), &backingStore));
- WriteBarrier<JSString>* propertyNames = reinterpret_cast<WriteBarrier<JSString>*>(backingStore);
-
- for (unsigned i = 0; i < vector.size(); ++i)
- propertyNames[i].set(vm, this, jsString(&vm, vector[i].string()));
-
- m_propertyNames.set(vm, this, propertyNames);
</del><ins>+ m_propertyNames.resizeToFit(vector.size());
+ for (unsigned i = 0; i < vector.size(); ++i) {
+ const Identifier& identifier = vector[i];
+ m_propertyNames[i].set(vm, this, jsString(&vm, identifier.string()));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void JSPropertyNameEnumerator::destroy(JSCell* cell)
+{
+ jsCast<JSPropertyNameEnumerator*>(cell)->JSPropertyNameEnumerator::~JSPropertyNameEnumerator();
+}
+
</ins><span class="cx"> void JSPropertyNameEnumerator::visitChildren(JSCell* cell, SlotVisitor& visitor)
</span><span class="cx"> {
</span><span class="cx"> Base::visitChildren(cell, visitor);
</span><span class="cx"> JSPropertyNameEnumerator* thisObject = jsCast<JSPropertyNameEnumerator*>(cell);
</span><ins>+ for (unsigned i = 0; i < thisObject->m_propertyNames.size(); ++i)
+ visitor.append(&thisObject->m_propertyNames[i]);
</ins><span class="cx"> visitor.append(&thisObject->m_prototypeChain);
</span><del>-
- if (auto* propertyNames = thisObject->m_propertyNames.getWithoutBarrier()) {
- for (unsigned i = 0; i < thisObject->cachedPropertyNameCount(); ++i)
- visitor.append(&propertyNames[i]);
- visitor.copyLater(
- thisObject, JSPropertyNameEnumeratorCopyToken,
- propertyNames, thisObject->propertyNameCacheSize());
- }
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void JSPropertyNameEnumerator::copyBackingStore(JSCell* cell, CopyVisitor& visitor, CopyToken token)
-{
- JSPropertyNameEnumerator* thisObject = jsCast<JSPropertyNameEnumerator*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
-
- RELEASE_ASSERT(token == JSPropertyNameEnumeratorCopyToken);
-
- void* oldPropertyNames = thisObject->m_propertyNames.getWithoutBarrier();
- if (visitor.checkIfShouldCopy(oldPropertyNames)) {
- WriteBarrier<JSString>* newPropertyNames = static_cast<WriteBarrier<JSString>*>(visitor.allocateNewSpace(thisObject->propertyNameCacheSize()));
- memcpy(newPropertyNames, oldPropertyNames, thisObject->propertyNameCacheSize());
- thisObject->m_propertyNames.setWithoutBarrier(newPropertyNames);
- visitor.didCopy(oldPropertyNames, thisObject->propertyNameCacheSize());
- }
-}
-
</del><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSPropertyNameEnumeratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSPropertyNameEnumerator.h (192765 => 192766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSPropertyNameEnumerator.h 2015-11-24 18:47:19 UTC (rev 192765)
+++ trunk/Source/JavaScriptCore/runtime/JSPropertyNameEnumerator.h 2015-11-24 21:37:37 UTC (rev 192766)
</span><span class="lines">@@ -43,6 +43,9 @@
</span><span class="cx"> static JSPropertyNameEnumerator* create(VM&);
</span><span class="cx"> static JSPropertyNameEnumerator* create(VM&, Structure*, uint32_t, uint32_t, PropertyNameArray&);
</span><span class="cx">
</span><ins>+ static const bool needsDestruction = true;
+ static void destroy(JSCell*);
+
</ins><span class="cx"> static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
</span><span class="cx"> {
</span><span class="cx"> return Structure::create(vm, globalObject, prototype, TypeInfo(CellType, StructureFlags), info());
</span><span class="lines">@@ -52,9 +55,9 @@
</span><span class="cx">
</span><span class="cx"> JSString* propertyNameAtIndex(uint32_t index) const
</span><span class="cx"> {
</span><del>- if (index >= cachedPropertyNameCount())
</del><ins>+ if (index >= m_propertyNames.size())
</ins><span class="cx"> return nullptr;
</span><del>- return m_propertyNames.get(this)[index].get();
</del><ins>+ return m_propertyNames[index].get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StructureChain* cachedPrototypeChain() const { return m_prototypeChain.get(); }
</span><span class="lines">@@ -78,30 +81,18 @@
</span><span class="cx"> static ptrdiff_t cachedInlineCapacityOffset() { return OBJECT_OFFSETOF(JSPropertyNameEnumerator, m_cachedInlineCapacity); }
</span><span class="cx"> static ptrdiff_t cachedPropertyNamesVectorOffset()
</span><span class="cx"> {
</span><del>- return OBJECT_OFFSETOF(JSPropertyNameEnumerator, m_propertyNames);
</del><ins>+ return OBJECT_OFFSETOF(JSPropertyNameEnumerator, m_propertyNames) + Vector<WriteBarrier<JSString>>::dataMemoryOffset();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void visitChildren(JSCell*, SlotVisitor&);
</span><del>- static void copyBackingStore(JSCell*, CopyVisitor&, CopyToken);
</del><span class="cx">
</span><del>- uint32_t cachedPropertyNameCount() const
- {
- // Note that this depends on m_endGenericPropertyIndex being the number of entries in m_propertyNames.
- return m_endGenericPropertyIndex;
- }
-
- size_t propertyNameCacheSize() const
- {
- return WTF::roundUpToMultipleOf<8>(cachedPropertyNameCount() * sizeof(WriteBarrier<JSString>));
- }
-
</del><span class="cx"> private:
</span><span class="cx"> JSPropertyNameEnumerator(VM&, StructureID, uint32_t);
</span><span class="cx"> void finishCreation(VM&, uint32_t, uint32_t, PassRefPtr<PropertyNameArrayData>);
</span><span class="cx">
</span><del>- CopyBarrier<WriteBarrier<JSString>> m_propertyNames;
- WriteBarrier<StructureChain> m_prototypeChain;
</del><ins>+ Vector<WriteBarrier<JSString>> m_propertyNames;
</ins><span class="cx"> StructureID m_cachedStructureID;
</span><ins>+ WriteBarrier<StructureChain> m_prototypeChain;
</ins><span class="cx"> uint32_t m_indexedLength;
</span><span class="cx"> uint32_t m_endStructurePropertyIndex;
</span><span class="cx"> uint32_t m_endGenericPropertyIndex;
</span></span></pre>
</div>
</div>
</body>
</html>