<!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>[190672] 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/190672">190672</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-10-07 10:28:38 -0700 (Wed, 07 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Inline caches should handle out-of-line offsets out-of-line
https://bugs.webkit.org/show_bug.cgi?id=149869
Reviewed by Saam Barati.
If we want to have a concurrent copying GC, then we need a read barrier on copied space
pointers. That makes the convertible load portion of the get_by_id/put_by_id inline caches
rather challenging. Currently we have a load instruction that we can turn into an add
instruction - the add case is when we have an inline offset, and the load case is when we
have an out-of-line offset and we need to load a copied space pointer. But if the load from
copied space requires a barrier, then there is no easy way to convert that back to the inline
case.
This patch removes the convertible load. The inline path of get_by_id/put_by_id only handles
the inline offsets. Out-of-line offsets are now handled using out-of-line stubs.
* bytecode/StructureStubInfo.h:
* ftl/FTLInlineCacheSize.cpp:
(JSC::FTL::sizeOfGetById):
(JSC::FTL::sizeOfPutById):
* jit/JITInlineCacheGenerator.cpp:
(JSC::JITByIdGenerator::finalize):
(JSC::JITByIdGenerator::generateFastPathChecks):
(JSC::JITGetByIdGenerator::JITGetByIdGenerator):
(JSC::JITGetByIdGenerator::generateFastPath):
(JSC::JITPutByIdGenerator::JITPutByIdGenerator):
(JSC::JITPutByIdGenerator::generateFastPath):
* jit/JITInlineCacheGenerator.h:
* jit/Repatch.cpp:
(JSC::repatchByIdSelfAccess):
(JSC::tryCacheGetByID):
(JSC::tryCachePutByID):
* runtime/JSObject.h:
(JSC::JSObject::butterflyTotalSize):
(JSC::indexRelativeToBase):
(JSC::offsetRelativeToBase):
(JSC::maxOffsetRelativeToBase):
(JSC::makeIdentifier):
(JSC::offsetRelativeToPatchedStorage): Deleted.
(JSC::maxOffsetRelativeToPatchedStorage): Deleted.</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="#trunkSourceJavaScriptCoreftlFTLInlineCacheSizecpp">trunk/Source/JavaScriptCore/ftl/FTLInlineCacheSize.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITInlineCacheGeneratorcpp">trunk/Source/JavaScriptCore/jit/JITInlineCacheGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITInlineCacheGeneratorh">trunk/Source/JavaScriptCore/jit/JITInlineCacheGenerator.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitRepatchcpp">trunk/Source/JavaScriptCore/jit/Repatch.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjecth">trunk/Source/JavaScriptCore/runtime/JSObject.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (190671 => 190672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-07 16:41:29 UTC (rev 190671)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-07 17:28:38 UTC (rev 190672)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2015-10-06 Filip Pizlo <fpizlo@apple.com>
+
+ Inline caches should handle out-of-line offsets out-of-line
+ https://bugs.webkit.org/show_bug.cgi?id=149869
+
+ Reviewed by Saam Barati.
+
+ If we want to have a concurrent copying GC, then we need a read barrier on copied space
+ pointers. That makes the convertible load portion of the get_by_id/put_by_id inline caches
+ rather challenging. Currently we have a load instruction that we can turn into an add
+ instruction - the add case is when we have an inline offset, and the load case is when we
+ have an out-of-line offset and we need to load a copied space pointer. But if the load from
+ copied space requires a barrier, then there is no easy way to convert that back to the inline
+ case.
+
+ This patch removes the convertible load. The inline path of get_by_id/put_by_id only handles
+ the inline offsets. Out-of-line offsets are now handled using out-of-line stubs.
+
+ * bytecode/StructureStubInfo.h:
+ * ftl/FTLInlineCacheSize.cpp:
+ (JSC::FTL::sizeOfGetById):
+ (JSC::FTL::sizeOfPutById):
+ * jit/JITInlineCacheGenerator.cpp:
+ (JSC::JITByIdGenerator::finalize):
+ (JSC::JITByIdGenerator::generateFastPathChecks):
+ (JSC::JITGetByIdGenerator::JITGetByIdGenerator):
+ (JSC::JITGetByIdGenerator::generateFastPath):
+ (JSC::JITPutByIdGenerator::JITPutByIdGenerator):
+ (JSC::JITPutByIdGenerator::generateFastPath):
+ * jit/JITInlineCacheGenerator.h:
+ * jit/Repatch.cpp:
+ (JSC::repatchByIdSelfAccess):
+ (JSC::tryCacheGetByID):
+ (JSC::tryCachePutByID):
+ * runtime/JSObject.h:
+ (JSC::JSObject::butterflyTotalSize):
+ (JSC::indexRelativeToBase):
+ (JSC::offsetRelativeToBase):
+ (JSC::maxOffsetRelativeToBase):
+ (JSC::makeIdentifier):
+ (JSC::offsetRelativeToPatchedStorage): Deleted.
+ (JSC::maxOffsetRelativeToPatchedStorage): Deleted.
+
</ins><span class="cx"> 2015-10-07 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r190664.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeStructureStubInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.h (190671 => 190672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.h 2015-10-07 16:41:29 UTC (rev 190671)
+++ trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.h 2015-10-07 17:28:38 UTC (rev 190672)
</span><span class="lines">@@ -139,7 +139,6 @@
</span><span class="cx"> int8_t valueGPR;
</span><span class="cx"> RegisterSet usedRegisters;
</span><span class="cx"> int32_t deltaCallToDone;
</span><del>- int32_t deltaCallToStorageLoad;
</del><span class="cx"> int32_t deltaCallToJump;
</span><span class="cx"> int32_t deltaCallToSlowCase;
</span><span class="cx"> int32_t deltaCheckImmToCall;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLInlineCacheSizecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLInlineCacheSize.cpp (190671 => 190672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLInlineCacheSize.cpp 2015-10-07 16:41:29 UTC (rev 190671)
+++ trunk/Source/JavaScriptCore/ftl/FTLInlineCacheSize.cpp 2015-10-07 17:28:38 UTC (rev 190672)
</span><span class="lines">@@ -49,18 +49,18 @@
</span><span class="cx"> size_t sizeOfGetById()
</span><span class="cx"> {
</span><span class="cx"> #if CPU(ARM64)
</span><del>- return 36;
</del><ins>+ return 32;
</ins><span class="cx"> #else
</span><del>- return 30;
</del><ins>+ return 27;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t sizeOfPutById()
</span><span class="cx"> {
</span><span class="cx"> #if CPU(ARM64)
</span><del>- return 44;
</del><ins>+ return 40;
</ins><span class="cx"> #else
</span><del>- return 32;
</del><ins>+ return 29;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITInlineCacheGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITInlineCacheGenerator.cpp (190671 => 190672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITInlineCacheGenerator.cpp 2015-10-07 16:41:29 UTC (rev 190671)
+++ trunk/Source/JavaScriptCore/jit/JITInlineCacheGenerator.cpp 2015-10-07 17:28:38 UTC (rev 190672)
</span><span class="lines">@@ -93,8 +93,6 @@
</span><span class="cx"> callReturnLocation, slowPath.locationOf(m_slowPathBegin));
</span><span class="cx"> m_stubInfo->patch.deltaCallToDone = MacroAssembler::differenceBetweenCodePtr(
</span><span class="cx"> callReturnLocation, fastPath.locationOf(m_done));
</span><del>- m_stubInfo->patch.deltaCallToStorageLoad = MacroAssembler::differenceBetweenCodePtr(
- callReturnLocation, fastPath.locationOf(m_propertyStorageLoad));
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JITByIdGenerator::finalize(LinkBuffer& linkBuffer)
</span><span class="lines">@@ -102,15 +100,12 @@
</span><span class="cx"> finalize(linkBuffer, linkBuffer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JITByIdGenerator::generateFastPathChecks(MacroAssembler& jit, GPRReg butterfly)
</del><ins>+void JITByIdGenerator::generateFastPathChecks(MacroAssembler& jit)
</ins><span class="cx"> {
</span><span class="cx"> m_structureCheck = jit.patchableBranch32WithPatch(
</span><span class="cx"> MacroAssembler::NotEqual,
</span><span class="cx"> MacroAssembler::Address(m_base.payloadGPR(), JSCell::structureIDOffset()),
</span><span class="cx"> m_structureImm, MacroAssembler::TrustedImm32(0));
</span><del>-
- m_propertyStorageLoad = jit.convertibleLoadPtr(
- MacroAssembler::Address(m_base.payloadGPR(), JSObject::butterflyOffset()), butterfly);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JITGetByIdGenerator::JITGetByIdGenerator(
</span><span class="lines">@@ -124,16 +119,16 @@
</span><span class="cx">
</span><span class="cx"> void JITGetByIdGenerator::generateFastPath(MacroAssembler& jit)
</span><span class="cx"> {
</span><del>- generateFastPathChecks(jit, m_value.payloadGPR());
</del><ins>+ generateFastPathChecks(jit);
</ins><span class="cx">
</span><span class="cx"> #if USE(JSVALUE64)
</span><span class="cx"> m_loadOrStore = jit.load64WithCompactAddressOffsetPatch(
</span><del>- MacroAssembler::Address(m_value.payloadGPR(), 0), m_value.payloadGPR()).label();
</del><ins>+ MacroAssembler::Address(m_base.payloadGPR(), 0), m_value.payloadGPR()).label();
</ins><span class="cx"> #else
</span><span class="cx"> m_tagLoadOrStore = jit.load32WithCompactAddressOffsetPatch(
</span><del>- MacroAssembler::Address(m_value.payloadGPR(), 0), m_value.tagGPR()).label();
</del><ins>+ MacroAssembler::Address(m_base.payloadGPR(), 0), m_value.tagGPR()).label();
</ins><span class="cx"> m_loadOrStore = jit.load32WithCompactAddressOffsetPatch(
</span><del>- MacroAssembler::Address(m_value.payloadGPR(), 0), m_value.payloadGPR()).label();
</del><ins>+ MacroAssembler::Address(m_base.payloadGPR(), 0), m_value.payloadGPR()).label();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_done = jit.label();
</span><span class="lines">@@ -145,7 +140,6 @@
</span><span class="cx"> ECMAMode ecmaMode, PutKind putKind)
</span><span class="cx"> : JITByIdGenerator(
</span><span class="cx"> codeBlock, codeOrigin, callSite, AccessType::Put, usedRegisters, base, value, spillMode)
</span><del>- , m_scratch(scratch)
</del><span class="cx"> , m_ecmaMode(ecmaMode)
</span><span class="cx"> , m_putKind(putKind)
</span><span class="cx"> {
</span><span class="lines">@@ -154,16 +148,16 @@
</span><span class="cx">
</span><span class="cx"> void JITPutByIdGenerator::generateFastPath(MacroAssembler& jit)
</span><span class="cx"> {
</span><del>- generateFastPathChecks(jit, m_scratch);
</del><ins>+ generateFastPathChecks(jit);
</ins><span class="cx">
</span><span class="cx"> #if USE(JSVALUE64)
</span><span class="cx"> m_loadOrStore = jit.store64WithAddressOffsetPatch(
</span><del>- m_value.payloadGPR(), MacroAssembler::Address(m_scratch, 0)).label();
</del><ins>+ m_value.payloadGPR(), MacroAssembler::Address(m_base.payloadGPR(), 0)).label();
</ins><span class="cx"> #else
</span><span class="cx"> m_tagLoadOrStore = jit.store32WithAddressOffsetPatch(
</span><del>- m_value.tagGPR(), MacroAssembler::Address(m_scratch, 0)).label();
</del><ins>+ m_value.tagGPR(), MacroAssembler::Address(m_base.payloadGPR(), 0)).label();
</ins><span class="cx"> m_loadOrStore = jit.store32WithAddressOffsetPatch(
</span><del>- m_value.payloadGPR(), MacroAssembler::Address(m_scratch, 0)).label();
</del><ins>+ m_value.payloadGPR(), MacroAssembler::Address(m_base.payloadGPR(), 0)).label();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_done = jit.label();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITInlineCacheGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITInlineCacheGenerator.h (190671 => 190672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITInlineCacheGenerator.h 2015-10-07 16:41:29 UTC (rev 190671)
+++ trunk/Source/JavaScriptCore/jit/JITInlineCacheGenerator.h 2015-10-07 17:28:38 UTC (rev 190672)
</span><span class="lines">@@ -74,14 +74,13 @@
</span><span class="cx"> void finalize(LinkBuffer&);
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- void generateFastPathChecks(MacroAssembler&, GPRReg butterfly);
</del><ins>+ void generateFastPathChecks(MacroAssembler&);
</ins><span class="cx">
</span><span class="cx"> JSValueRegs m_base;
</span><span class="cx"> JSValueRegs m_value;
</span><span class="cx">
</span><span class="cx"> MacroAssembler::DataLabel32 m_structureImm;
</span><span class="cx"> MacroAssembler::PatchableJump m_structureCheck;
</span><del>- MacroAssembler::ConvertibleLoadLabel m_propertyStorageLoad;
</del><span class="cx"> AssemblerLabel m_loadOrStore;
</span><span class="cx"> #if USE(JSVALUE32_64)
</span><span class="cx"> AssemblerLabel m_tagLoadOrStore;
</span><span class="lines">@@ -115,7 +114,6 @@
</span><span class="cx"> V_JITOperation_ESsiJJI slowPathFunction();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- GPRReg m_scratch;
</del><span class="cx"> ECMAMode m_ecmaMode;
</span><span class="cx"> PutKind m_putKind;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitRepatchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/Repatch.cpp (190671 => 190672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/Repatch.cpp 2015-10-07 16:41:29 UTC (rev 190671)
+++ trunk/Source/JavaScriptCore/jit/Repatch.cpp 2015-10-07 17:28:38 UTC (rev 190672)
</span><span class="lines">@@ -104,23 +104,18 @@
</span><span class="cx"> MacroAssembler::repatchInt32(
</span><span class="cx"> stubInfo.callReturnLocation.dataLabel32AtOffset(-(intptr_t)stubInfo.patch.deltaCheckImmToCall),
</span><span class="cx"> bitwise_cast<int32_t>(structure->id()));
</span><del>- CodeLocationConvertibleLoad convertibleLoad = stubInfo.callReturnLocation.convertibleLoadAtOffset(stubInfo.patch.deltaCallToStorageLoad);
- if (isOutOfLineOffset(offset))
- MacroAssembler::replaceWithLoad(convertibleLoad);
- else
- MacroAssembler::replaceWithAddressComputation(convertibleLoad);
</del><span class="cx"> #if USE(JSVALUE64)
</span><span class="cx"> if (compact)
</span><del>- MacroAssembler::repatchCompact(stubInfo.callReturnLocation.dataLabelCompactAtOffset(stubInfo.patch.deltaCallToLoadOrStore), offsetRelativeToPatchedStorage(offset));
</del><ins>+ MacroAssembler::repatchCompact(stubInfo.callReturnLocation.dataLabelCompactAtOffset(stubInfo.patch.deltaCallToLoadOrStore), offsetRelativeToBase(offset));
</ins><span class="cx"> else
</span><del>- MacroAssembler::repatchInt32(stubInfo.callReturnLocation.dataLabel32AtOffset(stubInfo.patch.deltaCallToLoadOrStore), offsetRelativeToPatchedStorage(offset));
</del><ins>+ MacroAssembler::repatchInt32(stubInfo.callReturnLocation.dataLabel32AtOffset(stubInfo.patch.deltaCallToLoadOrStore), offsetRelativeToBase(offset));
</ins><span class="cx"> #elif USE(JSVALUE32_64)
</span><span class="cx"> if (compact) {
</span><del>- MacroAssembler::repatchCompact(stubInfo.callReturnLocation.dataLabelCompactAtOffset(stubInfo.patch.deltaCallToTagLoadOrStore), offsetRelativeToPatchedStorage(offset) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.tag));
- MacroAssembler::repatchCompact(stubInfo.callReturnLocation.dataLabelCompactAtOffset(stubInfo.patch.deltaCallToPayloadLoadOrStore), offsetRelativeToPatchedStorage(offset) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.payload));
</del><ins>+ MacroAssembler::repatchCompact(stubInfo.callReturnLocation.dataLabelCompactAtOffset(stubInfo.patch.deltaCallToTagLoadOrStore), offsetRelativeToBase(offset) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.tag));
+ MacroAssembler::repatchCompact(stubInfo.callReturnLocation.dataLabelCompactAtOffset(stubInfo.patch.deltaCallToPayloadLoadOrStore), offsetRelativeToBase(offset) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.payload));
</ins><span class="cx"> } else {
</span><del>- MacroAssembler::repatchInt32(stubInfo.callReturnLocation.dataLabel32AtOffset(stubInfo.patch.deltaCallToTagLoadOrStore), offsetRelativeToPatchedStorage(offset) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.tag));
- MacroAssembler::repatchInt32(stubInfo.callReturnLocation.dataLabel32AtOffset(stubInfo.patch.deltaCallToPayloadLoadOrStore), offsetRelativeToPatchedStorage(offset) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.payload));
</del><ins>+ MacroAssembler::repatchInt32(stubInfo.callReturnLocation.dataLabel32AtOffset(stubInfo.patch.deltaCallToTagLoadOrStore), offsetRelativeToBase(offset) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.tag));
+ MacroAssembler::repatchInt32(stubInfo.callReturnLocation.dataLabel32AtOffset(stubInfo.patch.deltaCallToPayloadLoadOrStore), offsetRelativeToBase(offset) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.payload));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -260,7 +255,8 @@
</span><span class="cx"> && slot.isCacheableValue()
</span><span class="cx"> && slot.slotBase() == baseValue
</span><span class="cx"> && !slot.watchpointSet()
</span><del>- && MacroAssembler::isCompactPtrAlignedAddressOffset(maxOffsetRelativeToPatchedStorage(slot.cachedOffset()))
</del><ins>+ && isInlineOffset(slot.cachedOffset())
+ && MacroAssembler::isCompactPtrAlignedAddressOffset(maxOffsetRelativeToBase(slot.cachedOffset()))
</ins><span class="cx"> && action == AttemptToCache
</span><span class="cx"> && !structure->needImpurePropertyWatchpoint()
</span><span class="cx"> && !loadTargetFromProxy) {
</span><span class="lines">@@ -375,9 +371,9 @@
</span><span class="cx"> if (slot.type() == PutPropertySlot::ExistingProperty) {
</span><span class="cx"> structure->didCachePropertyReplacement(vm, slot.cachedOffset());
</span><span class="cx">
</span><del>- ptrdiff_t offsetToPatchedStorage = offsetRelativeToPatchedStorage(slot.cachedOffset());
</del><span class="cx"> if (stubInfo.cacheType == CacheType::Unset
</span><del>- && MacroAssembler::isPtrAlignedAddressOffset(offsetToPatchedStorage)
</del><ins>+ && isInlineOffset(slot.cachedOffset())
+ && MacroAssembler::isPtrAlignedAddressOffset(maxOffsetRelativeToBase(slot.cachedOffset()))
</ins><span class="cx"> && !structure->needImpurePropertyWatchpoint()
</span><span class="cx"> && !structure->inferredTypeFor(ident.impl())) {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.h (190671 => 190672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.h 2015-10-07 16:41:29 UTC (rev 190671)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.h 2015-10-07 17:28:38 UTC (rev 190672)
</span><span class="lines">@@ -1406,28 +1406,6 @@
</span><span class="cx"> return Butterfly::totalSize(preCapacity, structure->outOfLineCapacity(), hasIndexingHeader, indexingPayloadSizeInBytes);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Helpers for patching code where you want to emit a load or store and
-// the base is:
-// For inline offsets: a pointer to the out-of-line storage pointer.
-// For out-of-line offsets: the base of the out-of-line storage.
-inline size_t offsetRelativeToPatchedStorage(PropertyOffset offset)
-{
- if (isOutOfLineOffset(offset))
- return sizeof(EncodedJSValue) * offsetInButterfly(offset);
- return JSObject::offsetOfInlineStorage() - JSObject::butterflyOffset() + sizeof(EncodedJSValue) * offsetInInlineStorage(offset);
-}
-
-// Returns the maximum offset (away from zero) a load instruction will encode.
-inline size_t maxOffsetRelativeToPatchedStorage(PropertyOffset offset)
-{
- ptrdiff_t addressOffset = static_cast<ptrdiff_t>(offsetRelativeToPatchedStorage(offset));
-#if USE(JSVALUE32_64)
- if (addressOffset >= 0)
- return static_cast<size_t>(addressOffset) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.tag);
-#endif
- return static_cast<size_t>(addressOffset);
-}
-
</del><span class="cx"> inline int indexRelativeToBase(PropertyOffset offset)
</span><span class="cx"> {
</span><span class="cx"> if (isOutOfLineOffset(offset))
</span><span class="lines">@@ -1443,6 +1421,17 @@
</span><span class="cx"> return JSObject::offsetOfInlineStorage() + offsetInInlineStorage(offset) * sizeof(EncodedJSValue);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Returns the maximum offset (away from zero) a load instruction will encode.
+inline size_t maxOffsetRelativeToBase(PropertyOffset offset)
+{
+ ptrdiff_t addressOffset = offsetRelativeToBase(offset);
+#if USE(JSVALUE32_64)
+ if (addressOffset >= 0)
+ return static_cast<size_t>(addressOffset) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.tag);
+#endif
+ return static_cast<size_t>(addressOffset);
+}
+
</ins><span class="cx"> COMPILE_ASSERT(!(sizeof(JSObject) % sizeof(WriteBarrierBase<Unknown>)), JSObject_inline_storage_has_correct_alignment);
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE Identifier makeIdentifier(VM& vm, const char* name)
</span></span></pre>
</div>
</div>
</body>
</html>