<!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>[200177] 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/200177">200177</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-04-27 23:54:54 -0700 (Wed, 27 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>The GetterSetter structure needs a globalObject.
https://bugs.webkit.org/show_bug.cgi?id=157120
Reviewed by Filip Pizlo.
In <a href="http://trac.webkit.org/projects/webkit/changeset/199170">r199170</a>: <http://trac.webkit.org/<a href="http://trac.webkit.org/projects/webkit/changeset/199170">r199170</a>>, GetterSetter was promoted from
being a JSCell to a JSObject. JSObject methods expect their structure to have a
globalObject. For example, see JSObject::calculatedClassName(). GetterSetter
was previously using a singleton getterSetterStructure owned by the VM. That
singleton getterSetterStructure is not associated with any globalObjects. As a
result, JSObject::calculatedClassName() will run into a null globalObject when it
is called on a GetterSetter object.
This patch removes the VM singleton getterSetterStructure, and instead, creates
a getterSetterStructure for each JSGlobalObject.
* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
* dfg/DFGStructureRegistrationPhase.cpp:
(JSC::DFG::StructureRegistrationPhase::run):
* runtime/GetterSetter.h:
* runtime/JSGlobalObject.cpp:
(JSC::JSGlobalObject::init):
(JSC::JSGlobalObject::visitChildren):
* runtime/JSGlobalObject.h:
(JSC::JSGlobalObject::functionStructure):
(JSC::JSGlobalObject::boundFunctionStructure):
(JSC::JSGlobalObject::boundSlotBaseFunctionStructure):
(JSC::JSGlobalObject::getterSetterStructure):
(JSC::JSGlobalObject::nativeStdFunctionStructure):
(JSC::JSGlobalObject::namedFunctionStructure):
(JSC::JSGlobalObject::functionNameOffset):
* runtime/VM.cpp:
(JSC::VM::VM):
* runtime/VM.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGStructureRegistrationPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeGetterSetterh">trunk/Source/JavaScriptCore/runtime/GetterSetter.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjecth">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMcpp">trunk/Source/JavaScriptCore/runtime/VM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMh">trunk/Source/JavaScriptCore/runtime/VM.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (200176 => 200177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-04-28 06:49:01 UTC (rev 200176)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-04-28 06:54:54 UTC (rev 200177)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2016-04-27 Mark Lam <mark.lam@apple.com>
+
+ The GetterSetter structure needs a globalObject.
+ https://bugs.webkit.org/show_bug.cgi?id=157120
+
+ Reviewed by Filip Pizlo.
+
+ In r199170: <http://trac.webkit.org/r199170>, GetterSetter was promoted from
+ being a JSCell to a JSObject. JSObject methods expect their structure to have a
+ globalObject. For example, see JSObject::calculatedClassName(). GetterSetter
+ was previously using a singleton getterSetterStructure owned by the VM. That
+ singleton getterSetterStructure is not associated with any globalObjects. As a
+ result, JSObject::calculatedClassName() will run into a null globalObject when it
+ is called on a GetterSetter object.
+
+ This patch removes the VM singleton getterSetterStructure, and instead, creates
+ a getterSetterStructure for each JSGlobalObject.
+
+ * dfg/DFGAbstractInterpreterInlines.h:
+ (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+ * dfg/DFGStructureRegistrationPhase.cpp:
+ (JSC::DFG::StructureRegistrationPhase::run):
+ * runtime/GetterSetter.h:
+ * runtime/JSGlobalObject.cpp:
+ (JSC::JSGlobalObject::init):
+ (JSC::JSGlobalObject::visitChildren):
+ * runtime/JSGlobalObject.h:
+ (JSC::JSGlobalObject::functionStructure):
+ (JSC::JSGlobalObject::boundFunctionStructure):
+ (JSC::JSGlobalObject::boundSlotBaseFunctionStructure):
+ (JSC::JSGlobalObject::getterSetterStructure):
+ (JSC::JSGlobalObject::nativeStdFunctionStructure):
+ (JSC::JSGlobalObject::namedFunctionStructure):
+ (JSC::JSGlobalObject::functionNameOffset):
+ * runtime/VM.cpp:
+ (JSC::VM::VM):
+ * runtime/VM.h:
+
</ins><span class="cx"> 2016-04-27 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, Revert r199397 due to PLT regressions
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (200176 => 200177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2016-04-28 06:49:01 UTC (rev 200176)
+++ trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2016-04-28 06:54:54 UTC (rev 200177)
</span><span class="lines">@@ -2371,7 +2371,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- forNode(node).set(m_graph, m_graph.m_vm.getterSetterStructure.get());
</del><ins>+ forNode(node).set(m_graph, m_graph.globalObjectFor(node->origin.semantic)->getterSetterStructure());
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGStructureRegistrationPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp (200176 => 200177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp 2016-04-28 06:49:01 UTC (rev 200176)
+++ trunk/Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp 2016-04-28 06:54:54 UTC (rev 200177)
</span><span class="lines">@@ -62,7 +62,6 @@
</span><span class="cx"> registerStructure(m_graph.m_vm.structureStructure.get());
</span><span class="cx"> registerStructure(m_graph.m_vm.stringStructure.get());
</span><span class="cx"> registerStructure(m_graph.m_vm.symbolStructure.get());
</span><del>- registerStructure(m_graph.m_vm.getterSetterStructure.get());
</del><span class="cx">
</span><span class="cx"> for (FrozenValue* value : m_graph.m_frozenValues)
</span><span class="cx"> assertIsRegistered(value->structure());
</span><span class="lines">@@ -92,7 +91,11 @@
</span><span class="cx"> registerStructure(node->transition()->previous);
</span><span class="cx"> registerStructure(node->transition()->next);
</span><span class="cx"> break;
</span><del>-
</del><ins>+
+ case GetGetterSetterByOffset:
+ registerStructure(m_graph.globalObjectFor(node->origin.semantic)->getterSetterStructure());
+ break;
+
</ins><span class="cx"> case MultiGetByOffset:
</span><span class="cx"> for (const MultiGetByOffsetCase& getCase : node->multiGetByOffsetData().cases)
</span><span class="cx"> registerStructures(getCase.set());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeGetterSetterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/GetterSetter.h (200176 => 200177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/GetterSetter.h 2016-04-28 06:49:01 UTC (rev 200176)
+++ trunk/Source/JavaScriptCore/runtime/GetterSetter.h 2016-04-28 06:54:54 UTC (rev 200177)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> typedef JSNonFinalObject Base;
</span><span class="cx"> private:
</span><span class="cx"> GetterSetter(VM& vm, JSGlobalObject* globalObject)
</span><del>- : Base(vm, vm.getterSetterStructure.get())
</del><ins>+ : Base(vm, globalObject->getterSetterStructure())
</ins><span class="cx"> {
</span><span class="cx"> m_getter.set(vm, this, globalObject->nullGetterFunction());
</span><span class="cx"> m_setter.set(vm, this, globalObject->nullSetterFunction());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (200176 => 200177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2016-04-28 06:49:01 UTC (rev 200176)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2016-04-28 06:54:54 UTC (rev 200177)
</span><span class="lines">@@ -294,6 +294,7 @@
</span><span class="cx"> m_functionStructure.set(vm, this, JSFunction::createStructure(vm, this, m_functionPrototype.get()));
</span><span class="cx"> m_boundSlotBaseFunctionStructure.set(vm, this, JSBoundSlotBaseFunction::createStructure(vm, this, m_functionPrototype.get()));
</span><span class="cx"> m_boundFunctionStructure.set(vm, this, JSBoundFunction::createStructure(vm, this, m_functionPrototype.get()));
</span><ins>+ m_getterSetterStructure.set(vm, this, GetterSetter::createStructure(vm, this, jsNull()));
</ins><span class="cx"> m_nativeStdFunctionStructure.set(vm, this, JSNativeStdFunction::createStructure(vm, this, m_functionPrototype.get()));
</span><span class="cx"> m_namedFunctionStructure.set(vm, this, Structure::addPropertyTransition(vm, m_functionStructure.get(), vm.propertyNames->name, DontDelete | ReadOnly | DontEnum, m_functionNameOffset));
</span><span class="cx"> m_internalFunctionStructure.set(vm, this, InternalFunction::createStructure(vm, this, m_functionPrototype.get()));
</span><span class="lines">@@ -976,6 +977,7 @@
</span><span class="cx"> visitor.append(&thisObject->m_functionStructure);
</span><span class="cx"> visitor.append(&thisObject->m_boundSlotBaseFunctionStructure);
</span><span class="cx"> visitor.append(&thisObject->m_boundFunctionStructure);
</span><ins>+ visitor.append(&thisObject->m_getterSetterStructure);
</ins><span class="cx"> visitor.append(&thisObject->m_nativeStdFunctionStructure);
</span><span class="cx"> visitor.append(&thisObject->m_namedFunctionStructure);
</span><span class="cx"> visitor.append(&thisObject->m_symbolObjectStructure);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h (200176 => 200177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2016-04-28 06:49:01 UTC (rev 200176)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2016-04-28 06:54:54 UTC (rev 200177)
</span><span class="lines">@@ -273,6 +273,7 @@
</span><span class="cx"> WriteBarrier<Structure> m_functionStructure;
</span><span class="cx"> WriteBarrier<Structure> m_boundFunctionStructure;
</span><span class="cx"> WriteBarrier<Structure> m_boundSlotBaseFunctionStructure;
</span><ins>+ WriteBarrier<Structure> m_getterSetterStructure;
</ins><span class="cx"> WriteBarrier<Structure> m_nativeStdFunctionStructure;
</span><span class="cx"> WriteBarrier<Structure> m_namedFunctionStructure;
</span><span class="cx"> PropertyOffset m_functionNameOffset;
</span><span class="lines">@@ -531,6 +532,7 @@
</span><span class="cx"> Structure* functionStructure() const { return m_functionStructure.get(); }
</span><span class="cx"> Structure* boundFunctionStructure() const { return m_boundFunctionStructure.get(); }
</span><span class="cx"> Structure* boundSlotBaseFunctionStructure() const { return m_boundSlotBaseFunctionStructure.get(); }
</span><ins>+ Structure* getterSetterStructure() const { return m_getterSetterStructure.get(); }
</ins><span class="cx"> Structure* nativeStdFunctionStructure() const { return m_nativeStdFunctionStructure.get(); }
</span><span class="cx"> Structure* namedFunctionStructure() const { return m_namedFunctionStructure.get(); }
</span><span class="cx"> PropertyOffset functionNameOffset() const { return m_functionNameOffset; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.cpp (200176 => 200177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.cpp 2016-04-28 06:49:01 UTC (rev 200176)
+++ trunk/Source/JavaScriptCore/runtime/VM.cpp 2016-04-28 06:54:54 UTC (rev 200177)
</span><span class="lines">@@ -217,7 +217,6 @@
</span><span class="cx"> terminatedExecutionErrorStructure.set(*this, TerminatedExecutionError::createStructure(*this, 0, jsNull()));
</span><span class="cx"> stringStructure.set(*this, JSString::createStructure(*this, 0, jsNull()));
</span><span class="cx"> propertyNameEnumeratorStructure.set(*this, JSPropertyNameEnumerator::createStructure(*this, 0, jsNull()));
</span><del>- getterSetterStructure.set(*this, GetterSetter::createStructure(*this, 0, jsNull()));
</del><span class="cx"> customGetterSetterStructure.set(*this, CustomGetterSetter::createStructure(*this, 0, jsNull()));
</span><span class="cx"> scopedArgumentsTableStructure.set(*this, ScopedArgumentsTable::createStructure(*this, 0, jsNull()));
</span><span class="cx"> apiWrapperStructure.set(*this, JSAPIValueWrapper::createStructure(*this, 0, jsNull()));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (200176 => 200177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h 2016-04-28 06:49:01 UTC (rev 200176)
+++ trunk/Source/JavaScriptCore/runtime/VM.h 2016-04-28 06:54:54 UTC (rev 200177)
</span><span class="lines">@@ -288,7 +288,6 @@
</span><span class="cx"> Strong<Structure> stringStructure;
</span><span class="cx"> Strong<Structure> propertyNameIteratorStructure;
</span><span class="cx"> Strong<Structure> propertyNameEnumeratorStructure;
</span><del>- Strong<Structure> getterSetterStructure;
</del><span class="cx"> Strong<Structure> customGetterSetterStructure;
</span><span class="cx"> Strong<Structure> scopedArgumentsTableStructure;
</span><span class="cx"> Strong<Structure> apiWrapperStructure;
</span></span></pre>
</div>
</div>
</body>
</html>