<!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>[230550] 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/230550">230550</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2018-04-11 15:46:55 -0700 (Wed, 11 Apr 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Build fix] Replace CompactJITCodeMap with JITCodeMap.
https://bugs.webkit.org/show_bug.cgi?id=184512
<rdar://problem/35391728>

Not reviewed.

* bytecode/CodeBlock.h:
* jit/JITCodeMap.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockh">trunk/Source/JavaScriptCore/bytecode/CodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITCodeMaph">trunk/Source/JavaScriptCore/jit/JITCodeMap.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (230549 => 230550)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2018-04-11 22:09:09 UTC (rev 230549)
+++ trunk/Source/JavaScriptCore/ChangeLog       2018-04-11 22:46:55 UTC (rev 230550)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2018-04-11  Mark Lam  <mark.lam@apple.com>
</span><span class="cx"> 
</span><ins>+        [Build fix] Replace CompactJITCodeMap with JITCodeMap.
+        https://bugs.webkit.org/show_bug.cgi?id=184512
+        <rdar://problem/35391728>
+
+        Not reviewed.
+
+        * bytecode/CodeBlock.h:
+        * jit/JITCodeMap.h:
+
+2018-04-11  Mark Lam  <mark.lam@apple.com>
+
</ins><span class="cx">         Replace CompactJITCodeMap with JITCodeMap.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=184512
</span><span class="cx">         <rdar://problem/35391728>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (230549 => 230550)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2018-04-11 22:09:09 UTC (rev 230549)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.h    2018-04-11 22:46:55 UTC (rev 230550)
</span><span class="lines">@@ -301,6 +301,7 @@
</span><span class="cx"> 
</span><span class="cx">     void linkIncomingCall(ExecState* callerFrame, LLIntCallLinkInfo*);
</span><span class="cx"> 
</span><ins>+#if ENABLE(JIT)
</ins><span class="cx">     void setJITCodeMap(JITCodeMap&& jitCodeMap)
</span><span class="cx">     {
</span><span class="cx">         m_jitCodeMap = WTFMove(jitCodeMap);
</span><span class="lines">@@ -309,7 +310,8 @@
</span><span class="cx">     {
</span><span class="cx">         return m_jitCodeMap;
</span><span class="cx">     }
</span><del>-    
</del><ins>+#endif
+
</ins><span class="cx">     typedef JSC::Instruction Instruction;
</span><span class="cx">     typedef PoisonedRefCountedArray<CodeBlockPoison, Instruction>& UnpackedInstructions;
</span><span class="cx"> 
</span><span class="lines">@@ -986,8 +988,8 @@
</span><span class="cx">     SentinelLinkedList<CallLinkInfo, BasicRawSentinelNode<CallLinkInfo>> m_incomingCalls;
</span><span class="cx">     SentinelLinkedList<PolymorphicCallNode, BasicRawSentinelNode<PolymorphicCallNode>> m_incomingPolymorphicCalls;
</span><span class="cx">     std::unique_ptr<PCToCodeOriginMap> m_pcToCodeOriginMap;
</span><ins>+    JITCodeMap m_jitCodeMap;
</ins><span class="cx"> #endif
</span><del>-    JITCodeMap m_jitCodeMap;
</del><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx">     // This is relevant to non-DFG code blocks that serve as the profiled code block
</span><span class="cx">     // for DFG code blocks.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITCodeMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITCodeMap.h (230549 => 230550)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITCodeMap.h     2018-04-11 22:09:09 UTC (rev 230549)
+++ trunk/Source/JavaScriptCore/jit/JITCodeMap.h        2018-04-11 22:46:55 UTC (rev 230550)
</span><span class="lines">@@ -25,6 +25,8 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><ins>+#if ENABLE(JIT)
+
</ins><span class="cx"> #include "CodeLocation.h"
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -76,3 +78,5 @@
</span><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace JSC
</span><ins>+
+#endif // ENABLE(JIT)
</ins></span></pre>
</div>
</div>

</body>
</html>