<!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>[248686] 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/248686">248686</a></dd>
<dt>Author</dt> <dd>ysuzuki@apple.com</dd>
<dt>Date</dt> <dd>2019-08-14 13:15:04 -0700 (Wed, 14 Aug 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[JSC] Make PAC jump and return more explicit
https://bugs.webkit.org/show_bug.cgi?id=200703

Reviewed by Mark Lam.

This patch refactors our macro assembler, mainly related to PAC.

1. Make far-jump explicit by renaming `jump` to `farJump`.
2. Remove unused makeTailRecursiveCall and tailRecursiveCall.
3. Do not make `ARM64EAssembler::ret` as `retab`. MacroAssemblerARM64E should call `retab` explicitly instead.

* assembler/ARM64EAssembler.h:
(JSC::ARM64EAssembler::ret): Deleted.
* assembler/MacroAssembler.h:
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::farJump):
(JSC::MacroAssemblerARM64::makeTailRecursiveCall): Deleted.
(JSC::MacroAssemblerARM64::tailRecursiveCall): Deleted.
* assembler/MacroAssemblerARM64E.h:
(JSC::MacroAssemblerARM64E::farJump):
(JSC::MacroAssemblerARM64E::ret):
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::farJump):
(JSC::MacroAssemblerARMv7::relativeTableJump):
(JSC::MacroAssemblerARMv7::tailRecursiveCall): Deleted.
(JSC::MacroAssemblerARMv7::makeTailRecursiveCall): Deleted.
* assembler/MacroAssemblerMIPS.h:
(JSC::MacroAssemblerMIPS::farJump):
(JSC::MacroAssemblerMIPS::tailRecursiveCall): Deleted.
(JSC::MacroAssemblerMIPS::makeTailRecursiveCall): Deleted.
* assembler/MacroAssemblerX86.h:
(JSC::MacroAssemblerX86::farJump):
(JSC::MacroAssemblerX86::jump): Deleted.
(JSC::MacroAssemblerX86::tailRecursiveCall): Deleted.
(JSC::MacroAssemblerX86::makeTailRecursiveCall): Deleted.
* assembler/MacroAssemblerX86Common.h:
(JSC::MacroAssemblerX86Common::farJump):
* assembler/MacroAssemblerX86_64.h:
(JSC::MacroAssemblerX86_64::farJump):
(JSC::MacroAssemblerX86_64::jump): Deleted.
(JSC::MacroAssemblerX86_64::tailRecursiveCall): Deleted.
(JSC::MacroAssemblerX86_64::makeTailRecursiveCall): Deleted.
* b3/B3LowerMacros.cpp:
* b3/testb3_6.cpp:
(testInterpreter):
* dfg/DFGOSRExitCompilerCommon.cpp:
(JSC::DFG::adjustAndJumpToTarget):
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::emitSwitchIntJump):
(JSC::DFG::SpeculativeJIT::emitSwitchImm):
(JSC::DFG::SpeculativeJIT::emitSwitchStringOnString):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGThunks.cpp:
(JSC::DFG::osrExitGenerationThunkGenerator):
(JSC::DFG::osrEntryThunkGenerator):
* jit/CCallHelpers.h:
(JSC::CCallHelpers::jumpToExceptionHandler):
* jit/JIT.cpp:
(JSC::JIT::emitEnterOptimizationCheck):
* jit/JITOpcodes.cpp:
(JSC::JIT::emit_op_catch):
(JSC::JIT::emit_op_switch_imm):
(JSC::JIT::emit_op_switch_char):
(JSC::JIT::emit_op_switch_string):
(JSC::JIT::emitSlow_op_loop_hint):
* jit/JITOpcodes32_64.cpp:
(JSC::JIT::emit_op_catch):
(JSC::JIT::emit_op_switch_imm):
(JSC::JIT::emit_op_switch_char):
(JSC::JIT::emit_op_switch_string):
* jit/ThunkGenerators.cpp:
(JSC::slowPathFor):
(JSC::virtualThunkFor):
* llint/LLIntThunks.cpp:
(JSC::LLInt::generateThunkWithJumpTo):
* wasm/WasmBinding.cpp:
(JSC::Wasm::wasmToWasm):
* wasm/WasmThunks.cpp:
(JSC::Wasm::throwExceptionFromWasmThunkGenerator):
* wasm/js/WasmToJS.cpp:
(JSC::Wasm::emitThrowWasmToJSException):
* yarr/YarrJIT.cpp:
(JSC::Yarr::YarrGenerator::loadFromFrameAndJump):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARM64EAssemblerh">trunk/Source/JavaScriptCore/assembler/ARM64EAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerh">trunk/Source/JavaScriptCore/assembler/MacroAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64Eh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64E.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerMIPSh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86_64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3LowerMacroscpp">trunk/Source/JavaScriptCore/b3/B3LowerMacros.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3testb3_6cpp">trunk/Source/JavaScriptCore/b3/testb3_6.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGOSRExitCompilerCommoncpp">trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGThunkscpp">trunk/Source/JavaScriptCore/dfg/DFGThunks.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitCCallHelpersh">trunk/Source/JavaScriptCore/jit/CCallHelpers.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITcpp">trunk/Source/JavaScriptCore/jit/JIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodescpp">trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodes32_64cpp">trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitThunkGeneratorscpp">trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntThunkscpp">trunk/Source/JavaScriptCore/llint/LLIntThunks.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmBindingcpp">trunk/Source/JavaScriptCore/wasm/WasmBinding.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmThunkscpp">trunk/Source/JavaScriptCore/wasm/WasmThunks.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmjsWasmToJScpp">trunk/Source/JavaScriptCore/wasm/js/WasmToJS.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreyarrYarrJITcpp">trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/ChangeLog       2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -1,3 +1,90 @@
</span><ins>+2019-08-14  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Make PAC jump and return more explicit
+        https://bugs.webkit.org/show_bug.cgi?id=200703
+
+        Reviewed by Mark Lam.
+
+        This patch refactors our macro assembler, mainly related to PAC.
+
+        1. Make far-jump explicit by renaming `jump` to `farJump`.
+        2. Remove unused makeTailRecursiveCall and tailRecursiveCall.
+        3. Do not make `ARM64EAssembler::ret` as `retab`. MacroAssemblerARM64E should call `retab` explicitly instead.
+
+        * assembler/ARM64EAssembler.h:
+        (JSC::ARM64EAssembler::ret): Deleted.
+        * assembler/MacroAssembler.h:
+        * assembler/MacroAssemblerARM64.h:
+        (JSC::MacroAssemblerARM64::farJump):
+        (JSC::MacroAssemblerARM64::makeTailRecursiveCall): Deleted.
+        (JSC::MacroAssemblerARM64::tailRecursiveCall): Deleted.
+        * assembler/MacroAssemblerARM64E.h:
+        (JSC::MacroAssemblerARM64E::farJump):
+        (JSC::MacroAssemblerARM64E::ret):
+        * assembler/MacroAssemblerARMv7.h:
+        (JSC::MacroAssemblerARMv7::farJump):
+        (JSC::MacroAssemblerARMv7::relativeTableJump):
+        (JSC::MacroAssemblerARMv7::tailRecursiveCall): Deleted.
+        (JSC::MacroAssemblerARMv7::makeTailRecursiveCall): Deleted.
+        * assembler/MacroAssemblerMIPS.h:
+        (JSC::MacroAssemblerMIPS::farJump):
+        (JSC::MacroAssemblerMIPS::tailRecursiveCall): Deleted.
+        (JSC::MacroAssemblerMIPS::makeTailRecursiveCall): Deleted.
+        * assembler/MacroAssemblerX86.h:
+        (JSC::MacroAssemblerX86::farJump):
+        (JSC::MacroAssemblerX86::jump): Deleted.
+        (JSC::MacroAssemblerX86::tailRecursiveCall): Deleted.
+        (JSC::MacroAssemblerX86::makeTailRecursiveCall): Deleted.
+        * assembler/MacroAssemblerX86Common.h:
+        (JSC::MacroAssemblerX86Common::farJump):
+        * assembler/MacroAssemblerX86_64.h:
+        (JSC::MacroAssemblerX86_64::farJump):
+        (JSC::MacroAssemblerX86_64::jump): Deleted.
+        (JSC::MacroAssemblerX86_64::tailRecursiveCall): Deleted.
+        (JSC::MacroAssemblerX86_64::makeTailRecursiveCall): Deleted.
+        * b3/B3LowerMacros.cpp:
+        * b3/testb3_6.cpp:
+        (testInterpreter):
+        * dfg/DFGOSRExitCompilerCommon.cpp:
+        (JSC::DFG::adjustAndJumpToTarget):
+        * dfg/DFGSpeculativeJIT.cpp:
+        (JSC::DFG::SpeculativeJIT::emitSwitchIntJump):
+        (JSC::DFG::SpeculativeJIT::emitSwitchImm):
+        (JSC::DFG::SpeculativeJIT::emitSwitchStringOnString):
+        * dfg/DFGSpeculativeJIT64.cpp:
+        (JSC::DFG::SpeculativeJIT::compile):
+        * dfg/DFGThunks.cpp:
+        (JSC::DFG::osrExitGenerationThunkGenerator):
+        (JSC::DFG::osrEntryThunkGenerator):
+        * jit/CCallHelpers.h:
+        (JSC::CCallHelpers::jumpToExceptionHandler):
+        * jit/JIT.cpp:
+        (JSC::JIT::emitEnterOptimizationCheck):
+        * jit/JITOpcodes.cpp:
+        (JSC::JIT::emit_op_catch):
+        (JSC::JIT::emit_op_switch_imm):
+        (JSC::JIT::emit_op_switch_char):
+        (JSC::JIT::emit_op_switch_string):
+        (JSC::JIT::emitSlow_op_loop_hint):
+        * jit/JITOpcodes32_64.cpp:
+        (JSC::JIT::emit_op_catch):
+        (JSC::JIT::emit_op_switch_imm):
+        (JSC::JIT::emit_op_switch_char):
+        (JSC::JIT::emit_op_switch_string):
+        * jit/ThunkGenerators.cpp:
+        (JSC::slowPathFor):
+        (JSC::virtualThunkFor):
+        * llint/LLIntThunks.cpp:
+        (JSC::LLInt::generateThunkWithJumpTo):
+        * wasm/WasmBinding.cpp:
+        (JSC::Wasm::wasmToWasm):
+        * wasm/WasmThunks.cpp:
+        (JSC::Wasm::throwExceptionFromWasmThunkGenerator):
+        * wasm/js/WasmToJS.cpp:
+        (JSC::Wasm::emitThrowWasmToJSException):
+        * yarr/YarrJIT.cpp:
+        (JSC::Yarr::YarrGenerator::loadFromFrameAndJump):
+
</ins><span class="cx"> 2019-08-14  Joseph Pecoraro  <pecoraro@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Remove bad semicolon in generation of ObjC methods
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARM64EAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARM64EAssembler.h (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARM64EAssembler.h  2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/assembler/ARM64EAssembler.h     2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -366,15 +366,6 @@
</span><span class="cx">         return readPointer(reinterpret_cast<int*>(from) - callInstruction - NUMBER_OF_ADDRESS_ENCODING_INSTRUCTIONS);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    ALWAYS_INLINE void ret() { retab(); }
-
-    // Needed because we need to call our overloaded ret() above.
-    ALWAYS_INLINE void ret(RegisterID rn)
-    {
-        RELEASE_ASSERT(rn == ARM64Registers::lr);
-        ret();
-    }
-
</del><span class="cx">     static constexpr ptrdiff_t MAX_POINTER_BITS = 64;
</span><span class="cx">     static constexpr ptrdiff_t BITS_ENCODEABLE_PER_INSTRUCTION = 16;
</span><span class="cx">     static constexpr ptrdiff_t NUMBER_OF_ADDRESS_ENCODING_INSTRUCTIONS = MAX_POINTER_BITS / BITS_ENCODEABLE_PER_INSTRUCTION;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssembler.h (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssembler.h   2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssembler.h      2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -128,6 +128,7 @@
</span><span class="cx"> 
</span><span class="cx">     using MacroAssemblerBase::pop;
</span><span class="cx">     using MacroAssemblerBase::jump;
</span><ins>+    using MacroAssemblerBase::farJump;
</ins><span class="cx">     using MacroAssemblerBase::branch32;
</span><span class="cx">     using MacroAssemblerBase::compare32;
</span><span class="cx">     using MacroAssemblerBase::move;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h      2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -3199,24 +3199,24 @@
</span><span class="cx">         return Jump(label, m_makeJumpPatchable ? Assembler::JumpNoConditionFixedSize : Assembler::JumpNoCondition);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void jump(RegisterID target, PtrTag)
</del><ins>+    void farJump(RegisterID target, PtrTag)
</ins><span class="cx">     {
</span><span class="cx">         m_assembler.br(target);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void jump(Address address, PtrTag)
</del><ins>+    void farJump(Address address, PtrTag)
</ins><span class="cx">     {
</span><span class="cx">         load64(address, getCachedDataTempRegisterIDAndInvalidate());
</span><span class="cx">         m_assembler.br(dataTempRegister);
</span><span class="cx">     }
</span><span class="cx">     
</span><del>-    void jump(BaseIndex address, PtrTag)
</del><ins>+    void farJump(BaseIndex address, PtrTag)
</ins><span class="cx">     {
</span><span class="cx">         load64(address, getCachedDataTempRegisterIDAndInvalidate());
</span><span class="cx">         m_assembler.br(dataTempRegister);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void jump(AbsoluteAddress address, PtrTag)
</del><ins>+    void farJump(AbsoluteAddress address, PtrTag)
</ins><span class="cx">     {
</span><span class="cx">         move(TrustedImmPtr(address.m_ptr), getCachedDataTempRegisterIDAndInvalidate());
</span><span class="cx">         load64(Address(dataTempRegister), dataTempRegister);
</span><span class="lines">@@ -3223,17 +3223,11 @@
</span><span class="cx">         m_assembler.br(dataTempRegister);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    ALWAYS_INLINE void jump(RegisterID target, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(target, NoPtrTag); }
-    ALWAYS_INLINE void jump(Address address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
-    ALWAYS_INLINE void jump(BaseIndex address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
-    ALWAYS_INLINE void jump(AbsoluteAddress address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
</del><ins>+    ALWAYS_INLINE void farJump(RegisterID target, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), farJump(target, NoPtrTag); }
+    ALWAYS_INLINE void farJump(Address address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), farJump(address, NoPtrTag); }
+    ALWAYS_INLINE void farJump(BaseIndex address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), farJump(address, NoPtrTag); }
+    ALWAYS_INLINE void farJump(AbsoluteAddress address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), farJump(address, NoPtrTag); }
</ins><span class="cx"> 
</span><del>-    ALWAYS_INLINE Call makeTailRecursiveCall(Jump oldJump)
-    {
-        oldJump.link(this);
-        return tailRecursiveCall();
-    }
-
</del><span class="cx">     ALWAYS_INLINE Call nearCall()
</span><span class="cx">     {
</span><span class="cx">         m_assembler.bl();
</span><span class="lines">@@ -3258,18 +3252,6 @@
</span><span class="cx">         m_assembler.ret();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    ALWAYS_INLINE Call tailRecursiveCall()
-    {
-        // Like a normal call, but don't link.
-        AssemblerLabel pointerLabel = m_assembler.label();
-        moveWithFixedWidth(TrustedImmPtr(nullptr), getCachedDataTempRegisterIDAndInvalidate());
-        m_assembler.br(dataTempRegister);
-        AssemblerLabel callLabel = m_assembler.label();
-        ASSERT_UNUSED(pointerLabel, Assembler::getDifferenceBetweenLabels(callLabel, pointerLabel) == REPATCH_OFFSET_CALL_TO_POINTER);
-        return Call(callLabel, Call::Linkable);
-    }
-
-
</del><span class="cx">     // Comparisons operations
</span><span class="cx"> 
</span><span class="cx">     void compare32(RelationalCondition cond, RegisterID left, RegisterID right, RegisterID dest)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64Eh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64E.h (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64E.h     2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64E.h        2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> 
</span><span class="cx">     ALWAYS_INLINE Jump jump() { return MacroAssemblerARM64::jump(); }
</span><span class="cx"> 
</span><del>-    void jump(RegisterID target, PtrTag tag)
</del><ins>+    void farJump(RegisterID target, PtrTag tag)
</ins><span class="cx">     {
</span><span class="cx">         if (tag == NoPtrTag)
</span><span class="cx">             return MacroAssemblerARM64::jump(target, tag);
</span><span class="lines">@@ -201,13 +201,13 @@
</span><span class="cx">         jump(target, diversityGPR);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void jump(RegisterID target, RegisterID tag)
</del><ins>+    void farJump(RegisterID target, RegisterID tag)
</ins><span class="cx">     {
</span><span class="cx">         ASSERT(tag != target);
</span><span class="cx">         m_assembler.brab(target, tag);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void jump(Address address, PtrTag tag)
</del><ins>+    void farJump(Address address, PtrTag tag)
</ins><span class="cx">     {
</span><span class="cx">         if (tag == NoPtrTag)
</span><span class="cx">             return MacroAssemblerARM64::jump(address, tag);
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx">         m_assembler.brab(targetGPR, diversityGPR);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void jump(Address address, RegisterID tag)
</del><ins>+    void farJump(Address address, RegisterID tag)
</ins><span class="cx">     {
</span><span class="cx">         RegisterID targetGPR = getCachedDataTempRegisterIDAndInvalidate();
</span><span class="cx">         ASSERT(tag != targetGPR);
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx">         m_assembler.brab(targetGPR, tag);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void jump(BaseIndex address, PtrTag tag)
</del><ins>+    void farJump(BaseIndex address, PtrTag tag)
</ins><span class="cx">     {
</span><span class="cx">         if (tag == NoPtrTag)
</span><span class="cx">             return MacroAssemblerARM64::jump(address, tag);
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx">         m_assembler.brab(targetGPR, diversityGPR);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void jump(BaseIndex address, RegisterID tag)
</del><ins>+    void farJump(BaseIndex address, RegisterID tag)
</ins><span class="cx">     {
</span><span class="cx">         RegisterID targetGPR = getCachedDataTempRegisterIDAndInvalidate();
</span><span class="cx">         ASSERT(tag != targetGPR);
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx">         m_assembler.brab(targetGPR, tag);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void jump(AbsoluteAddress address, PtrTag tag)
</del><ins>+    void farJump(AbsoluteAddress address, PtrTag tag)
</ins><span class="cx">     {
</span><span class="cx">         if (tag == NoPtrTag)
</span><span class="cx">             return MacroAssemblerARM64::jump(address, tag);
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx">         m_assembler.brab(targetGPR, diversityGPR);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void jump(AbsoluteAddress address, RegisterID tag)
</del><ins>+    void farJump(AbsoluteAddress address, RegisterID tag)
</ins><span class="cx">     {
</span><span class="cx">         RegisterID targetGPR = getCachedDataTempRegisterIDAndInvalidate();
</span><span class="cx">         ASSERT(tag != targetGPR);
</span><span class="lines">@@ -270,6 +270,11 @@
</span><span class="cx">         load64(Address(targetGPR), targetGPR);
</span><span class="cx">         m_assembler.brab(targetGPR, tag);
</span><span class="cx">     }
</span><ins>+
+    ALWAYS_INLINE void ret()
+    {
+        m_assembler.retab();
+    }
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h      2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -1631,19 +1631,19 @@
</span><span class="cx">         return branchTest32(cond, addressTempRegister, mask8);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void jump(RegisterID target, PtrTag)
</del><ins>+    void farJump(RegisterID target, PtrTag)
</ins><span class="cx">     {
</span><span class="cx">         m_assembler.bx(target);
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     // Address is a memory location containing the address to jump to
</span><del>-    void jump(Address address, PtrTag)
</del><ins>+    void farJump(Address address, PtrTag)
</ins><span class="cx">     {
</span><span class="cx">         load32(address, dataTempRegister);
</span><span class="cx">         m_assembler.bx(dataTempRegister);
</span><span class="cx">     }
</span><span class="cx">     
</span><del>-    void jump(AbsoluteAddress address, PtrTag)
</del><ins>+    void farJump(AbsoluteAddress address, PtrTag)
</ins><span class="cx">     {
</span><span class="cx">         move(TrustedImmPtr(address.m_ptr), dataTempRegister);
</span><span class="cx">         load32(Address(dataTempRegister), dataTempRegister);
</span><span class="lines">@@ -1650,9 +1650,9 @@
</span><span class="cx">         m_assembler.bx(dataTempRegister);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    ALWAYS_INLINE void jump(RegisterID target, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(target, NoPtrTag); }
-    ALWAYS_INLINE void jump(Address address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
-    ALWAYS_INLINE void jump(AbsoluteAddress address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
</del><ins>+    ALWAYS_INLINE void farJump(RegisterID target, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), farJump(target, NoPtrTag); }
+    ALWAYS_INLINE void farJump(Address address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), farJump(address, NoPtrTag); }
+    ALWAYS_INLINE void farJump(AbsoluteAddress address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), farJump(address, NoPtrTag); }
</ins><span class="cx"> 
</span><span class="cx">     // Arithmetic control flow operations:
</span><span class="cx">     //
</span><span class="lines">@@ -1798,7 +1798,7 @@
</span><span class="cx"> 
</span><span class="cx">         ShiftTypeAndAmount shift(SRType_LSL, scale);
</span><span class="cx">         m_assembler.add(dataTempRegister, dataTempRegister, index, shift);
</span><del>-        jump(dataTempRegister, NoPtrTag);
</del><ins>+        farJump(dataTempRegister, NoPtrTag);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     // Miscellaneous operations:
</span><span class="lines">@@ -2007,20 +2007,6 @@
</span><span class="cx">     }
</span><span class="cx">     ALWAYS_INLINE DataLabelPtr storePtrWithPatch(ImplicitAddress address) { return storePtrWithPatch(TrustedImmPtr(nullptr), address); }
</span><span class="cx"> 
</span><del>-
-    ALWAYS_INLINE Call tailRecursiveCall()
-    {
-        // Like a normal call, but don't link.
-        moveFixedWidthEncoding(TrustedImm32(0), dataTempRegister);
-        return Call(m_assembler.bx(dataTempRegister), Call::Linkable);
-    }
-
-    ALWAYS_INLINE Call makeTailRecursiveCall(Jump oldJump)
-    {
-        oldJump.link(this);
-        return tailRecursiveCall();
-    }
-
</del><span class="cx">     template<PtrTag resultTag, PtrTag locationTag>
</span><span class="cx">     static FunctionPtr<resultTag> readCallTarget(CodeLocationCall<locationTag> call)
</span><span class="cx">     {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerMIPSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h       2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h  2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -1921,7 +1921,7 @@
</span><span class="cx">         return branchEqual(MIPSRegisters::zero, MIPSRegisters::zero);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void jump(RegisterID target, PtrTag)
</del><ins>+    void farJump(RegisterID target, PtrTag)
</ins><span class="cx">     {
</span><span class="cx">         move(target, MIPSRegisters::t9);
</span><span class="cx">         m_assembler.jr(MIPSRegisters::t9);
</span><span class="lines">@@ -1928,7 +1928,7 @@
</span><span class="cx">         m_assembler.nop();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void jump(Address address, PtrTag)
</del><ins>+    void farJump(Address address, PtrTag)
</ins><span class="cx">     {
</span><span class="cx">         m_fixedWidth = true;
</span><span class="cx">         load32(address, MIPSRegisters::t9);
</span><span class="lines">@@ -1937,7 +1937,7 @@
</span><span class="cx">         m_fixedWidth = false;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void jump(AbsoluteAddress address, PtrTag)
</del><ins>+    void farJump(AbsoluteAddress address, PtrTag)
</ins><span class="cx">     {
</span><span class="cx">         m_fixedWidth = true;
</span><span class="cx">         load32(address.m_ptr, MIPSRegisters::t9);
</span><span class="lines">@@ -1946,9 +1946,9 @@
</span><span class="cx">         m_fixedWidth = false;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    ALWAYS_INLINE void jump(RegisterID target, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(target, NoPtrTag); }
-    ALWAYS_INLINE void jump(Address address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
-    ALWAYS_INLINE void jump(AbsoluteAddress address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
</del><ins>+    ALWAYS_INLINE void farJump(RegisterID target, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), farJump(target, NoPtrTag); }
+    ALWAYS_INLINE void farJump(Address address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), farJump(address, NoPtrTag); }
+    ALWAYS_INLINE void farJump(AbsoluteAddress address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), farJump(address, NoPtrTag); }
</ins><span class="cx"> 
</span><span class="cx">     void moveDoubleToInts(FPRegisterID src, RegisterID dest1, RegisterID dest2)
</span><span class="cx">     {
</span><span class="lines">@@ -2704,23 +2704,6 @@
</span><span class="cx">         return storePtrWithPatch(TrustedImmPtr(nullptr), address);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    Call tailRecursiveCall()
-    {
-        // Like a normal call, but don't update the returned address register
-        m_fixedWidth = true;
-        move(TrustedImm32(0), MIPSRegisters::t9);
-        m_assembler.jr(MIPSRegisters::t9);
-        m_assembler.nop();
-        m_fixedWidth = false;
-        return Call(m_assembler.label(), Call::Linkable);
-    }
-
-    Call makeTailRecursiveCall(Jump oldJump)
-    {
-        oldJump.link(this);
-        return tailRecursiveCall();
-    }
-
</del><span class="cx">     void loadFloat(BaseIndex address, FPRegisterID dest)
</span><span class="cx">     {
</span><span class="cx">         if (!m_fixedWidth) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h        2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h   2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx">     using MacroAssemblerX86Common::branch32;
</span><span class="cx">     using MacroAssemblerX86Common::call;
</span><span class="cx">     using MacroAssemblerX86Common::jump;
</span><ins>+    using MacroAssemblerX86Common::farJump;
</ins><span class="cx">     using MacroAssemblerX86Common::addDouble;
</span><span class="cx">     using MacroAssemblerX86Common::loadDouble;
</span><span class="cx">     using MacroAssemblerX86Common::storeDouble;
</span><span class="lines">@@ -219,24 +220,13 @@
</span><span class="cx">     ALWAYS_INLINE Call call(RegisterID callTag) { return UNUSED_PARAM(callTag), call(NoPtrTag); }
</span><span class="cx"> 
</span><span class="cx">     // Address is a memory location containing the address to jump to
</span><del>-    void jump(AbsoluteAddress address, PtrTag)
</del><ins>+    void farJump(AbsoluteAddress address, PtrTag)
</ins><span class="cx">     {
</span><span class="cx">         m_assembler.jmp_m(address.m_ptr);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    ALWAYS_INLINE void jump(AbsoluteAddress address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
</del><ins>+    ALWAYS_INLINE void farJump(AbsoluteAddress address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), farJump(address, NoPtrTag); }
</ins><span class="cx"> 
</span><del>-    Call tailRecursiveCall()
-    {
-        return Call::fromTailJump(jump());
-    }
-
-    Call makeTailRecursiveCall(Jump oldJump)
-    {
-        return Call::fromTailJump(oldJump);
-    }
-
-
</del><span class="cx">     DataLabelPtr moveWithPatch(TrustedImmPtr initialValue, RegisterID dest)
</span><span class="cx">     {
</span><span class="cx">         padBeforePatch();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h  2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h     2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -2745,26 +2745,26 @@
</span><span class="cx">         return Jump(m_assembler.jmp());
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void jump(RegisterID target, PtrTag)
</del><ins>+    void farJump(RegisterID target, PtrTag)
</ins><span class="cx">     {
</span><span class="cx">         m_assembler.jmp_r(target);
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     // Address is a memory location containing the address to jump to
</span><del>-    void jump(Address address, PtrTag)
</del><ins>+    void farJump(Address address, PtrTag)
</ins><span class="cx">     {
</span><span class="cx">         m_assembler.jmp_m(address.offset, address.base);
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     // Address is a memory location containing the address to jump to
</span><del>-    void jump(BaseIndex address, PtrTag)
</del><ins>+    void farJump(BaseIndex address, PtrTag)
</ins><span class="cx">     {
</span><span class="cx">         m_assembler.jmp_m(address.offset, address.base, address.index, address.scale);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    ALWAYS_INLINE void jump(RegisterID target, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(target, NoPtrTag); }
-    ALWAYS_INLINE void jump(Address address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
-    ALWAYS_INLINE void jump(BaseIndex address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
</del><ins>+    ALWAYS_INLINE void farJump(RegisterID target, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), farJump(target, NoPtrTag); }
+    ALWAYS_INLINE void farJump(Address address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), farJump(address, NoPtrTag); }
+    ALWAYS_INLINE void farJump(BaseIndex address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), farJump(address, NoPtrTag); }
</ins><span class="cx"> 
</span><span class="cx">     // Arithmetic control flow operations:
</span><span class="cx">     //
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86_64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h     2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h        2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx">     using MacroAssemblerX86Common::store8;
</span><span class="cx">     using MacroAssemblerX86Common::call;
</span><span class="cx">     using MacroAssemblerX86Common::jump;
</span><ins>+    using MacroAssemblerX86Common::farJump;
</ins><span class="cx">     using MacroAssemblerX86Common::addDouble;
</span><span class="cx">     using MacroAssemblerX86Common::loadDouble;
</span><span class="cx">     using MacroAssemblerX86Common::convertInt32ToDouble;
</span><span class="lines">@@ -243,31 +244,14 @@
</span><span class="cx">     ALWAYS_INLINE Call call(RegisterID callTag) { return UNUSED_PARAM(callTag), call(NoPtrTag); }
</span><span class="cx"> 
</span><span class="cx">     // Address is a memory location containing the address to jump to
</span><del>-    void jump(AbsoluteAddress address, PtrTag tag)
</del><ins>+    void farJump(AbsoluteAddress address, PtrTag tag)
</ins><span class="cx">     {
</span><span class="cx">         move(TrustedImmPtr(address.m_ptr), scratchRegister());
</span><del>-        jump(Address(scratchRegister()), tag);
</del><ins>+        farJump(Address(scratchRegister()), tag);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><del>-    ALWAYS_INLINE void jump(AbsoluteAddress address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
</del><ins>+    ALWAYS_INLINE void farJump(AbsoluteAddress address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), farJump(address, NoPtrTag); }
</ins><span class="cx"> 
</span><del>-    Call tailRecursiveCall()
-    {
-        DataLabelPtr label = moveWithPatch(TrustedImmPtr(nullptr), scratchRegister());
-        Jump newJump = Jump(m_assembler.jmp_r(scratchRegister()));
-        ASSERT_UNUSED(label, differenceBetween(label, newJump) == REPATCH_OFFSET_CALL_R11);
-        return Call::fromTailJump(newJump);
-    }
-
-    Call makeTailRecursiveCall(Jump oldJump)
-    {
-        oldJump.link(this);
-        DataLabelPtr label = moveWithPatch(TrustedImmPtr(nullptr), scratchRegister());
-        Jump newJump = Jump(m_assembler.jmp_r(scratchRegister()));
-        ASSERT_UNUSED(label, differenceBetween(label, newJump) == REPATCH_OFFSET_CALL_R11);
-        return Call::fromTailJump(newJump);
-    }
-
</del><span class="cx">     Call threadSafePatchableNearCall()
</span><span class="cx">     {
</span><span class="cx">         const size_t nearCallOpcodeSize = 1;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3LowerMacroscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3LowerMacros.cpp (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3LowerMacros.cpp 2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/b3/B3LowerMacros.cpp    2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -540,7 +540,7 @@
</span><span class="cx"> 
</span><span class="cx">                         jit.move(CCallHelpers::TrustedImmPtr(jumpTable), scratch);
</span><span class="cx">                         jit.load64(CCallHelpers::BaseIndex(scratch, index, CCallHelpers::timesPtr()), scratch);
</span><del>-                        jit.jump(scratch, JSSwitchPtrTag);
</del><ins>+                        jit.farJump(scratch, JSSwitchPtrTag);
</ins><span class="cx"> 
</span><span class="cx">                         // These labels are guaranteed to be populated before either late paths or
</span><span class="cx">                         // link tasks run.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3_6cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3_6.cpp (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3_6.cpp      2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/b3/testb3_6.cpp 2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -1680,7 +1680,7 @@
</span><span class="cx"> 
</span><span class="cx">             jit.move(CCallHelpers::TrustedImmPtr(jumpTable), scratch);
</span><span class="cx">             jit.load64(CCallHelpers::BaseIndex(scratch, params[0].gpr(), CCallHelpers::timesPtr()), scratch);
</span><del>-            jit.jump(scratch, B3CompilationPtrTag);
</del><ins>+            jit.farJump(scratch, B3CompilationPtrTag);
</ins><span class="cx"> 
</span><span class="cx">             jit.addLinkTask(
</span><span class="cx">                 [&, jumpTable, labels] (LinkBuffer& linkBuffer) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGOSRExitCompilerCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp     2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp        2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     jit.move(AssemblyHelpers::TrustedImmPtr(jumpTarget), GPRInfo::regT2);
</span><del>-    jit.jump(GPRInfo::regT2, OSRExitPtrTag);
</del><ins>+    jit.farJump(GPRInfo::regT2, OSRExitPtrTag);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } } // namespace JSC::DFG
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp    2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp       2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -10645,7 +10645,7 @@
</span><span class="cx">     m_jit.move(TrustedImmPtr(table.ctiOffsets.begin()), scratch);
</span><span class="cx">     m_jit.loadPtr(JITCompiler::BaseIndex(scratch, value, JITCompiler::timesPtr()), scratch);
</span><span class="cx">     
</span><del>-    m_jit.jump(scratch, JSSwitchPtrTag);
</del><ins>+    m_jit.farJump(scratch, JSSwitchPtrTag);
</ins><span class="cx">     data->didUseJumpTable = true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -10676,7 +10676,7 @@
</span><span class="cx">         callOperation(operationFindSwitchImmTargetForDouble, scratch, valueRegs, data->switchTableIndex);
</span><span class="cx">         silentFillAllRegisters();
</span><span class="cx"> 
</span><del>-        m_jit.jump(scratch, JSSwitchPtrTag);
</del><ins>+        m_jit.farJump(scratch, JSSwitchPtrTag);
</ins><span class="cx">         noResult(node, UseChildrenCalledExplicitly);
</span><span class="cx">         break;
</span><span class="cx">     }
</span><span class="lines">@@ -10933,7 +10933,7 @@
</span><span class="cx">         callOperation(
</span><span class="cx">             operationSwitchString, string, static_cast<size_t>(data->switchTableIndex), string);
</span><span class="cx">         m_jit.exceptionCheck();
</span><del>-        m_jit.jump(string, JSSwitchPtrTag);
</del><ins>+        m_jit.farJump(string, JSSwitchPtrTag);
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx">     
</span><span class="lines">@@ -10971,7 +10971,7 @@
</span><span class="cx">     callOperation(operationSwitchString, string, static_cast<size_t>(data->switchTableIndex), string);
</span><span class="cx">     silentFillAllRegisters();
</span><span class="cx">     m_jit.exceptionCheck();
</span><del>-    m_jit.jump(string, JSSwitchPtrTag);
</del><ins>+    m_jit.farJump(string, JSSwitchPtrTag);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void SpeculativeJIT::emitSwitchString(Node* node, SwitchData* data)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp  2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp     2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -5097,7 +5097,7 @@
</span><span class="cx">                 osrEnter.link(&m_jit);
</span><span class="cx">             }
</span><span class="cx">             m_jit.emitRestoreCalleeSaves();
</span><del>-            m_jit.jump(tempGPR, GPRInfo::callFrameRegister);
</del><ins>+            m_jit.farJump(tempGPR, GPRInfo::callFrameRegister);
</ins><span class="cx">         });
</span><span class="cx">         break;
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGThunkscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGThunks.cpp (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGThunks.cpp    2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/dfg/DFGThunks.cpp       2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> #endif
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    jit.jump(MacroAssembler::AbsoluteAddress(&vm->osrExitJumpDestination), OSRExitPtrTag);
</del><ins>+    jit.farJump(MacroAssembler::AbsoluteAddress(&vm->osrExitJumpDestination), OSRExitPtrTag);
</ins><span class="cx"> 
</span><span class="cx">     LinkBuffer patchBuffer(jit, GLOBAL_THUNK_ID);
</span><span class="cx">     
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx">     jit.restoreCalleeSavesFromEntryFrameCalleeSavesBuffer(vm->topEntryFrame);
</span><span class="cx">     jit.emitMaterializeTagCheckRegisters();
</span><span class="cx"> 
</span><del>-    jit.jump(GPRInfo::regT1, GPRInfo::callFrameRegister);
</del><ins>+    jit.farJump(GPRInfo::regT1, GPRInfo::callFrameRegister);
</ins><span class="cx"> 
</span><span class="cx">     LinkBuffer patchBuffer(jit, GLOBAL_THUNK_ID);
</span><span class="cx">     return FINALIZE_CODE(patchBuffer, JITThunkPtrTag, "DFG OSR entry thunk");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitCCallHelpersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/CCallHelpers.h (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/CCallHelpers.h   2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/jit/CCallHelpers.h      2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -742,7 +742,7 @@
</span><span class="cx">         // genericUnwind() leaves the handler CallFrame* in vm->callFrameForCatch,
</span><span class="cx">         // and the address of the handler in vm->targetMachinePCForThrow.
</span><span class="cx">         loadPtr(&vm.targetMachinePCForThrow, GPRInfo::regT1);
</span><del>-        jump(GPRInfo::regT1, ExceptionHandlerPtrTag);
</del><ins>+        farJump(GPRInfo::regT1, ExceptionHandlerPtrTag);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     void prepareForTailCallSlow(GPRReg calleeGPR = InvalidGPRReg)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.cpp (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.cpp  2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/jit/JIT.cpp     2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> 
</span><span class="cx">     callOperation(operationOptimize, m_bytecodeOffset);
</span><span class="cx">     skipOptimize.append(branchTestPtr(Zero, returnValueGPR));
</span><del>-    jump(returnValueGPR, GPRInfo::callFrameRegister);
</del><ins>+    farJump(returnValueGPR, GPRInfo::callFrameRegister);
</ins><span class="cx">     skipOptimize.link(this);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp   2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp      2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -725,7 +725,7 @@
</span><span class="cx">         callOperation(operationTryOSREnterAtCatchAndValueProfile, m_bytecodeOffset);
</span><span class="cx">     auto skipOSREntry = branchTestPtr(Zero, returnValueGPR);
</span><span class="cx">     emitRestoreCalleeSaves();
</span><del>-    jump(returnValueGPR, ExceptionHandlerPtrTag);
</del><ins>+    farJump(returnValueGPR, ExceptionHandlerPtrTag);
</ins><span class="cx">     skipOSREntry.link(this);
</span><span class="cx">     if (buffer && shouldEmitProfiling()) {
</span><span class="cx">         buffer->forEach([&] (ValueProfileAndOperand& profile) {
</span><span class="lines">@@ -765,7 +765,7 @@
</span><span class="cx"> 
</span><span class="cx">     emitGetVirtualRegister(scrutinee, regT0);
</span><span class="cx">     callOperation(operationSwitchImmWithUnknownKeyType, regT0, tableIndex);
</span><del>-    jump(returnValueGPR, JSSwitchPtrTag);
</del><ins>+    farJump(returnValueGPR, JSSwitchPtrTag);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void JIT::emit_op_switch_char(const Instruction* currentInstruction)
</span><span class="lines">@@ -782,7 +782,7 @@
</span><span class="cx"> 
</span><span class="cx">     emitGetVirtualRegister(scrutinee, regT0);
</span><span class="cx">     callOperation(operationSwitchCharWithUnknownKeyType, regT0, tableIndex);
</span><del>-    jump(returnValueGPR, JSSwitchPtrTag);
</del><ins>+    farJump(returnValueGPR, JSSwitchPtrTag);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void JIT::emit_op_switch_string(const Instruction* currentInstruction)
</span><span class="lines">@@ -798,7 +798,7 @@
</span><span class="cx"> 
</span><span class="cx">     emitGetVirtualRegister(scrutinee, regT0);
</span><span class="cx">     callOperation(operationSwitchStringWithUnknownKeyType, regT0, tableIndex);
</span><del>-    jump(returnValueGPR, JSSwitchPtrTag);
</del><ins>+    farJump(returnValueGPR, JSSwitchPtrTag);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void JIT::emit_op_debug(const Instruction* currentInstruction)
</span><span class="lines">@@ -1043,7 +1043,7 @@
</span><span class="cx">             abortWithReason(JITUnreasonableLoopHintJumpTarget);
</span><span class="cx">             ok.link(this);
</span><span class="cx">         }
</span><del>-        jump(returnValueGPR, GPRInfo::callFrameRegister);
</del><ins>+        farJump(returnValueGPR, GPRInfo::callFrameRegister);
</ins><span class="cx">         noOptimizedEntry.link(this);
</span><span class="cx"> 
</span><span class="cx">         emitJumpSlowToHot(jump(), currentInstruction->size());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodes32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp      2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -917,7 +917,7 @@
</span><span class="cx">         callOperation(operationTryOSREnterAtCatchAndValueProfile, m_bytecodeOffset);
</span><span class="cx">     auto skipOSREntry = branchTestPtr(Zero, returnValueGPR);
</span><span class="cx">     emitRestoreCalleeSaves();
</span><del>-    jump(returnValueGPR, NoPtrTag);
</del><ins>+    farJump(returnValueGPR, NoPtrTag);
</ins><span class="cx">     skipOSREntry.link(this);
</span><span class="cx">     if (buffer && shouldEmitProfiling()) {
</span><span class="cx">         buffer->forEach([&] (ValueProfileAndOperand& profile) {
</span><span class="lines">@@ -957,7 +957,7 @@
</span><span class="cx"> 
</span><span class="cx">     emitLoad(scrutinee, regT1, regT0);
</span><span class="cx">     callOperation(operationSwitchImmWithUnknownKeyType, JSValueRegs(regT1, regT0), tableIndex);
</span><del>-    jump(returnValueGPR, NoPtrTag);
</del><ins>+    farJump(returnValueGPR, NoPtrTag);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void JIT::emit_op_switch_char(const Instruction* currentInstruction)
</span><span class="lines">@@ -974,7 +974,7 @@
</span><span class="cx"> 
</span><span class="cx">     emitLoad(scrutinee, regT1, regT0);
</span><span class="cx">     callOperation(operationSwitchCharWithUnknownKeyType, JSValueRegs(regT1, regT0), tableIndex);
</span><del>-    jump(returnValueGPR, NoPtrTag);
</del><ins>+    farJump(returnValueGPR, NoPtrTag);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void JIT::emit_op_switch_string(const Instruction* currentInstruction)
</span><span class="lines">@@ -990,7 +990,7 @@
</span><span class="cx"> 
</span><span class="cx">     emitLoad(scrutinee, regT1, regT0);
</span><span class="cx">     callOperation(operationSwitchStringWithUnknownKeyType, JSValueRegs(regT1, regT0), tableIndex);
</span><del>-    jump(returnValueGPR, NoPtrTag);
</del><ins>+    farJump(returnValueGPR, NoPtrTag);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void JIT::emit_op_debug(const Instruction* currentInstruction)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitThunkGeneratorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp      2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp 2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx">     jit.prepareForTailCallSlow(GPRInfo::returnValueGPR);
</span><span class="cx"> 
</span><span class="cx">     doNotTrash.link(&jit);
</span><del>-    jit.jump(GPRInfo::returnValueGPR, JSEntryPtrTag);
</del><ins>+    jit.farJump(GPRInfo::returnValueGPR, JSEntryPtrTag);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> MacroAssemblerCodeRef<JITThunkPtrTag> linkCallThunkGenerator(VM* vm)
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx">         jit.preserveReturnAddressAfterCall(GPRInfo::regT0);
</span><span class="cx">         jit.prepareForTailCallSlow(GPRInfo::regT4);
</span><span class="cx">     }
</span><del>-    jit.jump(GPRInfo::regT4, JSEntryPtrTag);
</del><ins>+    jit.farJump(GPRInfo::regT4, JSEntryPtrTag);
</ins><span class="cx"> 
</span><span class="cx">     notJSFunction.link(&jit);
</span><span class="cx">     slowCase.append(jit.branchIfNotType(GPRInfo::regT0, InternalFunctionType));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntThunkscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntThunks.cpp (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntThunks.cpp        2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/llint/LLIntThunks.cpp   2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">     assertIsTaggedWith(target, JSEntryPtrTag);
</span><span class="cx"> 
</span><span class="cx">     jit.move(JSInterfaceJIT::TrustedImmPtr(target), JSInterfaceJIT::regT0);
</span><del>-    jit.jump(JSInterfaceJIT::regT0, JSEntryPtrTag);
</del><ins>+    jit.farJump(JSInterfaceJIT::regT0, JSEntryPtrTag);
</ins><span class="cx"> 
</span><span class="cx">     LinkBuffer patchBuffer(jit, GLOBAL_THUNK_ID);
</span><span class="cx">     return FINALIZE_CODE(patchBuffer, JITThunkPtrTag, "LLInt %s prologue thunk", thunkKind);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmBindingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmBinding.cpp (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmBinding.cpp 2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/wasm/WasmBinding.cpp    2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> 
</span><span class="cx">     // Tail call into the callee WebAssembly function.
</span><span class="cx">     jit.loadPtr(scratch, scratch);
</span><del>-    jit.jump(scratch, WasmEntryPtrTag);
</del><ins>+    jit.farJump(scratch, WasmEntryPtrTag);
</ins><span class="cx"> 
</span><span class="cx">     LinkBuffer patchBuffer(jit, GLOBAL_THUNK_ID, JITCompilationCanFail);
</span><span class="cx">     if (UNLIKELY(patchBuffer.didFailToAllocate()))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmThunkscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmThunks.cpp (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmThunks.cpp  2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/wasm/WasmThunks.cpp     2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">     jit.move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0);
</span><span class="cx"> 
</span><span class="cx">     CCallHelpers::Call call = jit.call(OperationPtrTag);
</span><del>-    jit.jump(GPRInfo::returnValueGPR, ExceptionHandlerPtrTag);
</del><ins>+    jit.farJump(GPRInfo::returnValueGPR, ExceptionHandlerPtrTag);
</ins><span class="cx">     jit.breakpoint(); // We should not reach this.
</span><span class="cx"> 
</span><span class="cx">     ThrowWasmException throwWasmException = Thunks::singleton().throwWasmException();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsWasmToJScpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/WasmToJS.cpp (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/WasmToJS.cpp 2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/wasm/js/WasmToJS.cpp    2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -712,7 +712,7 @@
</span><span class="cx"> 
</span><span class="cx">     CCallHelpers::Call call = jit.call(OperationPtrTag);
</span><span class="cx"> 
</span><del>-    jit.jump(GPRInfo::returnValueGPR, ExceptionHandlerPtrTag);
</del><ins>+    jit.farJump(GPRInfo::returnValueGPR, ExceptionHandlerPtrTag);
</ins><span class="cx">     jit.breakpoint(); // We should not reach this.
</span><span class="cx"> 
</span><span class="cx">     jit.addLinkTask([=] (LinkBuffer& linkBuffer) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreyarrYarrJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp (248685 => 248686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp     2019-08-14 19:47:23 UTC (rev 248685)
+++ trunk/Source/JavaScriptCore/yarr/YarrJIT.cpp        2019-08-14 20:15:04 UTC (rev 248686)
</span><span class="lines">@@ -639,7 +639,7 @@
</span><span class="cx"> 
</span><span class="cx">     void loadFromFrameAndJump(unsigned frameLocation)
</span><span class="cx">     {
</span><del>-        jump(Address(stackPointerRegister, frameLocation * sizeof(void*)), YarrBacktrackPtrTag);
</del><ins>+        farJump(Address(stackPointerRegister, frameLocation * sizeof(void*)), YarrBacktrackPtrTag);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     unsigned alignCallFrameSizeInBytes(unsigned callFrameSize)
</span></span></pre>
</div>
</div>

</body>
</html>