<!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>[170215] branches/ftlopt/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/170215">170215</a></dd>
<dt>Author</dt> <dd>mhahnenberg@apple.com</dd>
<dt>Date</dt> <dd>2014-06-20 15:27:36 -0700 (Fri, 20 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/169903">r169903</a> to the branch.
2014-06-12 Mark Hahnenberg <mhahnenberg@apple.com>
Move structureHasRareData out of TypeInfo
https://bugs.webkit.org/show_bug.cgi?id=133800
Reviewed by Andreas Kling.
StructureHasRareData was originally put in TypeInfo to avoid making Structure bigger,
but we have a few spare bits in Structure so it would be nice to remove this hack.
* runtime/JSTypeInfo.h:
(JSC::TypeInfo::newImpurePropertyFiresWatchpoints):
(JSC::TypeInfo::structureHasRareData): Deleted.
* runtime/Structure.cpp:
(JSC::Structure::Structure):
(JSC::Structure::allocateRareData):
(JSC::Structure::cloneRareDataFrom):
* runtime/Structure.h:
(JSC::Structure::previousID):
(JSC::Structure::objectToStringValue):
(JSC::Structure::setObjectToStringValue):
(JSC::Structure::setPreviousID):
(JSC::Structure::clearPreviousID):
(JSC::Structure::previous):
(JSC::Structure::rareData):
* runtime/StructureInlines.h:
(JSC::Structure::setEnumerationCache):
(JSC::Structure::enumerationCache):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesftloptSourceJavaScriptCoreChangeLog">branches/ftlopt/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreruntimeJSTypeInfoh">branches/ftlopt/Source/JavaScriptCore/runtime/JSTypeInfo.h</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreruntimeStructurecpp">branches/ftlopt/Source/JavaScriptCore/runtime/Structure.cpp</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreruntimeStructureh">branches/ftlopt/Source/JavaScriptCore/runtime/Structure.h</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreruntimeStructureInlinesh">branches/ftlopt/Source/JavaScriptCore/runtime/StructureInlines.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesftloptSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/ChangeLog (170214 => 170215)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/ChangeLog 2014-06-20 22:10:37 UTC (rev 170214)
+++ branches/ftlopt/Source/JavaScriptCore/ChangeLog 2014-06-20 22:27:36 UTC (rev 170215)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-06-20 Mark Hahnenberg <mhahnenberg@apple.com>
+
+ Merge r169903 to the branch.
+
+ 2014-06-12 Mark Hahnenberg <mhahnenberg@apple.com>
+
+ Move structureHasRareData out of TypeInfo
+ https://bugs.webkit.org/show_bug.cgi?id=133800
+
+ Reviewed by Andreas Kling.
+
+ StructureHasRareData was originally put in TypeInfo to avoid making Structure bigger,
+ but we have a few spare bits in Structure so it would be nice to remove this hack.
+
+ * runtime/JSTypeInfo.h:
+ (JSC::TypeInfo::newImpurePropertyFiresWatchpoints):
+ (JSC::TypeInfo::structureHasRareData): Deleted.
+ * runtime/Structure.cpp:
+ (JSC::Structure::Structure):
+ (JSC::Structure::allocateRareData):
+ (JSC::Structure::cloneRareDataFrom):
+ * runtime/Structure.h:
+ (JSC::Structure::previousID):
+ (JSC::Structure::objectToStringValue):
+ (JSC::Structure::setObjectToStringValue):
+ (JSC::Structure::setPreviousID):
+ (JSC::Structure::clearPreviousID):
+ (JSC::Structure::previous):
+ (JSC::Structure::rareData):
+ * runtime/StructureInlines.h:
+ (JSC::Structure::setEnumerationCache):
+ (JSC::Structure::enumerationCache):
+
</ins><span class="cx"> 2014-06-19 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> [ftlopt] StructureSet::onlyStructure() should return nullptr if it's not a singleton (instead of asserting)
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreruntimeJSTypeInfoh"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/runtime/JSTypeInfo.h (170214 => 170215)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/runtime/JSTypeInfo.h 2014-06-20 22:10:37 UTC (rev 170214)
+++ branches/ftlopt/Source/JavaScriptCore/runtime/JSTypeInfo.h 2014-06-20 22:27:36 UTC (rev 170215)
</span><span class="lines">@@ -49,8 +49,7 @@
</span><span class="cx"> static const unsigned ProhibitsPropertyCaching = 1 << 9;
</span><span class="cx"> static const unsigned HasImpureGetOwnPropertySlot = 1 << 10;
</span><span class="cx"> static const unsigned NewImpurePropertyFiresWatchpoints = 1 << 11;
</span><del>- static const unsigned StructureHasRareData = 1 << 12;
- static const unsigned StructureIsImmortal = 1 << 13;
</del><ins>+ static const unsigned StructureIsImmortal = 1 << 12;
</ins><span class="cx">
</span><span class="cx"> class TypeInfo {
</span><span class="cx"> public:
</span><span class="lines">@@ -95,7 +94,6 @@
</span><span class="cx"> bool prohibitsPropertyCaching() const { return isSetOnFlags2(ProhibitsPropertyCaching); }
</span><span class="cx"> bool hasImpureGetOwnPropertySlot() const { return isSetOnFlags2(HasImpureGetOwnPropertySlot); }
</span><span class="cx"> bool newImpurePropertyFiresWatchpoints() const { return isSetOnFlags2(NewImpurePropertyFiresWatchpoints); }
</span><del>- bool structureHasRareData() const { return isSetOnFlags2(StructureHasRareData); }
</del><span class="cx"> bool structureIsImmortal() const { return isSetOnFlags2(StructureIsImmortal); }
</span><span class="cx">
</span><span class="cx"> static ptrdiff_t flagsOffset()
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreruntimeStructurecpp"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/runtime/Structure.cpp (170214 => 170215)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/runtime/Structure.cpp 2014-06-20 22:10:37 UTC (rev 170214)
+++ branches/ftlopt/Source/JavaScriptCore/runtime/Structure.cpp 2014-06-20 22:27:36 UTC (rev 170215)
</span><span class="lines">@@ -175,10 +175,11 @@
</span><span class="cx"> , m_preventExtensions(false)
</span><span class="cx"> , m_didTransition(false)
</span><span class="cx"> , m_staticFunctionReified(false)
</span><ins>+ , m_hasRareData(false)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(inlineCapacity <= JSFinalObject::maxInlineCapacity());
</span><span class="cx"> ASSERT(static_cast<PropertyOffset>(inlineCapacity) < firstOutOfLineOffset);
</span><del>- ASSERT(!typeInfo.structureHasRareData());
</del><ins>+ ASSERT(!m_hasRareData);
</ins><span class="cx"> ASSERT(hasReadOnlyOrGetterSetterPropertiesExcludingProto() || !m_classInfo->hasStaticSetterOrReadonlyProperties(vm));
</span><span class="cx"> ASSERT(hasGetterSetterProperties() || !m_classInfo->hasStaticSetterOrReadonlyProperties(vm));
</span><span class="cx"> }
</span><span class="lines">@@ -202,6 +203,7 @@
</span><span class="cx"> , m_preventExtensions(false)
</span><span class="cx"> , m_didTransition(false)
</span><span class="cx"> , m_staticFunctionReified(false)
</span><ins>+ , m_hasRareData(false)
</ins><span class="cx"> {
</span><span class="cx"> TypeInfo typeInfo = TypeInfo(CellType, OverridesVisitChildren | StructureIsImmortal);
</span><span class="cx"> m_blob = StructureIDBlob(vm.heap.structureIDTable().allocateID(this), 0, typeInfo);
</span><span class="lines">@@ -228,13 +230,14 @@
</span><span class="cx"> , m_preventExtensions(previous->m_preventExtensions)
</span><span class="cx"> , m_didTransition(true)
</span><span class="cx"> , m_staticFunctionReified(previous->m_staticFunctionReified)
</span><ins>+ , m_hasRareData(false)
</ins><span class="cx"> {
</span><del>- TypeInfo typeInfo = TypeInfo(previous->typeInfo().type(), previous->typeInfo().flags() & ~StructureHasRareData);
</del><ins>+ TypeInfo typeInfo = previous->typeInfo();
</ins><span class="cx"> m_blob = StructureIDBlob(vm.heap.structureIDTable().allocateID(this), previous->indexingTypeIncludingHistory(), typeInfo);
</span><span class="cx"> m_outOfLineTypeFlags = typeInfo.outOfLineTypeFlags();
</span><span class="cx">
</span><span class="cx"> ASSERT(!previous->typeInfo().structureIsImmortal());
</span><del>- if (previous->typeInfo().structureHasRareData() && previous->rareData()->needsCloning())
</del><ins>+ if (previous->m_hasRareData && previous->rareData()->needsCloning())
</ins><span class="cx"> cloneRareDataFrom(vm, previous);
</span><span class="cx"> else if (previous->previousID())
</span><span class="cx"> m_previousOrRareData.set(vm, this, previous->previousID());
</span><span class="lines">@@ -779,24 +782,21 @@
</span><span class="cx">
</span><span class="cx"> void Structure::allocateRareData(VM& vm)
</span><span class="cx"> {
</span><del>- ASSERT(!typeInfo().structureHasRareData());
</del><ins>+ ASSERT(!m_hasRareData);
</ins><span class="cx"> StructureRareData* rareData = StructureRareData::create(vm, previous());
</span><del>- TypeInfo oldTypeInfo = typeInfo();
- TypeInfo newTypeInfo = TypeInfo(oldTypeInfo.type(), oldTypeInfo.flags() | StructureHasRareData);
- m_outOfLineTypeFlags = newTypeInfo.outOfLineTypeFlags();
</del><span class="cx"> m_previousOrRareData.set(vm, this, rareData);
</span><del>- ASSERT(typeInfo().structureHasRareData());
</del><ins>+ m_hasRareData = true;
+ ASSERT(m_hasRareData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Structure::cloneRareDataFrom(VM& vm, const Structure* other)
</span><span class="cx"> {
</span><del>- ASSERT(other->typeInfo().structureHasRareData());
</del><ins>+ ASSERT(!m_hasRareData);
+ ASSERT(other->m_hasRareData);
</ins><span class="cx"> StructureRareData* newRareData = StructureRareData::clone(vm, other->rareData());
</span><del>- TypeInfo oldTypeInfo = typeInfo();
- TypeInfo newTypeInfo = TypeInfo(oldTypeInfo.type(), oldTypeInfo.flags() | StructureHasRareData);
- m_outOfLineTypeFlags = newTypeInfo.outOfLineTypeFlags();
</del><span class="cx"> m_previousOrRareData.set(vm, this, newRareData);
</span><del>- ASSERT(typeInfo().structureHasRareData());
</del><ins>+ m_hasRareData = true;
+ ASSERT(m_hasRareData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if DUMP_PROPERTYMAP_STATS
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreruntimeStructureh"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/runtime/Structure.h (170214 => 170215)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/runtime/Structure.h 2014-06-20 22:10:37 UTC (rev 170214)
+++ branches/ftlopt/Source/JavaScriptCore/runtime/Structure.h 2014-06-20 22:27:36 UTC (rev 170215)
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> Structure* previousID() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(structure()->classInfo() == info());
</span><del>- if (typeInfo().structureHasRareData())
</del><ins>+ if (m_hasRareData)
</ins><span class="cx"> return rareData()->previousID();
</span><span class="cx"> return previous();
</span><span class="cx"> }
</span><span class="lines">@@ -298,14 +298,14 @@
</span><span class="cx">
</span><span class="cx"> JSString* objectToStringValue()
</span><span class="cx"> {
</span><del>- if (!typeInfo().structureHasRareData())
</del><ins>+ if (!m_hasRareData)
</ins><span class="cx"> return 0;
</span><span class="cx"> return rareData()->objectToStringValue();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void setObjectToStringValue(VM& vm, const JSCell* owner, JSString* value)
</span><span class="cx"> {
</span><del>- if (!typeInfo().structureHasRareData())
</del><ins>+ if (!m_hasRareData)
</ins><span class="cx"> allocateRareData(vm);
</span><span class="cx"> rareData()->setObjectToStringValue(vm, owner, value);
</span><span class="cx"> }
</span><span class="lines">@@ -455,7 +455,7 @@
</span><span class="cx">
</span><span class="cx"> void setPreviousID(VM& vm, Structure* transition, Structure* structure)
</span><span class="cx"> {
</span><del>- if (typeInfo().structureHasRareData())
</del><ins>+ if (m_hasRareData)
</ins><span class="cx"> rareData()->setPreviousID(vm, transition, structure);
</span><span class="cx"> else
</span><span class="cx"> m_previousOrRareData.set(vm, transition, structure);
</span><span class="lines">@@ -463,7 +463,7 @@
</span><span class="cx">
</span><span class="cx"> void clearPreviousID()
</span><span class="cx"> {
</span><del>- if (typeInfo().structureHasRareData())
</del><ins>+ if (m_hasRareData)
</ins><span class="cx"> rareData()->clearPreviousID();
</span><span class="cx"> else
</span><span class="cx"> m_previousOrRareData.clear();
</span><span class="lines">@@ -482,13 +482,13 @@
</span><span class="cx">
</span><span class="cx"> Structure* previous() const
</span><span class="cx"> {
</span><del>- ASSERT(!typeInfo().structureHasRareData());
</del><ins>+ ASSERT(!m_hasRareData);
</ins><span class="cx"> return static_cast<Structure*>(m_previousOrRareData.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StructureRareData* rareData() const
</span><span class="cx"> {
</span><del>- ASSERT(typeInfo().structureHasRareData());
</del><ins>+ ASSERT(m_hasRareData);
</ins><span class="cx"> return static_cast<StructureRareData*>(m_previousOrRareData.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -544,6 +544,7 @@
</span><span class="cx"> unsigned m_preventExtensions : 1;
</span><span class="cx"> unsigned m_didTransition : 1;
</span><span class="cx"> unsigned m_staticFunctionReified : 1;
</span><ins>+ bool m_hasRareData : 1;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreruntimeStructureInlinesh"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/runtime/StructureInlines.h (170214 => 170215)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/runtime/StructureInlines.h 2014-06-20 22:10:37 UTC (rev 170214)
+++ branches/ftlopt/Source/JavaScriptCore/runtime/StructureInlines.h 2014-06-20 22:27:36 UTC (rev 170215)
</span><span class="lines">@@ -135,14 +135,14 @@
</span><span class="cx"> inline void Structure::setEnumerationCache(VM& vm, JSPropertyNameIterator* enumerationCache)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isDictionary());
</span><del>- if (!typeInfo().structureHasRareData())
</del><ins>+ if (!m_hasRareData)
</ins><span class="cx"> allocateRareData(vm);
</span><span class="cx"> rareData()->setEnumerationCache(vm, this, enumerationCache);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline JSPropertyNameIterator* Structure::enumerationCache()
</span><span class="cx"> {
</span><del>- if (!typeInfo().structureHasRareData())
</del><ins>+ if (!m_hasRareData)
</ins><span class="cx"> return 0;
</span><span class="cx"> return rareData()->enumerationCache();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>