<!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>[236588] branches/safari-606-branch/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/236588">236588</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2018-09-27 22:07:15 -0700 (Thu, 27 Sep 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/236585">r236585</a>. rdar://problem/44848947

    DFG::OSRExit::m_patchableCodeOffset should not be an int
    https://bugs.webkit.org/show_bug.cgi?id=190066
    <rdar://problem/39498244>
    
    Reviewed by Mark Lam.
    
    dfg/DFGJITCompiler.cpp:
    (JSC::DFG::JITCompiler::linkOSRExits):
    (JSC::DFG::JITCompiler::link):
    
    dfg/DFGOSRExit.cpp:
    (JSC::DFG::OSRExit::codeLocationForRepatch const):
    (JSC::DFG::OSRExit::compileOSRExit):
    (JSC::DFG::OSRExit::setPatchableCodeOffset): Deleted.
    (JSC::DFG::OSRExit::getPatchableCodeOffsetAsJump const): Deleted.
    (JSC::DFG::OSRExit::correctJump): Deleted.
    
    dfg/DFGOSRExit.h:
    dfg/DFGOSRExitCompilationInfo.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari606branchSourceJavaScriptCoreChangeLog">branches/safari-606-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari606branchSourceJavaScriptCoredfgDFGJITCompilercpp">branches/safari-606-branch/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp</a></li>
