<!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>[169695] 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/169695">169695</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2014-06-09 11:07:37 -0700 (Mon, 09 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Structure should initialize its previousID in its constructor.
<https://webkit.org/b/133606>
Reviewed by Mark Hahnenberg.
Currently, the Structure constructor that takes a previous structure will
initialize its previousID to point to the previous structure's previousID.
This is incorrect. However, the caller of the Structure::create() factory
method (which instantiated the Structure) will later call setPreviousID()
to set the previousID to the correct previous structure. This makes the
code confusing to read and more error prone in that the structure relies
on client code to fix its invalid previousID.
This patch fixes this by making the Structure constructor initialize
previousID correctly.
* runtime/Structure.cpp:
(JSC::Structure::Structure):
(JSC::Structure::addPropertyTransition):
(JSC::Structure::nonPropertyTransition):
* runtime/Structure.h:
* runtime/StructureInlines.h:
(JSC::Structure::create):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStructurecpp">trunk/Source/JavaScriptCore/runtime/Structure.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStructureh">trunk/Source/JavaScriptCore/runtime/Structure.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStructureInlinesh">trunk/Source/JavaScriptCore/runtime/StructureInlines.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (169694 => 169695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-06-09 18:07:12 UTC (rev 169694)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-06-09 18:07:37 UTC (rev 169695)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-06-07 Mark Lam <mark.lam@apple.com>
+
+ Structure should initialize its previousID in its constructor.
+ <https://webkit.org/b/133606>
+
+ Reviewed by Mark Hahnenberg.
+
+ Currently, the Structure constructor that takes a previous structure will
+ initialize its previousID to point to the previous structure's previousID.
+ This is incorrect. However, the caller of the Structure::create() factory
+ method (which instantiated the Structure) will later call setPreviousID()
+ to set the previousID to the correct previous structure. This makes the
+ code confusing to read and more error prone in that the structure relies
+ on client code to fix its invalid previousID.
+
+ This patch fixes this by making the Structure constructor initialize
+ previousID correctly.
+
+ * runtime/Structure.cpp:
+ (JSC::Structure::Structure):
+ (JSC::Structure::addPropertyTransition):
+ (JSC::Structure::nonPropertyTransition):
+ * runtime/Structure.h:
+ * runtime/StructureInlines.h:
+ (JSC::Structure::create):
+
</ins><span class="cx"> 2014-06-06 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Indexed getters should return values directly on the PropertySlot.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStructurecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Structure.cpp (169694 => 169695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Structure.cpp 2014-06-09 18:07:12 UTC (rev 169694)
+++ trunk/Source/JavaScriptCore/runtime/Structure.cpp 2014-06-09 18:07:37 UTC (rev 169695)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> ASSERT(hasGetterSetterProperties() || !m_classInfo->hasStaticSetterOrReadonlyProperties(vm));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Structure::Structure(VM& vm, const Structure* previous)
</del><ins>+Structure::Structure(VM& vm, Structure* previous)
</ins><span class="cx"> : JSCell(vm, vm.structureStructure.get())
</span><span class="cx"> , m_prototype(vm, this, previous->storedPrototype())
</span><span class="cx"> , m_classInfo(previous->m_classInfo)
</span><span class="lines">@@ -236,8 +236,7 @@
</span><span class="cx"> ASSERT(!previous->typeInfo().structureIsImmortal());
</span><span class="cx"> if (previous->typeInfo().structureHasRareData() && previous->rareData()->needsCloning())
</span><span class="cx"> cloneRareDataFrom(vm, previous);
</span><del>- else if (previous->previousID())
- m_previousOrRareData.set(vm, this, previous->previousID());
</del><ins>+ setPreviousID(vm, this, previous);
</ins><span class="cx">
</span><span class="cx"> previous->notifyTransitionFromThisStructure();
</span><span class="cx"> if (previous->m_globalObject)
</span><span class="lines">@@ -459,7 +458,6 @@
</span><span class="cx"> Structure* transition = create(vm, structure);
</span><span class="cx">
</span><span class="cx"> transition->m_cachedPrototypeChain.setMayBeNull(vm, transition, structure->m_cachedPrototypeChain.get());
</span><del>- transition->setPreviousID(vm, transition, structure);
</del><span class="cx"> transition->m_nameInPrevious = propertyName.uid();
</span><span class="cx"> transition->m_attributesInPrevious = attributes;
</span><span class="cx"> transition->m_specificValueInPrevious.setMayBeNull(vm, transition, specificValue);
</span><span class="lines">@@ -672,7 +670,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Structure* transition = create(vm, structure);
</span><del>- transition->setPreviousID(vm, transition, structure);
</del><span class="cx"> transition->m_attributesInPrevious = attributes;
</span><span class="cx"> transition->m_blob.setIndexingType(indexingType);
</span><span class="cx"> transition->propertyTable().set(vm, transition, structure->takePropertyTableOrCloneIfPinned(vm, transition));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStructureh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Structure.h (169694 => 169695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Structure.h 2014-06-09 18:07:12 UTC (rev 169694)
+++ trunk/Source/JavaScriptCore/runtime/Structure.h 2014-06-09 18:07:37 UTC (rev 169695)
</span><span class="lines">@@ -389,9 +389,9 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE Structure(VM&, JSGlobalObject*, JSValue prototype, const TypeInfo&, const ClassInfo*, IndexingType, unsigned inlineCapacity);
</span><span class="cx"> Structure(VM&);
</span><del>- Structure(VM&, const Structure*);
</del><ins>+ Structure(VM&, Structure*);
</ins><span class="cx">
</span><del>- static Structure* create(VM&, const Structure*);
</del><ins>+ static Structure* create(VM&, Structure*);
</ins><span class="cx">
</span><span class="cx"> static Structure* addPropertyTransitionToExistingStructureImpl(Structure*, StringImpl* uid, unsigned attributes, JSCell* specificValue, PropertyOffset&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStructureInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StructureInlines.h (169694 => 169695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StructureInlines.h 2014-06-09 18:07:12 UTC (rev 169694)
+++ trunk/Source/JavaScriptCore/runtime/StructureInlines.h 2014-06-09 18:07:37 UTC (rev 169695)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> return structure;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Structure* Structure::create(VM& vm, const Structure* structure)
</del><ins>+inline Structure* Structure::create(VM& vm, Structure* structure)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(vm.structureStructure);
</span><span class="cx"> Structure* newStructure = new (NotNull, allocateCell<Structure>(vm.heap)) Structure(vm, structure);
</span></span></pre>
</div>
</div>
</body>
</html>