<!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>[237964] tags/Safari-607.1.13/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/237964">237964</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2018-11-07 17:29:25 -0800 (Wed, 07 Nov 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Revert <a href="http://trac.webkit.org/projects/webkit/changeset/237638">r237638</a>. rdar://problem/45895377</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari607113SourceJavaScriptCoreChangeLog">tags/Safari-607.1.13/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#tagsSafari607113SourceJavaScriptCorebytecodeMetadataTableh">tags/Safari-607.1.13/Source/JavaScriptCore/bytecode/MetadataTable.h</a></li>
<li><a href="#tagsSafari607113SourceJavaScriptCorebytecodeOpcodecpp">tags/Safari-607.1.13/Source/JavaScriptCore/bytecode/Opcode.cpp</a></li>
<li><a href="#tagsSafari607113SourceJavaScriptCorebytecodeOpcodeh">tags/Safari-607.1.13/Source/JavaScriptCore/bytecode/Opcode.h</a></li>
<li><a href="#tagsSafari607113SourceJavaScriptCorebytecodeUnlinkedMetadataTableInlinesh">tags/Safari-607.1.13/Source/JavaScriptCore/bytecode/UnlinkedMetadataTableInlines.h</a></li>
<li><a href="#tagsSafari607113SourceJavaScriptCoregeneratorSectionrb">tags/Safari-607.1.13/Source/JavaScriptCore/generator/Section.rb</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari607113SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-607.1.13/Source/JavaScriptCore/ChangeLog (237963 => 237964)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-607.1.13/Source/JavaScriptCore/ChangeLog     2018-11-08 01:29:21 UTC (rev 237963)
+++ tags/Safari-607.1.13/Source/JavaScriptCore/ChangeLog        2018-11-08 01:29:25 UTC (rev 237964)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><span class="cx"> 2018-11-07  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><ins>+        Revert r237638. rdar://problem/45895377
+
+2018-11-07  Alan Coon  <alancoon@apple.com>
+
</ins><span class="cx">         Revert r237641. rdar://problem/45895377
</span><span class="cx"> 
</span><span class="cx"> 2018-11-07  Alan Coon  <alancoon@apple.com>
</span></span></pre></div>
<a id="tagsSafari607113SourceJavaScriptCorebytecodeMetadataTableh"></a>
<div class="modfile"><h4>Modified: tags/Safari-607.1.13/Source/JavaScriptCore/bytecode/MetadataTable.h (237963 => 237964)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-607.1.13/Source/JavaScriptCore/bytecode/MetadataTable.h      2018-11-08 01:29:21 UTC (rev 237963)
+++ tags/Safari-607.1.13/Source/JavaScriptCore/bytecode/MetadataTable.h 2018-11-08 01:29:25 UTC (rev 237964)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> 
</span><span class="cx">         auto* metadata = reinterpret_cast<typename Op::Metadata*>(get(Op::opcodeID));
</span><span class="cx">         auto* end = reinterpret_cast<typename Op::Metadata*>(getImpl(Op::opcodeID + 1));
</span><del>-        for (; metadata + 1 <= end; ++metadata)
</del><ins>+        for (; metadata != end; ++metadata)
</ins><span class="cx">             func(*metadata);
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="tagsSafari607113SourceJavaScriptCorebytecodeOpcodecpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-607.1.13/Source/JavaScriptCore/bytecode/Opcode.cpp (237963 => 237964)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-607.1.13/Source/JavaScriptCore/bytecode/Opcode.cpp   2018-11-08 01:29:21 UTC (rev 237963)
+++ tags/Safari-607.1.13/Source/JavaScriptCore/bytecode/Opcode.cpp      2018-11-08 01:29:25 UTC (rev 237964)
</span><span class="lines">@@ -193,27 +193,11 @@
</span><span class="cx"> 
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-#if CPU(NEEDS_ALIGNED_ACCESS)
-static unsigned metadataAlignments[] = {
-
-#define METADATA_ALIGNMENT(size) size,
-    FOR_EACH_BYTECODE_METADATA_ALIGNMENT(METADATA_ALIGNMENT)
-#undef METADATA_ALIGNMENT
-
-};
-#endif
-
</del><span class="cx"> unsigned metadataSize(OpcodeID opcodeID)
</span><span class="cx"> {
</span><span class="cx">     return metadataSizes[opcodeID];
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if CPU(NEEDS_ALIGNED_ACCESS)
-unsigned metadataAlignment(OpcodeID opcodeID)
-{
-    return metadataAlignments[opcodeID];
-}
-#endif
</del><span class="cx"> 
</span><span class="cx"> } // namespace JSC
</span><span class="cx"> 
</span></span></pre></div>
<a id="tagsSafari607113SourceJavaScriptCorebytecodeOpcodeh"></a>
<div class="modfile"><h4>Modified: tags/Safari-607.1.13/Source/JavaScriptCore/bytecode/Opcode.h (237963 => 237964)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-607.1.13/Source/JavaScriptCore/bytecode/Opcode.h     2018-11-08 01:29:21 UTC (rev 237963)
+++ tags/Safari-607.1.13/Source/JavaScriptCore/bytecode/Opcode.h        2018-11-08 01:29:25 UTC (rev 237964)
</span><span class="lines">@@ -245,9 +245,6 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> unsigned metadataSize(OpcodeID);
</span><del>-#if CPU(NEEDS_ALIGNED_ACCESS)
-unsigned metadataAlignment(OpcodeID);
-#endif
</del><span class="cx"> 
</span><span class="cx"> } // namespace JSC
</span><span class="cx"> 
</span></span></pre></div>
<a id="tagsSafari607113SourceJavaScriptCorebytecodeUnlinkedMetadataTableInlinesh"></a>
<div class="modfile"><h4>Modified: tags/Safari-607.1.13/Source/JavaScriptCore/bytecode/UnlinkedMetadataTableInlines.h (237963 => 237964)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-607.1.13/Source/JavaScriptCore/bytecode/UnlinkedMetadataTableInlines.h       2018-11-08 01:29:21 UTC (rev 237963)
+++ tags/Safari-607.1.13/Source/JavaScriptCore/bytecode/UnlinkedMetadataTableInlines.h  2018-11-08 01:29:25 UTC (rev 237964)
</span><span class="lines">@@ -91,15 +91,8 @@
</span><span class="cx">     unsigned offset = s_offsetTableSize;
</span><span class="cx">     for (unsigned i = 0; i < s_offsetTableEntries - 1; i++) {
</span><span class="cx">         unsigned numberOfEntries = m_buffer[i];
</span><del>-
-        if (numberOfEntries > 0) {
-#if CPU(NEEDS_ALIGNED_ACCESS)
-            offset = roundUpToMultipleOf(metadataAlignment(static_cast<OpcodeID>(i)), offset);
-#endif
-            m_buffer[i] = offset;
-            offset += numberOfEntries * metadataSize(static_cast<OpcodeID>(i));
-        } else
-            m_buffer[i] = offset;
</del><ins>+        m_buffer[i] = offset;
+        offset += numberOfEntries * metadataSize(static_cast<OpcodeID>(i));
</ins><span class="cx">     }
</span><span class="cx">     m_buffer[s_offsetTableEntries - 1] = offset;
</span><span class="cx"> }
</span></span></pre></div>
<a id="tagsSafari607113SourceJavaScriptCoregeneratorSectionrb"></a>
<div class="modfile"><h4>Modified: tags/Safari-607.1.13/Source/JavaScriptCore/generator/Section.rb (237963 => 237964)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-607.1.13/Source/JavaScriptCore/generator/Section.rb  2018-11-08 01:29:21 UTC (rev 237963)
+++ tags/Safari-607.1.13/Source/JavaScriptCore/generator/Section.rb     2018-11-08 01:29:25 UTC (rev 237964)
</span><span class="lines">@@ -81,19 +81,6 @@
</span><span class="cx">               i += 1
</span><span class="cx">           end
</span><span class="cx">           out << "\n"
</span><del>-
-          out.write("#define FOR_EACH_#{config[:macro_name_component]}_METADATA_ALIGNMENT(macro) \\\n")
-          i = 0
-          while true
-              if opcodes[i].metadata.empty?
-                  out << "\n"
-                  break
-              end
-
-              out.write("macro(alignof(#{opcodes[i].capitalized_name}::Metadata))\\\n")
-              i += 1
-          end
-          out << "\n"
</del><span class="cx">       end
</span><span class="cx"> 
</span><span class="cx">       if config[:emit_opcode_id_string_values_in_h_file]
</span></span></pre>
</div>
</div>

</body>
</html>