<li><a href="#branchessafari606branchSourceJavaScriptCoredfgDFGOSRExitcpp">branches/safari-606-branch/Source/JavaScriptCore/dfg/DFGOSRExit.cpp</a></li>
<li><a href="#branchessafari606branchSourceJavaScriptCoredfgDFGOSRExith">branches/safari-606-branch/Source/JavaScriptCore/dfg/DFGOSRExit.h</a></li>
<li><a href="#branchessafari606branchSourceJavaScriptCoredfgDFGOSRExitCompilationInfoh">branches/safari-606-branch/Source/JavaScriptCore/dfg/DFGOSRExitCompilationInfo.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari606branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-606-branch/Source/JavaScriptCore/ChangeLog (236587 => 236588)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606-branch/Source/JavaScriptCore/ChangeLog       2018-09-28 05:07:03 UTC (rev 236587)
+++ branches/safari-606-branch/Source/JavaScriptCore/ChangeLog  2018-09-28 05:07:15 UTC (rev 236588)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2018-09-27  Saam barati  <sbarati@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r236585. rdar://problem/44848947
+
+    DFG::OSRExit::m_patchableCodeOffset should not be an int
+    https://bugs.webkit.org/show_bug.cgi?id=190066
+    <rdar://problem/39498244>
+    
+    Reviewed by Mark Lam.
+    
+    dfg/DFGJITCompiler.cpp:
+    (JSC::DFG::JITCompiler::linkOSRExits):
+    (JSC::DFG::JITCompiler::link):
+    
+    dfg/DFGOSRExit.cpp:
+    (JSC::DFG::OSRExit::codeLocationForRepatch const):
+    (JSC::DFG::OSRExit::compileOSRExit):
+    (JSC::DFG::OSRExit::setPatchableCodeOffset): Deleted.
+    (JSC::DFG::OSRExit::getPatchableCodeOffsetAsJump const): Deleted.
+    (JSC::DFG::OSRExit::correctJump): Deleted.
+    
+    dfg/DFGOSRExit.h:
+    dfg/DFGOSRExitCompilationInfo.h:
+
+2018-09-27  Saam barati  <sbarati@apple.com>
+
</ins><span class="cx">         Cherry-pick r236584. rdar://problem/44848936
</span><span class="cx"> 
</span><span class="cx">    Don't use int offsets in StructureStubInfo
</span></span></pre></div>
<a id="branchessafari606branchSourceJavaScriptCoredfgDFGJITCompilercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-606-branch/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp (236587 => 236588)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606-branch/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp  2018-09-28 05:07:03 UTC (rev 236587)
+++ branches/safari-606-branch/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp     2018-09-28 05:07:15 UTC (rev 236588)
</span><span class="lines">@@ -102,10 +102,8 @@
</span><span class="cx">             addLinkTask([target, osrExitThunkLabel] (LinkBuffer& linkBuffer) {
</span><span class="cx">                 linkBuffer.link(target, osrExitThunkLabel);
</span><span class="cx">             });
</span><del>-        } else {
-            OSRExit& exit = m_jitCode->osrExit[i];
-            exit.setPatchableCodeOffset(patchableJump());
-        }
</del><ins>+        } else
+            info.m_patchableJump = patchableJump();
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -300,9 +298,9 @@
</span><span class="cx">     for (unsigned i = 0; i < m_jitCode->osrExit.size(); ++i) {
</span><span class="cx">         OSRExitCompilationInfo& info = m_exitCompilationInfo[i];
</span><span class="cx">         if (!Options::useProbeOSRExit()) {
</span><ins>+            linkBuffer.link(info.m_patchableJump.m_jump, target);
</ins><span class="cx">             OSRExit& exit = m_jitCode->osrExit[i];
</span><del>-            linkBuffer.link(exit.getPatchableCodeOffsetAsJump(), target);
-            exit.correctJump(linkBuffer);
</del><ins>+            exit.m_patchableJumpLocation = linkBuffer.locationOf<JSInternalPtrTag>(info.m_patchableJump);
</ins><span class="cx">         }
</span><span class="cx">         if (info.m_replacementSource.isSet()) {
</span><span class="cx">             m_jitCode->common.jumpReplacements.append(JumpReplacement(
</span></span></pre></div>
<a id="branchessafari606branchSourceJavaScriptCoredfgDFGOSRExitcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-606-branch/Source/JavaScriptCore/dfg/DFGOSRExit.cpp (236587 => 236588)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606-branch/Source/JavaScriptCore/dfg/DFGOSRExit.cpp      2018-09-28 05:07:03 UTC (rev 236587)
+++ branches/safari-606-branch/Source/JavaScriptCore/dfg/DFGOSRExit.cpp 2018-09-28 05:07:15 UTC (rev 236588)
</span><span class="lines">@@ -921,28 +921,11 @@
</span><span class="cx">     DFG_ASSERT(jit->m_jit.graph(), jit->m_currentNode, canExit);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void OSRExit::setPatchableCodeOffset(MacroAssembler::PatchableJump check)
</del><ins>+CodeLocationJump<JSInternalPtrTag> OSRExit::codeLocationForRepatch() const
</ins><span class="cx"> {
</span><del>-    m_patchableCodeOffset = check.m_jump.m_label.m_offset;
</del><ins>+    return CodeLocationJump<JSInternalPtrTag>(m_patchableJumpLocation);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-MacroAssembler::Jump OSRExit::getPatchableCodeOffsetAsJump() const
-{
-    return MacroAssembler::Jump(AssemblerLabel(m_patchableCodeOffset));
-}
-
-CodeLocationJump<JSInternalPtrTag> OSRExit::codeLocationForRepatch(CodeBlock* dfgCodeBlock) const
-{
-    return CodeLocationJump<JSInternalPtrTag>(tagCodePtr<JSInternalPtrTag>(dfgCodeBlock->jitCode()->dataAddressAtOffset(m_patchableCodeOffset)));
-}
-
-void OSRExit::correctJump(LinkBuffer& linkBuffer)
-{
-    MacroAssembler::Label label;
-    label.m_label.m_offset = m_patchableCodeOffset;
-    m_patchableCodeOffset = linkBuffer.offsetOf(label);
-}
-
</del><span class="cx"> void OSRExit::emitRestoreArguments(CCallHelpers& jit, const Operands<ValueRecovery>& operands)
</span><span class="cx"> {
</span><span class="cx">     HashMap<MinifiedID, int> alreadyAllocatedArguments; // Maps phantom arguments node ID to operand.
</span><span class="lines">@@ -1082,7 +1065,7 @@
</span><span class="cx">                 toCString(ignoringContext<DumpContext>(operands)).data());
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    MacroAssembler::repatchJump(exit.codeLocationForRepatch(codeBlock), CodeLocationLabel<OSRExitPtrTag>(exit.m_code.code()));
</del><ins>+    MacroAssembler::repatchJump(exit.codeLocationForRepatch(), CodeLocationLabel<OSRExitPtrTag>(exit.m_code.code()));
</ins><span class="cx"> 
</span><span class="cx">     vm->osrExitJumpDestination = exit.m_code.code().executableAddress();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari606branchSourceJavaScriptCoredfgDFGOSRExith"></a>
<div class="modfile"><h4>Modified: branches/safari-606-branch/Source/JavaScriptCore/dfg/DFGOSRExit.h (236587 => 236588)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606-branch/Source/JavaScriptCore/dfg/DFGOSRExit.h        2018-09-28 05:07:03 UTC (rev 236587)
+++ branches/safari-606-branch/Source/JavaScriptCore/dfg/DFGOSRExit.h   2018-09-28 05:07:15 UTC (rev 236588)
</span><span class="lines">@@ -145,8 +145,7 @@
</span><span class="cx">     static void JIT_OPERATION compileOSRExit(ExecState*) WTF_INTERNAL;
</span><span class="cx">     static void executeOSRExit(Probe::Context&);
</span><span class="cx"> 
</span><del>-    // FIXME: <rdar://problem/39498244>.
-    unsigned m_patchableCodeOffset { 0 };
</del><ins>+    CodeLocationLabel<JSInternalPtrTag> m_patchableJumpLocation;
</ins><span class="cx">     MacroAssemblerCodeRef<OSRExitPtrTag> m_code;
</span><span class="cx"> 
</span><span class="cx">     RefPtr<OSRExitState> exitState;
</span><span class="lines">@@ -156,10 +155,7 @@
</span><span class="cx">     
</span><span class="cx">     unsigned m_recoveryIndex;
</span><span class="cx"> 
</span><del>-    void setPatchableCodeOffset(MacroAssembler::PatchableJump);
-    MacroAssembler::Jump getPatchableCodeOffsetAsJump() const;
-    CodeLocationJump<JSInternalPtrTag> codeLocationForRepatch(CodeBlock*) const;
-    void correctJump(LinkBuffer&);
</del><ins>+    CodeLocationJump<JSInternalPtrTag> codeLocationForRepatch() const;
</ins><span class="cx"> 
</span><span class="cx">     unsigned m_streamIndex;
</span><span class="cx">     void considerAddingAsFrequentExitSite(CodeBlock* profiledCodeBlock)
</span></span></pre></div>
<a id="branchessafari606branchSourceJavaScriptCoredfgDFGOSRExitCompilationInfoh"></a>
<div class="modfile"><h4>Modified: branches/safari-606-branch/Source/JavaScriptCore/dfg/DFGOSRExitCompilationInfo.h (236587 => 236588)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606-branch/Source/JavaScriptCore/dfg/DFGOSRExitCompilationInfo.h 2018-09-28 05:07:03 UTC (rev 236587)
+++ branches/safari-606-branch/Source/JavaScriptCore/dfg/DFGOSRExitCompilationInfo.h    2018-09-28 05:07:15 UTC (rev 236588)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx">     MacroAssembler::JumpList m_failureJumps;
</span><span class="cx">     MacroAssembler::Label m_replacementSource;
</span><span class="cx">     MacroAssembler::Label m_replacementDestination;
</span><ins>+    MacroAssembler::PatchableJump m_patchableJump;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } } // namespace JSC::DFG
</span></span></pre>
</div>
</div>

</body>
</html>