<!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>[160493] 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/160493">160493</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2013-12-12 10:38:39 -0800 (Thu, 12 Dec 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>ARM64: Hang running pdfjs test, suspect DFG generated code for &quot;in&quot;
https://bugs.webkit.org/show_bug.cgi?id=124727
&lt;rdar://problem/15566923&gt;

Reviewed by Michael Saboff.
        
Get rid of In's hackish use of StructureStubInfo. Previously it was using hotPathBegin,
and it was the only IC that used that field, which was wasteful. Moreover, it used it
to store two separate locations: the label for patching the jump and the label right
after the jump. The code was relying on those two being the same label, which is true
on X86 and some other platforms, but it isn't true on ARM64.
        
This gets rid of hotPathBegin and makes In express those two locations as offsets from
the callReturnLocation, which is analogous to what the other IC's do.
        
This fixes a bug where any successful In patching would result in a trivially infinite
loop - and hence a hang - on ARM64.

* bytecode/StructureStubInfo.h:
* dfg/DFGJITCompiler.cpp:
(JSC::DFG::JITCompiler::link):
* dfg/DFGJITCompiler.h:
(JSC::DFG::InRecord::InRecord):
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileIn):
* jit/JITInlineCacheGenerator.cpp:
(JSC::JITByIdGenerator::finalize):
* jit/Repatch.cpp:
(JSC::replaceWithJump):
(JSC::patchJumpToGetByIdStub):
(JSC::tryCachePutByID):
(JSC::tryBuildPutByIdList):
(JSC::tryRepatchIn):
(JSC::resetGetByID):
(JSC::resetPutByID):
(JSC::resetIn):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeStructureStubInfoh">trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGJITCompilercpp">trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGJITCompilerh">trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITInlineCacheGeneratorcpp">trunk/Source/JavaScriptCore/jit/JITInlineCacheGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitRepatchcpp">trunk/Source/JavaScriptCore/jit/Repatch.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (160492 => 160493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2013-12-12 18:31:47 UTC (rev 160492)
+++ trunk/Source/JavaScriptCore/ChangeLog        2013-12-12 18:38:39 UTC (rev 160493)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2013-12-11  Filip Pizlo  &lt;fpizlo@apple.com&gt;
+
+        ARM64: Hang running pdfjs test, suspect DFG generated code for &quot;in&quot;
+        https://bugs.webkit.org/show_bug.cgi?id=124727
+        &lt;rdar://problem/15566923&gt;
+
+        Reviewed by Michael Saboff.
+        
+        Get rid of In's hackish use of StructureStubInfo. Previously it was using hotPathBegin,
+        and it was the only IC that used that field, which was wasteful. Moreover, it used it
+        to store two separate locations: the label for patching the jump and the label right
+        after the jump. The code was relying on those two being the same label, which is true
+        on X86 and some other platforms, but it isn't true on ARM64.
+        
+        This gets rid of hotPathBegin and makes In express those two locations as offsets from
+        the callReturnLocation, which is analogous to what the other IC's do.
+        
+        This fixes a bug where any successful In patching would result in a trivially infinite
+        loop - and hence a hang - on ARM64.
+
+        * bytecode/StructureStubInfo.h:
+        * dfg/DFGJITCompiler.cpp:
+        (JSC::DFG::JITCompiler::link):
+        * dfg/DFGJITCompiler.h:
+        (JSC::DFG::InRecord::InRecord):
+        * dfg/DFGSpeculativeJIT.cpp:
+        (JSC::DFG::SpeculativeJIT::compileIn):
+        * jit/JITInlineCacheGenerator.cpp:
+        (JSC::JITByIdGenerator::finalize):
+        * jit/Repatch.cpp:
+        (JSC::replaceWithJump):
+        (JSC::patchJumpToGetByIdStub):
+        (JSC::tryCachePutByID):
+        (JSC::tryBuildPutByIdList):
+        (JSC::tryRepatchIn):
+        (JSC::resetGetByID):
+        (JSC::resetPutByID):
+        (JSC::resetIn):
+
</ins><span class="cx"> 2013-12-11  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Push More Inspector Required Classes Down into JavaScriptCore
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeStructureStubInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.h (160492 => 160493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.h        2013-12-12 18:31:47 UTC (rev 160492)
+++ trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.h        2013-12-12 18:38:39 UTC (rev 160493)
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx">         RegisterSet usedRegisters;
</span><span class="cx">         int32_t deltaCallToDone;
</span><span class="cx">         int32_t deltaCallToStorageLoad;
</span><del>-        int32_t deltaCallToStructCheck;
</del><ins>+        int32_t deltaCallToJump;
</ins><span class="cx">         int32_t deltaCallToSlowCase;
</span><span class="cx">         int32_t deltaCheckImmToCall;
</span><span class="cx"> #if USE(JSVALUE64)
</span><span class="lines">@@ -291,7 +291,6 @@
</span><span class="cx"> 
</span><span class="cx">     RefPtr&lt;JITStubRoutine&gt; stubRoutine;
</span><span class="cx">     CodeLocationCall callReturnLocation;
</span><del>-    CodeLocationLabel hotPathBegin; // FIXME: This is only used by DFG In IC.
</del><span class="cx">     RefPtr&lt;WatchpointsOnStructureStubInfo&gt; watchpoints;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGJITCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp (160492 => 160493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp        2013-12-12 18:31:47 UTC (rev 160492)
+++ trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp        2013-12-12 18:38:39 UTC (rev 160493)
</span><span class="lines">@@ -221,9 +221,9 @@
</span><span class="cx"> 
</span><span class="cx">     for (unsigned i = 0; i &lt; m_ins.size(); ++i) {
</span><span class="cx">         StructureStubInfo&amp; info = *m_ins[i].m_stubInfo;
</span><del>-        CodeLocationLabel jump = linkBuffer.locationOf(m_ins[i].m_jump);
</del><span class="cx">         CodeLocationCall callReturnLocation = linkBuffer.locationOf(m_ins[i].m_slowPathGenerator-&gt;call());
</span><del>-        info.hotPathBegin = jump;
</del><ins>+        info.patch.deltaCallToDone = differenceBetweenCodePtr(callReturnLocation, linkBuffer.locationOf(m_ins[i].m_done));
+        info.patch.deltaCallToJump = differenceBetweenCodePtr(callReturnLocation, linkBuffer.locationOf(m_ins[i].m_jump));
</ins><span class="cx">         info.callReturnLocation = callReturnLocation;
</span><span class="cx">         info.patch.deltaCallToSlowCase = differenceBetweenCodePtr(callReturnLocation, linkBuffer.locationOf(m_ins[i].m_slowPathGenerator-&gt;label()));
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGJITCompilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.h (160492 => 160493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.h        2013-12-12 18:31:47 UTC (rev 160492)
+++ trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.h        2013-12-12 18:38:39 UTC (rev 160493)
</span><span class="lines">@@ -81,15 +81,17 @@
</span><span class="cx"> 
</span><span class="cx"> struct InRecord {
</span><span class="cx">     InRecord(
</span><del>-        MacroAssembler::PatchableJump jump, SlowPathGenerator* slowPathGenerator,
-        StructureStubInfo* stubInfo)
</del><ins>+        MacroAssembler::PatchableJump jump, MacroAssembler::Label done,
+        SlowPathGenerator* slowPathGenerator, StructureStubInfo* stubInfo)
</ins><span class="cx">         : m_jump(jump)
</span><ins>+        , m_done(done)
</ins><span class="cx">         , m_slowPathGenerator(slowPathGenerator)
</span><span class="cx">         , m_stubInfo(stubInfo)
</span><span class="cx">     {
</span><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     MacroAssembler::PatchableJump m_jump;
</span><ins>+    MacroAssembler::Label m_done;
</ins><span class="cx">     SlowPathGenerator* m_slowPathGenerator;
</span><span class="cx">     StructureStubInfo* m_stubInfo;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (160492 => 160493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp        2013-12-12 18:31:47 UTC (rev 160492)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp        2013-12-12 18:38:39 UTC (rev 160493)
</span><span class="lines">@@ -972,8 +972,9 @@
</span><span class="cx">             GPRReg resultGPR = result.gpr();
</span><span class="cx"> 
</span><span class="cx">             use(node-&gt;child1());
</span><del>-                
</del><ins>+            
</ins><span class="cx">             MacroAssembler::PatchableJump jump = m_jit.patchableJump();
</span><ins>+            MacroAssembler::Label done = m_jit.label();
</ins><span class="cx">             
</span><span class="cx">             OwnPtr&lt;SlowPathGenerator&gt; slowPath = slowPathCall(
</span><span class="cx">                 jump.m_jump, this, operationInOptimize,
</span><span class="lines">@@ -986,7 +987,7 @@
</span><span class="cx">             stubInfo-&gt;patch.usedRegisters = usedRegisters();
</span><span class="cx">             stubInfo-&gt;patch.registersFlushed = false;
</span><span class="cx">             
</span><del>-            m_jit.addIn(InRecord(jump, slowPath.get(), stubInfo));
</del><ins>+            m_jit.addIn(InRecord(jump, done, slowPath.get(), stubInfo));
</ins><span class="cx">             addSlowPathGenerator(slowPath.release());
</span><span class="cx">                 
</span><span class="cx">             base.use();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITInlineCacheGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITInlineCacheGenerator.cpp (160492 => 160493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITInlineCacheGenerator.cpp        2013-12-12 18:31:47 UTC (rev 160492)
+++ trunk/Source/JavaScriptCore/jit/JITInlineCacheGenerator.cpp        2013-12-12 18:38:39 UTC (rev 160493)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">     m_stubInfo-&gt;callReturnLocation = callReturnLocation;
</span><span class="cx">     m_stubInfo-&gt;patch.deltaCheckImmToCall = MacroAssembler::differenceBetweenCodePtr(
</span><span class="cx">         fastPath.locationOf(m_structureImm), callReturnLocation);
</span><del>-    m_stubInfo-&gt;patch.deltaCallToStructCheck = MacroAssembler::differenceBetweenCodePtr(
</del><ins>+    m_stubInfo-&gt;patch.deltaCallToJump = MacroAssembler::differenceBetweenCodePtr(
</ins><span class="cx">         callReturnLocation, fastPath.locationOf(m_structureCheck));
</span><span class="cx"> #if USE(JSVALUE64)
</span><span class="cx">     m_stubInfo-&gt;patch.deltaCallToLoadOrStore = MacroAssembler::differenceBetweenCodePtr(
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitRepatchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/Repatch.cpp (160492 => 160493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/Repatch.cpp        2013-12-12 18:31:47 UTC (rev 160492)
+++ trunk/Source/JavaScriptCore/jit/Repatch.cpp        2013-12-12 18:38:39 UTC (rev 160493)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx">     
</span><span class="cx">     repatchBuffer.relink(
</span><span class="cx">         stubInfo.callReturnLocation.jumpAtOffset(
</span><del>-            stubInfo.patch.deltaCallToStructCheck),
</del><ins>+            stubInfo.patch.deltaCallToJump),
</ins><span class="cx">         CodeLocationLabel(target));
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -457,7 +457,7 @@
</span><span class="cx">     if (stubInfo.u.getByIdSelfList.didSelfPatching) {
</span><span class="cx">         repatchBuffer.relink(
</span><span class="cx">             stubInfo.callReturnLocation.jumpAtOffset(
</span><del>-                stubInfo.patch.deltaCallToStructCheck),
</del><ins>+                stubInfo.patch.deltaCallToJump),
</ins><span class="cx">             CodeLocationLabel(stubRoutine-&gt;code().code()));
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="lines">@@ -1033,7 +1033,7 @@
</span><span class="cx">             RepatchBuffer repatchBuffer(codeBlock);
</span><span class="cx">             repatchBuffer.relink(
</span><span class="cx">                 stubInfo.callReturnLocation.jumpAtOffset(
</span><del>-                    stubInfo.patch.deltaCallToStructCheck),
</del><ins>+                    stubInfo.patch.deltaCallToJump),
</ins><span class="cx">                 CodeLocationLabel(stubInfo.stubRoutine-&gt;code().code()));
</span><span class="cx">             repatchCall(repatchBuffer, stubInfo.callReturnLocation, appropriateListBuildingPutByIdFunction(slot, putKind));
</span><span class="cx">             
</span><span class="lines">@@ -1137,7 +1137,7 @@
</span><span class="cx">         }
</span><span class="cx">         
</span><span class="cx">         RepatchBuffer repatchBuffer(codeBlock);
</span><del>-        repatchBuffer.relink(stubInfo.callReturnLocation.jumpAtOffset(stubInfo.patch.deltaCallToStructCheck), CodeLocationLabel(stubRoutine-&gt;code().code()));
</del><ins>+        repatchBuffer.relink(stubInfo.callReturnLocation.jumpAtOffset(stubInfo.patch.deltaCallToJump), CodeLocationLabel(stubRoutine-&gt;code().code()));
</ins><span class="cx">         
</span><span class="cx">         if (list-&gt;isFull())
</span><span class="cx">             repatchCall(repatchBuffer, stubInfo.callReturnLocation, appropriateGenericPutByIdFunction(slot, putKind));
</span><span class="lines">@@ -1181,7 +1181,7 @@
</span><span class="cx">     PolymorphicAccessStructureList* polymorphicStructureList;
</span><span class="cx">     int listIndex;
</span><span class="cx">     
</span><del>-    CodeLocationLabel successLabel = stubInfo.hotPathBegin;
</del><ins>+    CodeLocationLabel successLabel = stubInfo.callReturnLocation.labelAtOffset(stubInfo.patch.deltaCallToDone);
</ins><span class="cx">     CodeLocationLabel slowCaseLabel;
</span><span class="cx">     
</span><span class="cx">     if (stubInfo.accessType == access_unset) {
</span><span class="lines">@@ -1259,7 +1259,7 @@
</span><span class="cx">     stubInfo.u.inList.listSize++;
</span><span class="cx">     
</span><span class="cx">     RepatchBuffer repatchBuffer(codeBlock);
</span><del>-    repatchBuffer.relink(stubInfo.hotPathBegin.jumpAtOffset(0), CodeLocationLabel(stubRoutine-&gt;code().code()));
</del><ins>+    repatchBuffer.relink(stubInfo.callReturnLocation.jumpAtOffset(stubInfo.patch.deltaCallToJump), CodeLocationLabel(stubRoutine-&gt;code().code()));
</ins><span class="cx">     
</span><span class="cx">     return listIndex &lt; (POLYMORPHIC_LIST_CACHE_SIZE - 1);
</span><span class="cx"> }
</span><span class="lines">@@ -1432,7 +1432,7 @@
</span><span class="cx">     repatchBuffer.repatch(stubInfo.callReturnLocation.dataLabelCompactAtOffset(stubInfo.patch.deltaCallToTagLoadOrStore), 0);
</span><span class="cx">     repatchBuffer.repatch(stubInfo.callReturnLocation.dataLabelCompactAtOffset(stubInfo.patch.deltaCallToPayloadLoadOrStore), 0);
</span><span class="cx"> #endif
</span><del>-    repatchBuffer.relink(stubInfo.callReturnLocation.jumpAtOffset(stubInfo.patch.deltaCallToStructCheck), stubInfo.callReturnLocation.labelAtOffset(stubInfo.patch.deltaCallToSlowCase));
</del><ins>+    repatchBuffer.relink(stubInfo.callReturnLocation.jumpAtOffset(stubInfo.patch.deltaCallToJump), stubInfo.callReturnLocation.labelAtOffset(stubInfo.patch.deltaCallToSlowCase));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void resetPutByID(RepatchBuffer&amp; repatchBuffer, StructureStubInfo&amp; stubInfo)
</span><span class="lines">@@ -1466,12 +1466,12 @@
</span><span class="cx">     repatchBuffer.repatch(stubInfo.callReturnLocation.dataLabel32AtOffset(stubInfo.patch.deltaCallToTagLoadOrStore), 0);
</span><span class="cx">     repatchBuffer.repatch(stubInfo.callReturnLocation.dataLabel32AtOffset(stubInfo.patch.deltaCallToPayloadLoadOrStore), 0);
</span><span class="cx"> #endif
</span><del>-    repatchBuffer.relink(stubInfo.callReturnLocation.jumpAtOffset(stubInfo.patch.deltaCallToStructCheck), stubInfo.callReturnLocation.labelAtOffset(stubInfo.patch.deltaCallToSlowCase));
</del><ins>+    repatchBuffer.relink(stubInfo.callReturnLocation.jumpAtOffset(stubInfo.patch.deltaCallToJump), stubInfo.callReturnLocation.labelAtOffset(stubInfo.patch.deltaCallToSlowCase));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void resetIn(RepatchBuffer&amp; repatchBuffer, StructureStubInfo&amp; stubInfo)
</span><span class="cx"> {
</span><del>-    repatchBuffer.relink(stubInfo.hotPathBegin.jumpAtOffset(0), stubInfo.callReturnLocation.labelAtOffset(stubInfo.patch.deltaCallToSlowCase));
</del><ins>+    repatchBuffer.relink(stubInfo.callReturnLocation.jumpAtOffset(stubInfo.patch.deltaCallToJump), stubInfo.callReturnLocation.labelAtOffset(stubInfo.patch.deltaCallToSlowCase));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace JSC
</span></span></pre>
</div>
</div>

</body>
</html>