<!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>[166792] 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/166792">166792</a></dd>
<dt>Author</dt> <dd>mhahnenberg@apple.com</dd>
<dt>Date</dt> <dd>2014-04-04 10:56:23 -0700 (Fri, 04 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use JSCell::indexingType instead of Structure::indexingType wherever possible
https://bugs.webkit.org/show_bug.cgi?id=131230
Reviewed by Mark Lam.
Avoid the indirection through the Structure.
* bytecode/ArrayAllocationProfile.cpp:
(JSC::ArrayAllocationProfile::updateIndexingType):
* bytecode/ArrayAllocationProfile.h:
(JSC::ArrayAllocationProfile::selectIndexingType):
* heap/HeapStatistics.cpp:
(JSC::StorageStatistics::operator()):
* runtime/ArrayPrototype.cpp:
(JSC::attemptFastSort):
* runtime/JSGlobalObject.cpp:
(JSC::JSGlobalObject::objectPrototypeIsSane):
(JSC::JSGlobalObject::arrayPrototypeChainIsSane):
(JSC::JSGlobalObject::stringPrototypeChainIsSane):
* runtime/JSPropertyNameIterator.cpp:
(JSC::JSPropertyNameIterator::create):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeArrayAllocationProfilecpp">trunk/Source/JavaScriptCore/bytecode/ArrayAllocationProfile.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeArrayAllocationProfileh">trunk/Source/JavaScriptCore/bytecode/ArrayAllocationProfile.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapStatisticscpp">trunk/Source/JavaScriptCore/heap/HeapStatistics.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeArrayPrototypecpp">trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSPropertyNameIteratorcpp">trunk/Source/JavaScriptCore/runtime/JSPropertyNameIterator.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (166791 => 166792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-04-04 17:48:02 UTC (rev 166791)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-04-04 17:56:23 UTC (rev 166792)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2014-04-04 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><ins>+ Use JSCell::indexingType instead of Structure::indexingType wherever possible
+ https://bugs.webkit.org/show_bug.cgi?id=131230
+
+ Reviewed by Mark Lam.
+
+ Avoid the indirection through the Structure.
+
+ * bytecode/ArrayAllocationProfile.cpp:
+ (JSC::ArrayAllocationProfile::updateIndexingType):
+ * bytecode/ArrayAllocationProfile.h:
+ (JSC::ArrayAllocationProfile::selectIndexingType):
+ * heap/HeapStatistics.cpp:
+ (JSC::StorageStatistics::operator()):
+ * runtime/ArrayPrototype.cpp:
+ (JSC::attemptFastSort):
+ * runtime/JSGlobalObject.cpp:
+ (JSC::JSGlobalObject::objectPrototypeIsSane):
+ (JSC::JSGlobalObject::arrayPrototypeChainIsSane):
+ (JSC::JSGlobalObject::stringPrototypeChainIsSane):
+ * runtime/JSPropertyNameIterator.cpp:
+ (JSC::JSPropertyNameIterator::create):
+
+2014-04-04 Mark Hahnenberg <mhahnenberg@apple.com>
+
</ins><span class="cx"> Use JSCell::type instead of TypeInfo::type wherever possible
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=131229
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeArrayAllocationProfilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/ArrayAllocationProfile.cpp (166791 => 166792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/ArrayAllocationProfile.cpp 2014-04-04 17:48:02 UTC (rev 166791)
+++ trunk/Source/JavaScriptCore/bytecode/ArrayAllocationProfile.cpp 2014-04-04 17:56:23 UTC (rev 166792)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> JSArray* lastArray = m_lastArray;
</span><span class="cx"> if (!lastArray)
</span><span class="cx"> return;
</span><del>- m_currentIndexingType = leastUpperBoundOfIndexingTypes(m_currentIndexingType, lastArray->structure()->indexingType());
</del><ins>+ m_currentIndexingType = leastUpperBoundOfIndexingTypes(m_currentIndexingType, lastArray->indexingType());
</ins><span class="cx"> m_lastArray = 0;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeArrayAllocationProfileh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/ArrayAllocationProfile.h (166791 => 166792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/ArrayAllocationProfile.h 2014-04-04 17:48:02 UTC (rev 166791)
+++ trunk/Source/JavaScriptCore/bytecode/ArrayAllocationProfile.h 2014-04-04 17:56:23 UTC (rev 166792)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> IndexingType selectIndexingType()
</span><span class="cx"> {
</span><span class="cx"> JSArray* lastArray = m_lastArray;
</span><del>- if (lastArray && UNLIKELY(lastArray->structure()->indexingType() != m_currentIndexingType))
</del><ins>+ if (lastArray && UNLIKELY(lastArray->indexingType() != m_currentIndexingType))
</ins><span class="cx"> updateIndexingType();
</span><span class="cx"> return m_currentIndexingType;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapStatisticscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HeapStatistics.cpp (166791 => 166792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HeapStatistics.cpp 2014-04-04 17:48:02 UTC (rev 166791)
+++ trunk/Source/JavaScriptCore/heap/HeapStatistics.cpp 2014-04-04 17:56:23 UTC (rev 166792)
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> JSObject* object = jsCast<JSObject*>(cell);
</span><del>- if (hasIndexedProperties(object->structure()->indexingType()))
</del><ins>+ if (hasIndexedProperties(object->indexingType()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (object->structure()->isUncacheableDictionary())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArrayPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp (166791 => 166792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2014-04-04 17:48:02 UTC (rev 166791)
+++ trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2014-04-04 17:56:23 UTC (rev 166792)
</span><span class="lines">@@ -607,7 +607,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (thisObj->classInfo() != JSArray::info()
</span><span class="cx"> || asArray(thisObj)->hasSparseMap()
</span><del>- || shouldUseSlowPut(thisObj->structure()->indexingType()))
</del><ins>+ || shouldUseSlowPut(thisObj->indexingType()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (isNumericCompareFunction(exec, function, callType, callData))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (166791 => 166792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2014-04-04 17:48:02 UTC (rev 166791)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2014-04-04 17:56:23 UTC (rev 166792)
</span><span class="lines">@@ -507,7 +507,7 @@
</span><span class="cx"> inline bool hasBrokenIndexing(JSObject* object)
</span><span class="cx"> {
</span><span class="cx"> // This will change if we have more indexing types.
</span><del>- IndexingType type = object->structure()->indexingType();
</del><ins>+ IndexingType type = object->indexingType();
</ins><span class="cx"> // This could be made obviously more efficient, but isn't made so right now, because
</span><span class="cx"> // we expect this to be an unlikely slow path anyway.
</span><span class="cx"> return hasUndecided(type) || hasInt32(type) || hasDouble(type) || hasContiguous(type) || hasArrayStorage(type);
</span><span class="lines">@@ -583,20 +583,20 @@
</span><span class="cx">
</span><span class="cx"> bool JSGlobalObject::objectPrototypeIsSane()
</span><span class="cx"> {
</span><del>- return !hasIndexedProperties(m_objectPrototype->structure()->indexingType())
</del><ins>+ return !hasIndexedProperties(m_objectPrototype->indexingType())
</ins><span class="cx"> && m_objectPrototype->prototype().isNull();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSGlobalObject::arrayPrototypeChainIsSane()
</span><span class="cx"> {
</span><del>- return !hasIndexedProperties(m_arrayPrototype->structure()->indexingType())
</del><ins>+ return !hasIndexedProperties(m_arrayPrototype->indexingType())
</ins><span class="cx"> && m_arrayPrototype->prototype() == m_objectPrototype.get()
</span><span class="cx"> && objectPrototypeIsSane();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSGlobalObject::stringPrototypeChainIsSane()
</span><span class="cx"> {
</span><del>- return !hasIndexedProperties(m_stringPrototype->structure()->indexingType())
</del><ins>+ return !hasIndexedProperties(m_stringPrototype->indexingType())
</ins><span class="cx"> && m_stringPrototype->prototype() == m_objectPrototype.get()
</span><span class="cx"> && objectPrototypeIsSane();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSPropertyNameIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSPropertyNameIterator.cpp (166791 => 166792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSPropertyNameIterator.cpp 2014-04-04 17:48:02 UTC (rev 166791)
+++ trunk/Source/JavaScriptCore/runtime/JSPropertyNameIterator.cpp 2014-04-04 17:56:23 UTC (rev 166792)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> if (o->structure()->typeInfo().overridesGetPropertyNames())
</span><span class="cx"> return jsPropertyNameIterator;
</span><span class="cx">
</span><del>- if (hasIndexedProperties(o->structure()->indexingType()))
</del><ins>+ if (hasIndexedProperties(o->indexingType()))
</ins><span class="cx"> return jsPropertyNameIterator;
</span><span class="cx">
</span><span class="cx"> size_t count = normalizePrototypeChain(exec, o);
</span></span></pre>
</div>
</div>
</body>
</html>