<!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>[286580] 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/286580">286580</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2021-12-06 17:13:33 -0800 (Mon, 06 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>TypeInfo should be materializable from Structures as a single load.
https://bugs.webkit.org/show_bug.cgi?id=233875

Reviewed by Mark Lam.

This is mostly just the members of Structure and JSCell so that
JSType and InlineTypeFlags are at the end of the JSCell header.

* assembler/testmasm.cpp:
(JSC::testBranchIfType):
(JSC::testBranchIfNotType):
* ftl/FTLAbstractHeapRepository.cpp:
(JSC::FTL::AbstractHeapRepository::AbstractHeapRepository):
* runtime/JSCell.h:
* runtime/JSCellInlines.h:
(JSC::JSCell::JSCell):
* runtime/Structure.h:
(JSC::Structure::typeInfo const):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblertestmasmcpp">trunk/Source/JavaScriptCore/assembler/testmasm.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLAbstractHeapRepositorycpp">trunk/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCellh">trunk/Source/JavaScriptCore/runtime/JSCell.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCellInlinesh">trunk/Source/JavaScriptCore/runtime/JSCellInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStructureh">trunk/Source/JavaScriptCore/runtime/Structure.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (286579 => 286580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-12-07 00:38:11 UTC (rev 286579)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-12-07 01:13:33 UTC (rev 286580)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2021-12-06  Keith Miller  <keith_miller@apple.com>
+
+        TypeInfo should be materializable from Structures as a single load.
+        https://bugs.webkit.org/show_bug.cgi?id=233875
+
+        Reviewed by Mark Lam.
+
+        This is mostly just the members of Structure and JSCell so that
+        JSType and InlineTypeFlags are at the end of the JSCell header.
+
+        * assembler/testmasm.cpp:
+        (JSC::testBranchIfType):
+        (JSC::testBranchIfNotType):
+        * ftl/FTLAbstractHeapRepository.cpp:
+        (JSC::FTL::AbstractHeapRepository::AbstractHeapRepository):
+        * runtime/JSCell.h:
+        * runtime/JSCellInlines.h:
+        (JSC::JSCell::JSCell):
+        * runtime/Structure.h:
+        (JSC::Structure::typeInfo const):
+
</ins><span class="cx"> 2021-12-06  Mark Lam  <mark.lam@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Remove unneeded virtual allocator methods from Subspace.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblertestmasmcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/testmasm.cpp (286579 => 286580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/testmasm.cpp       2021-12-07 00:38:11 UTC (rev 286579)
+++ trunk/Source/JavaScriptCore/assembler/testmasm.cpp  2021-12-07 01:13:33 UTC (rev 286580)
</span><span class="lines">@@ -5613,6 +5613,7 @@
</span><span class="cx">     struct CellLike {
</span><span class="cx">         uint32_t structureID;
</span><span class="cx">         uint8_t indexingType;
</span><ins>+        uint8_t cellState;
</ins><span class="cx">         JSType type;
</span><span class="cx">     };
</span><span class="cx">     CHECK_EQ(JSCell::typeInfoTypeOffset(), OBJECT_OFFSETOF(CellLike, type));
</span><span class="lines">@@ -5647,6 +5648,7 @@
</span><span class="cx">     struct CellLike {
</span><span class="cx">         uint32_t structureID;
</span><span class="cx">         uint8_t indexingType;
</span><ins>+        uint8_t cellState;
</ins><span class="cx">         JSType type;
</span><span class="cx">     };
</span><span class="cx">     CHECK_EQ(JSCell::typeInfoTypeOffset(), OBJECT_OFFSETOF(CellLike, type));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLAbstractHeapRepositorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.cpp (286579 => 286580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.cpp    2021-12-07 00:38:11 UTC (rev 286579)
+++ trunk/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.cpp       2021-12-07 01:13:33 UTC (rev 286580)
</span><span class="lines">@@ -78,9 +78,9 @@
</span><span class="cx"> 
</span><span class="cx">     // Make sure that our explicit assumptions about the StructureIDBlob match reality.
</span><span class="cx">     RELEASE_ASSERT(!(JSCell_indexingTypeAndMisc.offset() & (sizeof(int32_t) - 1)));
</span><del>-    RELEASE_ASSERT(JSCell_indexingTypeAndMisc.offset() + 1 == JSCell_typeInfoType.offset());
-    RELEASE_ASSERT(JSCell_indexingTypeAndMisc.offset() + 2 == JSCell_typeInfoFlags.offset());
-    RELEASE_ASSERT(JSCell_indexingTypeAndMisc.offset() + 3 == JSCell_cellState.offset());
</del><ins>+    RELEASE_ASSERT(JSCell_indexingTypeAndMisc.offset() + 1 == JSCell_cellState.offset());
+    RELEASE_ASSERT(JSCell_indexingTypeAndMisc.offset() + 2 == JSCell_typeInfoType.offset());
+    RELEASE_ASSERT(JSCell_indexingTypeAndMisc.offset() + 3 == JSCell_typeInfoFlags.offset());
</ins><span class="cx"> 
</span><span class="cx">     JSCell_structureID.changeParent(&JSCell_header);
</span><span class="cx">     JSCell_usefulBytes.changeParent(&JSCell_header);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCellh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCell.h (286579 => 286580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCell.h     2021-12-07 00:38:11 UTC (rev 286579)
+++ trunk/Source/JavaScriptCore/runtime/JSCell.h        2021-12-07 01:13:33 UTC (rev 286580)
</span><span class="lines">@@ -266,9 +266,9 @@
</span><span class="cx"> 
</span><span class="cx">     StructureID m_structureID;
</span><span class="cx">     IndexingType m_indexingTypeAndMisc; // DO NOT store to this field. Always CAS.
</span><ins>+    CellState m_cellState;
</ins><span class="cx">     JSType m_type;
</span><span class="cx">     TypeInfo::InlineTypeFlags m_flags;
</span><del>-    CellState m_cellState;
</del><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> class JSCellLock : public JSCell {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCellInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCellInlines.h (286579 => 286580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCellInlines.h      2021-12-07 00:38:11 UTC (rev 286579)
+++ trunk/Source/JavaScriptCore/runtime/JSCellInlines.h 2021-12-07 01:13:33 UTC (rev 286580)
</span><span class="lines">@@ -58,9 +58,9 @@
</span><span class="cx"> inline JSCell::JSCell(VM&, Structure* structure)
</span><span class="cx">     : m_structureID(structure->id())
</span><span class="cx">     , m_indexingTypeAndMisc(structure->indexingModeIncludingHistory())
</span><ins>+    , m_cellState(CellState::DefinitelyWhite)
</ins><span class="cx">     , m_type(structure->typeInfo().type())
</span><span class="cx">     , m_flags(structure->typeInfo().inlineTypeFlags())
</span><del>-    , m_cellState(CellState::DefinitelyWhite)
</del><span class="cx"> {
</span><span class="cx">     ASSERT(!isCompilationThread());
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStructureh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Structure.h (286579 => 286580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Structure.h  2021-12-07 00:38:11 UTC (rev 286579)
+++ trunk/Source/JavaScriptCore/runtime/Structure.h     2021-12-07 01:13:33 UTC (rev 286580)
</span><span class="lines">@@ -261,7 +261,11 @@
</span><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     // Type accessors.
</span><ins>+#if CPU(NEEDS_ALIGNED_ACCESS)
</ins><span class="cx">     TypeInfo typeInfo() const { return TypeInfo(m_cellHeaderType, m_cellHeaderInlineTypeFlags, m_outOfLineTypeFlags); }
</span><ins>+#else
+    TypeInfo typeInfo() const { return *reinterpret_cast_ptr<const TypeInfo*>(&m_cellHeaderType); }
+#endif
</ins><span class="cx">     bool isObject() const { return typeInfo().isObject(); }
</span><span class="cx"> protected:
</span><span class="cx">     // You probably want typeInfo().type()
</span><span class="lines">@@ -856,9 +860,9 @@
</span><span class="cx">     // part of the object. And need to match the order of the equivalent properties in
</span><span class="cx">     // JSCell.
</span><span class="cx">     IndexingType m_cellHeaderIndexingModeIncludingHistory;
</span><ins>+    const CellState m_cellHeaderDefaultCellState { CellState::DefinitelyWhite };
</ins><span class="cx">     const JSType m_cellHeaderType;
</span><span class="cx">     TypeInfo::InlineTypeFlags m_cellHeaderInlineTypeFlags;
</span><del>-    const CellState m_cellHeaderDefaultCellState { CellState::DefinitelyWhite };
</del><span class="cx">     TypeInfo::OutOfLineTypeFlags m_outOfLineTypeFlags;
</span><span class="cx"> 
</span><span class="cx">     uint8_t m_inlineCapacity;
</span></span></pre>
</div>
</div>

</body>
</html>