<!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>[236592] branches/safari-606-branch</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/236592">236592</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2018-09-27 23:40:58 -0700 (Thu, 27 Sep 2018)</dd>
</dl>

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

    2018-09-27  Mark Lam  <mark.lam@apple.com>

    ByValInfo should not use integer offsets.
    https://bugs.webkit.org/show_bug.cgi?id=190070
    <rdar://problem/44803430>

    Reviewed by Saam Barati.

    Also moved some fields around to allow the ByValInfo struct to be more densely packed.

    * bytecode/ByValInfo.h:
    (JSC::ByValInfo::ByValInfo):
    * jit/JIT.cpp:
    (JSC::JIT::link):
    * jit/JITOpcodes.cpp:
    (JSC::JIT::privateCompileHasIndexedProperty):
    * jit/JITOpcodes32_64.cpp:
    (JSC::JIT::privateCompileHasIndexedProperty):
    * jit/JITPropertyAccess.cpp:
    (JSC::JIT::privateCompileGetByVal):
    (JSC::JIT::privateCompileGetByValWithCachedId):
    (JSC::JIT::privateCompilePutByVal):
    (JSC::JIT::privateCompilePutByValWithCachedId):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari606branchSourceJavaScriptCoreChangeLog">branches/safari-606-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari606branchSourceJavaScriptCorebytecodeByValInfoh">branches/safari-606-branch/Source/JavaScriptCore/bytecode/ByValInfo.h</a></li>
