<!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>[185277] 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/185277">185277</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-06-05 17:33:43 -0700 (Fri, 05 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subclasses of JSNonFinalObject with gc'able children need to implement visitChildren().
https://bugs.webkit.org/show_bug.cgi?id=145709
Reviewed by Geoffrey Garen.
* jsc.cpp:
(functionSetElementRoot):
- The Element class has a member of type Root which extends JSDestructibleObject.
It should be stored in a WriteBarrier, and visited by visitChildren().
* runtime/ClonedArguments.cpp:
(JSC::ClonedArguments::materializeSpecialsIfNecessary):
(JSC::ClonedArguments::visitChildren):
* runtime/ClonedArguments.h:
- Add missing visitChildren().
* tests/stress/cloned-arguments-should-visit-callee-during-gc.js: Added.
(makeTransientFunction.transientFunc):
(makeTransientFunction):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeClonedArgumentscpp">trunk/Source/JavaScriptCore/runtime/ClonedArguments.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeClonedArgumentsh">trunk/Source/JavaScriptCore/runtime/ClonedArguments.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressclonedargumentsshouldvisitcalleeduringgcjs">trunk/Source/JavaScriptCore/tests/stress/cloned-arguments-should-visit-callee-during-gc.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (185276 => 185277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-06-06 00:04:40 UTC (rev 185276)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-06-06 00:33:43 UTC (rev 185277)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-06-05 Mark Lam <mark.lam@apple.com>
+
+ Subclasses of JSNonFinalObject with gc'able children need to implement visitChildren().
+ https://bugs.webkit.org/show_bug.cgi?id=145709
+
+ Reviewed by Geoffrey Garen.
+
+ * jsc.cpp:
+ (functionSetElementRoot):
+ - The Element class has a member of type Root which extends JSDestructibleObject.
+ It should be stored in a WriteBarrier, and visited by visitChildren().
+
+ * runtime/ClonedArguments.cpp:
+ (JSC::ClonedArguments::materializeSpecialsIfNecessary):
+ (JSC::ClonedArguments::visitChildren):
+ * runtime/ClonedArguments.h:
+ - Add missing visitChildren().
+
+ * tests/stress/cloned-arguments-should-visit-callee-during-gc.js: Added.
+ (makeTransientFunction.transientFunc):
+ (makeTransientFunction):
+
</ins><span class="cx"> 2015-06-05 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> DropAllLocks RELEASE_ASSERT on iOS
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (185276 => 185277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2015-06-06 00:04:40 UTC (rev 185276)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2015-06-06 00:33:43 UTC (rev 185277)
</span><span class="lines">@@ -130,28 +130,35 @@
</span><span class="cx">
</span><span class="cx"> class Element : public JSNonFinalObject {
</span><span class="cx"> public:
</span><del>- Element(VM& vm, Structure* structure, Root* root)
</del><ins>+ Element(VM& vm, Structure* structure)
</ins><span class="cx"> : Base(vm, structure)
</span><del>- , m_root(root)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> typedef JSNonFinalObject Base;
</span><span class="cx"> static const bool needsDestruction = false;
</span><span class="cx">
</span><del>- Root* root() const { return m_root; }
- void setRoot(Root* root) { m_root = root; }
</del><ins>+ Root* root() const { return m_root.get(); }
+ void setRoot(VM& vm, Root* root) { m_root.set(vm, this, root); }
</ins><span class="cx">
</span><span class="cx"> static Element* create(VM& vm, JSGlobalObject* globalObject, Root* root)
</span><span class="cx"> {
</span><span class="cx"> Structure* structure = createStructure(vm, globalObject, jsNull());
</span><del>- Element* element = new (NotNull, allocateCell<Element>(vm.heap, sizeof(Element))) Element(vm, structure, root);
- element->finishCreation(vm);
</del><ins>+ Element* element = new (NotNull, allocateCell<Element>(vm.heap, sizeof(Element))) Element(vm, structure);
+ element->finishCreation(vm, root);
</ins><span class="cx"> return element;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void finishCreation(VM&);
</del><ins>+ void finishCreation(VM&, Root*);
</ins><span class="cx">
</span><ins>+ static void visitChildren(JSCell* cell, SlotVisitor& visitor)
+ {
+ Element* thisObject = jsCast<Element*>(cell);
+ ASSERT_GC_OBJECT_INHERITS(thisObject, info());
+ Base::visitChildren(thisObject, visitor);
+ visitor.append(&thisObject->m_root);
+ }
+
</ins><span class="cx"> static ElementHandleOwner* handleOwner();
</span><span class="cx">
</span><span class="cx"> static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
</span><span class="lines">@@ -162,7 +169,7 @@
</span><span class="cx"> DECLARE_INFO;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Root* m_root;
</del><ins>+ WriteBarrier<Root> m_root;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class ElementHandleOwner : public WeakHandleOwner {
</span><span class="lines">@@ -421,9 +428,10 @@
</span><span class="cx"> return owner;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Element::finishCreation(VM& vm)
</del><ins>+void Element::finishCreation(VM& vm, Root* root)
</ins><span class="cx"> {
</span><span class="cx"> Base::finishCreation(vm);
</span><ins>+ setRoot(vm, root);
</ins><span class="cx"> m_root->setElement(this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -786,7 +794,7 @@
</span><span class="cx"> JSLockHolder lock(exec);
</span><span class="cx"> Element* element = jsCast<Element*>(exec->argument(0));
</span><span class="cx"> Root* root = jsCast<Root*>(exec->argument(1));
</span><del>- element->setRoot(root);
</del><ins>+ element->setRoot(exec->vm(), root);
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeClonedArgumentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ClonedArguments.cpp (185276 => 185277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ClonedArguments.cpp 2015-06-06 00:04:40 UTC (rev 185276)
+++ trunk/Source/JavaScriptCore/runtime/ClonedArguments.cpp 2015-06-06 00:33:43 UTC (rev 185277)
</span><span class="lines">@@ -218,5 +218,13 @@
</span><span class="cx"> materializeSpecials(exec);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ClonedArguments::visitChildren(JSCell* cell, SlotVisitor& visitor)
+{
+ ClonedArguments* thisObject = jsCast<ClonedArguments*>(cell);
+ ASSERT_GC_OBJECT_INHERITS(thisObject, info());
+ Base::visitChildren(thisObject, visitor);
+ visitor.append(&thisObject->m_callee);
+}
+
</ins><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeClonedArgumentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ClonedArguments.h (185276 => 185277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ClonedArguments.h 2015-06-06 00:04:40 UTC (rev 185276)
+++ trunk/Source/JavaScriptCore/runtime/ClonedArguments.h 2015-06-06 00:33:43 UTC (rev 185277)
</span><span class="lines">@@ -55,6 +55,8 @@
</span><span class="cx">
</span><span class="cx"> static Structure* createStructure(VM&, JSGlobalObject*, JSValue prototype);
</span><span class="cx">
</span><ins>+ static void visitChildren(JSCell*, SlotVisitor&);
+
</ins><span class="cx"> DECLARE_INFO;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressclonedargumentsshouldvisitcalleeduringgcjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/cloned-arguments-should-visit-callee-during-gc.js (0 => 185277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/cloned-arguments-should-visit-callee-during-gc.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/cloned-arguments-should-visit-callee-during-gc.js 2015-06-06 00:33:43 UTC (rev 185277)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+// Test that the ClonedArguments created by the Function.arguments will properly
+// keep its callee alive. This test should not crash and should not print any error
+// messages.
+
+var cachedArguments = [];
+var numberOfEntries = 1000;
+
+function makeTransientFunction(i) {
+ function transientFunc() {
+ cachedArguments[i] = transientFunc.arguments;
+ }
+ return transientFunc;
+}
+
+for (i = 0; i < numberOfEntries; i++) {
+ var transientFunc = makeTransientFunction(i);
+ transientFunc();
+ // At this point, the only reference to the transient function is from
+ // cachedArguments[i].callee.
+}
+
+gc();
+
+// Allocate a bunch of memory to stomp over the transient functions that may have been
+// erroneously collected. webkit.org/b/145709
+for (i = 0; i < numberOfEntries; i++) {
+ new Object();
+}
+
+for (i = 0; i < numberOfEntries; i++) {
+ var callee = cachedArguments[i].callee;
+ if (typeof callee != "function")
+ print("ERROR: callee is " + callee);
+}
</ins></span></pre>
</div>
</div>
</body>
</html>