<li><a href="#branchessafari606branchSourceJavaScriptCorejitJITcpp">branches/safari-606-branch/Source/JavaScriptCore/jit/JIT.cpp</a></li>
<li><a href="#branchessafari606branchSourceJavaScriptCorejitJITOpcodescpp">branches/safari-606-branch/Source/JavaScriptCore/jit/JITOpcodes.cpp</a></li>
<li><a href="#branchessafari606branchSourceJavaScriptCorejitJITOpcodes32_64cpp">branches/safari-606-branch/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp</a></li>
<li><a href="#branchessafari606branchSourceJavaScriptCorejitJITPropertyAccesscpp">branches/safari-606-branch/Source/JavaScriptCore/jit/JITPropertyAccess.cpp</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#branchessafari606branch">branches/safari-606-branch/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/safari-606-branch
</span><span class="cx">===================================================================
</span><del>--- branches/safari-606-branch  2018-09-28 06:08:11 UTC (rev 236591)
</del><ins>+++ branches/safari-606-branch   2018-09-28 06:40:58 UTC (rev 236592)
</ins><a id="branchessafari606branch"></a>
<div class="propset"><h4>Property changes: branches/safari-606-branch</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<del>-/trunk:53455,235254,235419,235666,236576
</del><span class="cx">\ No newline at end of property
</span><ins>+/trunk:53455,235254,235419,235666,236576,236587
</ins><span class="cx">\ No newline at end of property
</span><a id="branchessafari606branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-606-branch/Source/JavaScriptCore/ChangeLog (236591 => 236592)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606-branch/Source/JavaScriptCore/ChangeLog       2018-09-28 06:08:11 UTC (rev 236591)
+++ branches/safari-606-branch/Source/JavaScriptCore/ChangeLog  2018-09-28 06:40:58 UTC (rev 236592)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2018-09-27  Mark Lam  <mark.lam@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r236587. rdar://problem/44855118
+
+    2018-09-27  Mark Lam  <mark.lam@apple.com>
+
+            ByValInfo should not use integer offsets.
+            https://bugs.webkit.org/show_bug.cgi?id=190070
+            <rdar://problem/44803430>
+
+            Reviewed by Saam Barati.
+
+            Also moved some fields around to allow the ByValInfo struct to be more densely packed.
+
+            * bytecode/ByValInfo.h:
+            (JSC::ByValInfo::ByValInfo):
+            * jit/JIT.cpp:
+            (JSC::JIT::link):
+            * jit/JITOpcodes.cpp:
+            (JSC::JIT::privateCompileHasIndexedProperty):
+            * jit/JITOpcodes32_64.cpp:
+            (JSC::JIT::privateCompileHasIndexedProperty):
+            * jit/JITPropertyAccess.cpp:
+            (JSC::JIT::privateCompileGetByVal):
+            (JSC::JIT::privateCompileGetByValWithCachedId):
+            (JSC::JIT::privateCompilePutByVal):
+            (JSC::JIT::privateCompilePutByValWithCachedId):
+
+2018-09-27  Mark Lam  <mark.lam@apple.com>
+
</ins><span class="cx">         Cherry-pick r236576. rdar://problem/44855116
</span><span class="cx"> 
</span><span class="cx">     2018-09-27  Mark Lam  <mark.lam@apple.com>
</span></span></pre></div>
<a id="branchessafari606branchSourceJavaScriptCorebytecodeByValInfoh"></a>
<div class="modfile"><h4>Modified: branches/safari-606-branch/Source/JavaScriptCore/bytecode/ByValInfo.h (236591 => 236592)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606-branch/Source/JavaScriptCore/bytecode/ByValInfo.h    2018-09-28 06:08:11 UTC (rev 236591)
+++ branches/safari-606-branch/Source/JavaScriptCore/bytecode/ByValInfo.h       2018-09-28 06:40:58 UTC (rev 236592)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012, 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2018 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -226,37 +226,37 @@
</span><span class="cx"> struct ByValInfo {
</span><span class="cx">     ByValInfo() { }
</span><span class="cx"> 
</span><del>-    ByValInfo(unsigned bytecodeIndex, CodeLocationJump<JSInternalPtrTag> notIndexJump, CodeLocationJump<JSInternalPtrTag> badTypeJump, CodeLocationLabel<ExceptionHandlerPtrTag> exceptionHandler, JITArrayMode arrayMode, ArrayProfile* arrayProfile, int16_t badTypeJumpToDone, int16_t badTypeJumpToNextHotPath, int16_t returnAddressToSlowPath)
-        : bytecodeIndex(bytecodeIndex)
-        , notIndexJump(notIndexJump)
</del><ins>+    ByValInfo(unsigned bytecodeIndex, CodeLocationJump<JSInternalPtrTag> notIndexJump, CodeLocationJump<JSInternalPtrTag> badTypeJump, CodeLocationLabel<ExceptionHandlerPtrTag> exceptionHandler, JITArrayMode arrayMode, ArrayProfile* arrayProfile, CodeLocationLabel<JSInternalPtrTag> badTypeDoneTarget, CodeLocationLabel<JSInternalPtrTag> badTypeNextHotPathTarget, CodeLocationLabel<JSInternalPtrTag> slowPathTarget)
+        : notIndexJump(notIndexJump)
</ins><span class="cx">         , badTypeJump(badTypeJump)
</span><span class="cx">         , exceptionHandler(exceptionHandler)
</span><del>-        , arrayMode(arrayMode)
</del><ins>+        , badTypeDoneTarget(badTypeDoneTarget)
+        , badTypeNextHotPathTarget(badTypeNextHotPathTarget)
+        , slowPathTarget(slowPathTarget)
</ins><span class="cx">         , arrayProfile(arrayProfile)
</span><del>-        , badTypeJumpToDone(badTypeJumpToDone)
-        , badTypeJumpToNextHotPath(badTypeJumpToNextHotPath)
-        , returnAddressToSlowPath(returnAddressToSlowPath)
</del><ins>+        , bytecodeIndex(bytecodeIndex)
</ins><span class="cx">         , slowPathCount(0)
</span><span class="cx">         , stubInfo(nullptr)
</span><ins>+        , arrayMode(arrayMode)
</ins><span class="cx">         , tookSlowPath(false)
</span><span class="cx">         , seen(false)
</span><span class="cx">     {
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    unsigned bytecodeIndex;
</del><span class="cx">     CodeLocationJump<JSInternalPtrTag> notIndexJump;
</span><span class="cx">     CodeLocationJump<JSInternalPtrTag> badTypeJump;
</span><span class="cx">     CodeLocationLabel<ExceptionHandlerPtrTag> exceptionHandler;
</span><del>-    JITArrayMode arrayMode; // The array mode that was baked into the inline JIT code.
</del><ins>+    CodeLocationLabel<JSInternalPtrTag> badTypeDoneTarget;
+    CodeLocationLabel<JSInternalPtrTag> badTypeNextHotPathTarget;
+    CodeLocationLabel<JSInternalPtrTag> slowPathTarget;
</ins><span class="cx">     ArrayProfile* arrayProfile;
</span><del>-    int16_t badTypeJumpToDone;
-    int16_t badTypeJumpToNextHotPath;
-    int16_t returnAddressToSlowPath;
</del><ins>+    unsigned bytecodeIndex;
</ins><span class="cx">     unsigned slowPathCount;
</span><span class="cx">     RefPtr<JITStubRoutine> stubRoutine;
</span><span class="cx">     Identifier cachedId;
</span><span class="cx">     WriteBarrier<Symbol> cachedSymbol;
</span><span class="cx">     StructureStubInfo* stubInfo;
</span><ins>+    JITArrayMode arrayMode; // The array mode that was baked into the inline JIT code.
</ins><span class="cx">     bool tookSlowPath : 1;
</span><span class="cx">     bool seen : 1;
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari606branchSourceJavaScriptCorejitJITcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-606-branch/Source/JavaScriptCore/jit/JIT.cpp (236591 => 236592)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606-branch/Source/JavaScriptCore/jit/JIT.cpp     2018-09-28 06:08:11 UTC (rev 236591)
+++ branches/safari-606-branch/Source/JavaScriptCore/jit/JIT.cpp        2018-09-28 06:40:58 UTC (rev 236592)
</span><span class="lines">@@ -853,10 +853,9 @@
</span><span class="cx">             if (Jump(patchableNotIndexJump).isSet())
</span><span class="cx">                 notIndexJump = CodeLocationJump<JSInternalPtrTag>(patchBuffer.locationOf<JSInternalPtrTag>(patchableNotIndexJump));
</span><span class="cx">             auto badTypeJump = CodeLocationJump<JSInternalPtrTag>(patchBuffer.locationOf<JSInternalPtrTag>(byValCompilationInfo.badTypeJump));
</span><del>-            CodeLocationLabel<NoPtrTag> doneTarget = patchBuffer.locationOf<NoPtrTag>(byValCompilationInfo.doneTarget);
-            CodeLocationLabel<NoPtrTag> nextHotPathTarget = patchBuffer.locationOf<NoPtrTag>(byValCompilationInfo.nextHotPathTarget);
-            CodeLocationLabel<NoPtrTag> slowPathTarget = patchBuffer.locationOf<NoPtrTag>(byValCompilationInfo.slowPathTarget);
-            CodeLocationCall<NoPtrTag> returnAddress = patchBuffer.locationOf<NoPtrTag>(byValCompilationInfo.returnAddress);
</del><ins>+            auto doneTarget = CodeLocationLabel<JSInternalPtrTag>(patchBuffer.locationOf<JSInternalPtrTag>(byValCompilationInfo.doneTarget));
+            auto nextHotPathTarget = CodeLocationLabel<JSInternalPtrTag>(patchBuffer.locationOf<JSInternalPtrTag>(byValCompilationInfo.nextHotPathTarget));
+            auto slowPathTarget = CodeLocationLabel<JSInternalPtrTag>(patchBuffer.locationOf<JSInternalPtrTag>(byValCompilationInfo.slowPathTarget));
</ins><span class="cx"> 
</span><span class="cx">             *byValCompilationInfo.byValInfo = ByValInfo(
</span><span class="cx">                 byValCompilationInfo.bytecodeIndex,
</span><span class="lines">@@ -865,9 +864,9 @@
</span><span class="cx">                 exceptionHandler,
</span><span class="cx">                 byValCompilationInfo.arrayMode,
</span><span class="cx">                 byValCompilationInfo.arrayProfile,
</span><del>-                differenceBetweenCodePtr(badTypeJump, doneTarget),
-                differenceBetweenCodePtr(badTypeJump, nextHotPathTarget),
-                differenceBetweenCodePtr(returnAddress, slowPathTarget));
</del><ins>+                doneTarget,
+                nextHotPathTarget,
+                slowPathTarget);
</ins><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari606branchSourceJavaScriptCorejitJITOpcodescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-606-branch/Source/JavaScriptCore/jit/JITOpcodes.cpp (236591 => 236592)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606-branch/Source/JavaScriptCore/jit/JITOpcodes.cpp      2018-09-28 06:08:11 UTC (rev 236591)
+++ branches/safari-606-branch/Source/JavaScriptCore/jit/JITOpcodes.cpp 2018-09-28 06:40:58 UTC (rev 236592)
</span><span class="lines">@@ -1142,11 +1142,11 @@
</span><span class="cx"> 
</span><span class="cx">     LinkBuffer patchBuffer(*this, m_codeBlock);
</span><span class="cx">     
</span><del>-    patchBuffer.link(badType, CodeLocationLabel<NoPtrTag>(MacroAssemblerCodePtr<NoPtrTag>::createFromExecutableAddress(returnAddress.value())).labelAtOffset(byValInfo->returnAddressToSlowPath));
-    patchBuffer.link(slowCases, CodeLocationLabel<NoPtrTag>(MacroAssemblerCodePtr<NoPtrTag>::createFromExecutableAddress(returnAddress.value())).labelAtOffset(byValInfo->returnAddressToSlowPath));
-    
-    patchBuffer.link(done, byValInfo->badTypeJump.labelAtOffset(byValInfo->badTypeJumpToDone));
-    
</del><ins>+    patchBuffer.link(badType, byValInfo->slowPathTarget);
+    patchBuffer.link(slowCases, byValInfo->slowPathTarget);
+
+    patchBuffer.link(done, byValInfo->badTypeDoneTarget);
+
</ins><span class="cx">     byValInfo->stubRoutine = FINALIZE_CODE_FOR_STUB(
</span><span class="cx">         m_codeBlock, patchBuffer, JITStubRoutinePtrTag,
</span><span class="cx">         "Baseline has_indexed_property stub for %s, return point %p", toCString(*m_codeBlock).data(), returnAddress.value());
</span></span></pre></div>
<a id="branchessafari606branchSourceJavaScriptCorejitJITOpcodes32_64cpp"></a>
<div class="modfile"><h4>Modified: branches/safari-606-branch/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp (236591 => 236592)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606-branch/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2018-09-28 06:08:11 UTC (rev 236591)
+++ branches/safari-606-branch/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp    2018-09-28 06:40:58 UTC (rev 236592)
</span><span class="lines">@@ -1022,11 +1022,11 @@
</span><span class="cx"> 
</span><span class="cx">     LinkBuffer patchBuffer(*this, m_codeBlock);
</span><span class="cx">     
</span><del>-    patchBuffer.link(badType, CodeLocationLabel<NoPtrTag>(MacroAssemblerCodePtr<NoPtrTag>::createFromExecutableAddress(returnAddress.value())).labelAtOffset(byValInfo->returnAddressToSlowPath));
-    patchBuffer.link(slowCases, CodeLocationLabel<NoPtrTag>(MacroAssemblerCodePtr<NoPtrTag>::createFromExecutableAddress(returnAddress.value())).labelAtOffset(byValInfo->returnAddressToSlowPath));
-    
-    patchBuffer.link(done, byValInfo->badTypeJump.labelAtOffset(byValInfo->badTypeJumpToDone));
</del><ins>+    patchBuffer.link(badType, byValInfo->slowPathTarget);
+    patchBuffer.link(slowCases, byValInfo->slowPathTarget);
</ins><span class="cx"> 
</span><ins>+    patchBuffer.link(done, byValInfo->badTypeDoneTarget);
+
</ins><span class="cx">     byValInfo->stubRoutine = FINALIZE_CODE_FOR_STUB(
</span><span class="cx">         m_codeBlock, patchBuffer, JITStubRoutinePtrTag,
</span><span class="cx">         "Baseline has_indexed_property stub for %s, return point %p", toCString(*m_codeBlock).data(), returnAddress.value());
</span></span></pre></div>
<a id="branchessafari606branchSourceJavaScriptCorejitJITPropertyAccesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-606-branch/Source/JavaScriptCore/jit/JITPropertyAccess.cpp (236591 => 236592)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606-branch/Source/JavaScriptCore/jit/JITPropertyAccess.cpp       2018-09-28 06:08:11 UTC (rev 236591)
+++ branches/safari-606-branch/Source/JavaScriptCore/jit/JITPropertyAccess.cpp  2018-09-28 06:40:58 UTC (rev 236592)
</span><span class="lines">@@ -1211,12 +1211,12 @@
</span><span class="cx">     Jump done = jump();
</span><span class="cx"> 
</span><span class="cx">     LinkBuffer patchBuffer(*this, m_codeBlock);
</span><del>-    
-    patchBuffer.link(badType, CodeLocationLabel<NoPtrTag>(MacroAssemblerCodePtr<NoPtrTag>::createFromExecutableAddress(returnAddress.value())).labelAtOffset(byValInfo->returnAddressToSlowPath));
-    patchBuffer.link(slowCases, CodeLocationLabel<NoPtrTag>(MacroAssemblerCodePtr<NoPtrTag>::createFromExecutableAddress(returnAddress.value())).labelAtOffset(byValInfo->returnAddressToSlowPath));
-    
-    patchBuffer.link(done, byValInfo->badTypeJump.labelAtOffset(byValInfo->badTypeJumpToDone));
-    
</del><ins>+
+    patchBuffer.link(badType, byValInfo->slowPathTarget);
+    patchBuffer.link(slowCases, byValInfo->slowPathTarget);
+
+    patchBuffer.link(done, byValInfo->badTypeDoneTarget);
+
</ins><span class="cx">     byValInfo->stubRoutine = FINALIZE_CODE_FOR_STUB(
</span><span class="cx">         m_codeBlock, patchBuffer, JITStubRoutinePtrTag,
</span><span class="cx">         "Baseline get_by_val stub for %s, return point %p", toCString(*m_codeBlock).data(), returnAddress.value());
</span><span class="lines">@@ -1237,9 +1237,9 @@
</span><span class="cx"> 
</span><span class="cx">     ConcurrentJSLocker locker(m_codeBlock->m_lock);
</span><span class="cx">     LinkBuffer patchBuffer(*this, m_codeBlock);
</span><del>-    patchBuffer.link(slowCases, CodeLocationLabel<NoPtrTag>(MacroAssemblerCodePtr<NoPtrTag>::createFromExecutableAddress(returnAddress.value())).labelAtOffset(byValInfo->returnAddressToSlowPath));
-    patchBuffer.link(fastDoneCase, byValInfo->badTypeJump.labelAtOffset(byValInfo->badTypeJumpToDone));
-    patchBuffer.link(slowDoneCase, byValInfo->badTypeJump.labelAtOffset(byValInfo->badTypeJumpToNextHotPath));
</del><ins>+    patchBuffer.link(slowCases, byValInfo->slowPathTarget);
+    patchBuffer.link(fastDoneCase, byValInfo->badTypeDoneTarget);
+    patchBuffer.link(slowDoneCase, byValInfo->badTypeNextHotPathTarget);
</ins><span class="cx">     if (!m_exceptionChecks.empty())
</span><span class="cx">         patchBuffer.link(m_exceptionChecks, byValInfo->exceptionHandler);
</span><span class="cx"> 
</span><span class="lines">@@ -1294,9 +1294,9 @@
</span><span class="cx">     Jump done = jump();
</span><span class="cx"> 
</span><span class="cx">     LinkBuffer patchBuffer(*this, m_codeBlock);
</span><del>-    patchBuffer.link(badType, CodeLocationLabel<NoPtrTag>(MacroAssemblerCodePtr<NoPtrTag>::createFromExecutableAddress(returnAddress.value())).labelAtOffset(byValInfo->returnAddressToSlowPath));
-    patchBuffer.link(slowCases, CodeLocationLabel<NoPtrTag>(MacroAssemblerCodePtr<NoPtrTag>::createFromExecutableAddress(returnAddress.value())).labelAtOffset(byValInfo->returnAddressToSlowPath));
-    patchBuffer.link(done, byValInfo->badTypeJump.labelAtOffset(byValInfo->badTypeJumpToDone));
</del><ins>+    patchBuffer.link(badType, byValInfo->slowPathTarget);
+    patchBuffer.link(slowCases, byValInfo->slowPathTarget);
+    patchBuffer.link(done, byValInfo->badTypeDoneTarget);
</ins><span class="cx">     if (needsLinkForWriteBarrier) {
</span><span class="cx">         ASSERT(removeCodePtrTag(m_calls.last().callee.executableAddress()) == removeCodePtrTag(operationWriteBarrierSlowPath));
</span><span class="cx">         patchBuffer.link(m_calls.last().from, m_calls.last().callee);
</span><span class="lines">@@ -1328,8 +1328,8 @@
</span><span class="cx"> 
</span><span class="cx">     ConcurrentJSLocker locker(m_codeBlock->m_lock);
</span><span class="cx">     LinkBuffer patchBuffer(*this, m_codeBlock);
</span><del>-    patchBuffer.link(slowCases, CodeLocationLabel<NoPtrTag>(MacroAssemblerCodePtr<NoPtrTag>::createFromExecutableAddress(returnAddress.value())).labelAtOffset(byValInfo->returnAddressToSlowPath));
-    patchBuffer.link(doneCases, byValInfo->badTypeJump.labelAtOffset(byValInfo->badTypeJumpToDone));
</del><ins>+    patchBuffer.link(slowCases, byValInfo->slowPathTarget);
+    patchBuffer.link(doneCases, byValInfo->badTypeDoneTarget);
</ins><span class="cx">     if (!m_exceptionChecks.empty())
</span><span class="cx">         patchBuffer.link(m_exceptionChecks, byValInfo->exceptionHandler);
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>