<!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>[189272] 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/189272">189272</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-09-02 20:16:47 -0700 (Wed, 02 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace all the various forms of branchStructure() with a single method in AssemblyHelpers
https://bugs.webkit.org/show_bug.cgi?id=148725
Reviewed by Saam Barati.
Previously there were the following branchStructure() implementations:
JSC::JIT::branchStructure()
JSC::branchStructure()
JSC::DFG::JITCompiler::branchStructurePtr()
They all did the same thing. Now there is only one, AssemblyHelpers::branchStructure().
* dfg/DFGJITCompiler.h:
(JSC::DFG::JITCompiler::branchWeakStructure):
(JSC::DFG::JITCompiler::jitCode):
(JSC::DFG::JITCompiler::branchStructurePtr): Deleted.
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileToStringOrCallStringConstructorOnCell):
(JSC::DFG::SpeculativeJIT::speculateStringOrStringObject):
* dfg/DFGSpeculativeJIT.h:
(JSC::DFG::SpeculativeJIT::speculateStringObjectForStructure):
* jit/AssemblyHelpers.h:
(JSC::AssemblyHelpers::branchIfEmpty):
(JSC::AssemblyHelpers::branchStructure):
(JSC::AssemblyHelpers::addressForByteOffset):
* jit/JIT.h:
* jit/JITInlines.h:
(JSC::JIT::branchStructure): Deleted.
(JSC::branchStructure): Deleted.
* jit/JITPropertyAccess.cpp:
(JSC::JIT::stringGetByValStubGenerator):
* jit/JITPropertyAccess32_64.cpp:
(JSC::JIT::stringGetByValStubGenerator):
* jit/Repatch.cpp:
(JSC::checkObjectPropertyCondition):
(JSC::checkObjectPropertyConditions):
(JSC::generateByIdStub):
(JSC::emitPutReplaceStub):
(JSC::emitPutTransitionStub):
(JSC::tryRepatchIn):
* jit/SpecializedThunkJIT.h:
(JSC::SpecializedThunkJIT::loadJSStringArgument):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</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="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITh">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitAssemblyHelpersh">trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITh">trunk/Source/JavaScriptCore/jit/JIT.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITInlinesh">trunk/Source/JavaScriptCore/jit/JITInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITPropertyAccesscpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITPropertyAccess32_64cpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitRepatchcpp">trunk/Source/JavaScriptCore/jit/Repatch.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitSpecializedThunkJITh">trunk/Source/JavaScriptCore/jit/SpecializedThunkJIT.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (189271 => 189272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-03 03:08:13 UTC (rev 189271)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-03 03:16:47 UTC (rev 189272)
</span><span class="lines">@@ -1,5 +1,51 @@
</span><span class="cx"> 2015-09-02 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ Replace all the various forms of branchStructure() with a single method in AssemblyHelpers
+ https://bugs.webkit.org/show_bug.cgi?id=148725
+
+ Reviewed by Saam Barati.
+
+ Previously there were the following branchStructure() implementations:
+
+ JSC::JIT::branchStructure()
+ JSC::branchStructure()
+ JSC::DFG::JITCompiler::branchStructurePtr()
+
+ They all did the same thing. Now there is only one, AssemblyHelpers::branchStructure().
+
+ * dfg/DFGJITCompiler.h:
+ (JSC::DFG::JITCompiler::branchWeakStructure):
+ (JSC::DFG::JITCompiler::jitCode):
+ (JSC::DFG::JITCompiler::branchStructurePtr): Deleted.
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileToStringOrCallStringConstructorOnCell):
+ (JSC::DFG::SpeculativeJIT::speculateStringOrStringObject):
+ * dfg/DFGSpeculativeJIT.h:
+ (JSC::DFG::SpeculativeJIT::speculateStringObjectForStructure):
+ * jit/AssemblyHelpers.h:
+ (JSC::AssemblyHelpers::branchIfEmpty):
+ (JSC::AssemblyHelpers::branchStructure):
+ (JSC::AssemblyHelpers::addressForByteOffset):
+ * jit/JIT.h:
+ * jit/JITInlines.h:
+ (JSC::JIT::branchStructure): Deleted.
+ (JSC::branchStructure): Deleted.
+ * jit/JITPropertyAccess.cpp:
+ (JSC::JIT::stringGetByValStubGenerator):
+ * jit/JITPropertyAccess32_64.cpp:
+ (JSC::JIT::stringGetByValStubGenerator):
+ * jit/Repatch.cpp:
+ (JSC::checkObjectPropertyCondition):
+ (JSC::checkObjectPropertyConditions):
+ (JSC::generateByIdStub):
+ (JSC::emitPutReplaceStub):
+ (JSC::emitPutTransitionStub):
+ (JSC::tryRepatchIn):
+ * jit/SpecializedThunkJIT.h:
+ (JSC::SpecializedThunkJIT::loadJSStringArgument):
+
+2015-09-02 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> Remove some unused methods from GetByIdAccess.
</span><span class="cx">
</span><span class="cx"> Rubber stamped by Michael Saboff.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGJITCompilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.h (189271 => 189272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.h 2015-09-03 03:08:13 UTC (rev 189271)
+++ trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.h 2015-09-03 03:16:47 UTC (rev 189272)
</span><span class="lines">@@ -254,16 +254,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- template<typename T>
- Jump branchStructurePtr(RelationalCondition cond, T left, Structure* structure)
- {
-#if USE(JSVALUE64)
- return branch32(cond, left, TrustedImm32(structure->id()));
-#else
- return branchPtr(cond, left, TrustedImmPtr(structure));
-#endif
- }
-
</del><span class="cx"> void noticeOSREntry(BasicBlock&, JITCompiler::Label blockHead, LinkBuffer&);
</span><span class="cx">
</span><span class="cx"> RefPtr<JITCode> jitCode() { return m_jitCode; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (189271 => 189272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-09-03 03:08:13 UTC (rev 189271)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-09-03 03:16:47 UTC (rev 189272)
</span><span class="lines">@@ -5351,7 +5351,7 @@
</span><span class="cx"> GPRReg resultGPR = result.gpr();
</span><span class="cx">
</span><span class="cx"> m_jit.load32(JITCompiler::Address(op1GPR, JSCell::structureIDOffset()), resultGPR);
</span><del>- JITCompiler::Jump isString = m_jit.branchStructurePtr(
</del><ins>+ JITCompiler::Jump isString = m_jit.branchStructure(
</ins><span class="cx"> JITCompiler::Equal,
</span><span class="cx"> resultGPR,
</span><span class="cx"> m_jit.vm()->stringStructure.get());
</span><span class="lines">@@ -5771,7 +5771,7 @@
</span><span class="cx"> GPRReg structureIDGPR = structureID.gpr();
</span><span class="cx">
</span><span class="cx"> m_jit.load32(JITCompiler::Address(gpr, JSCell::structureIDOffset()), structureIDGPR);
</span><del>- JITCompiler::Jump isString = m_jit.branchStructurePtr(
</del><ins>+ JITCompiler::Jump isString = m_jit.branchStructure(
</ins><span class="cx"> JITCompiler::Equal,
</span><span class="cx"> structureIDGPR,
</span><span class="cx"> m_jit.vm()->stringStructure.get());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h (189271 => 189272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h 2015-09-03 03:08:13 UTC (rev 189271)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h 2015-09-03 03:16:47 UTC (rev 189272)
</span><span class="lines">@@ -3269,7 +3269,7 @@
</span><span class="cx"> if (!m_state.forNode(edge).m_structure.isSubsetOf(StructureSet(stringObjectStructure))) {
</span><span class="cx"> speculationCheck(
</span><span class="cx"> NotStringObject, JSValueRegs(), 0,
</span><del>- m_jit.branchStructurePtr(
</del><ins>+ m_jit.branchStructure(
</ins><span class="cx"> JITCompiler::NotEqual, structureLocation, stringObjectStructure));
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitAssemblyHelpersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h (189271 => 189272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h 2015-09-03 03:08:13 UTC (rev 189271)
+++ trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h 2015-09-03 03:16:47 UTC (rev 189272)
</span><span class="lines">@@ -564,6 +564,16 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ template<typename T>
+ Jump branchStructure(RelationalCondition condition, T leftHandSide, Structure* structure)
+ {
+#if USE(JSVALUE64)
+ return branch32(condition, leftHandSide, TrustedImm32(structure->id()));
+#else
+ return branchPtr(condition, leftHandSide, TrustedImmPtr(structure));
+#endif
+ }
+
</ins><span class="cx"> static Address addressForByteOffset(ptrdiff_t byteOffset)
</span><span class="cx"> {
</span><span class="cx"> return Address(GPRInfo::callFrameRegister, byteOffset);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.h (189271 => 189272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.h 2015-09-03 03:08:13 UTC (rev 189271)
+++ trunk/Source/JavaScriptCore/jit/JIT.h 2015-09-03 03:16:47 UTC (rev 189272)
</span><span class="lines">@@ -404,8 +404,6 @@
</span><span class="cx">
</span><span class="cx"> enum FinalObjectMode { MayBeFinal, KnownNotFinal };
</span><span class="cx">
</span><del>- template <typename T> Jump branchStructure(RelationalCondition, T leftHandSide, Structure*);
-
</del><span class="cx"> #if USE(JSVALUE32_64)
</span><span class="cx"> bool getOperandConstantImmediateInt(int op1, int op2, int& op, int32_t& constant);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITInlines.h (189271 => 189272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITInlines.h 2015-09-03 03:08:13 UTC (rev 189271)
+++ trunk/Source/JavaScriptCore/jit/JITInlines.h 2015-09-03 03:16:47 UTC (rev 189272)
</span><span class="lines">@@ -1259,26 +1259,6 @@
</span><span class="cx">
</span><span class="cx"> #endif // USE(JSVALUE32_64)
</span><span class="cx">
</span><del>-template <typename T>
-JIT::Jump JIT::branchStructure(RelationalCondition condition, T leftHandSide, Structure* structure)
-{
-#if USE(JSVALUE64)
- return branch32(condition, leftHandSide, TrustedImm32(structure->id()));
-#else
- return branchPtr(condition, leftHandSide, TrustedImmPtr(structure));
-#endif
-}
-
-template <typename T>
-MacroAssembler::Jump branchStructure(MacroAssembler& jit, MacroAssembler::RelationalCondition condition, T leftHandSide, Structure* structure)
-{
-#if USE(JSVALUE64)
- return jit.branch32(condition, leftHandSide, MacroAssembler::TrustedImm32(structure->id()));
-#else
- return jit.branchPtr(condition, leftHandSide, MacroAssembler::TrustedImmPtr(structure));
-#endif
-}
-
</del><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(JIT)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp (189271 => 189272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2015-09-03 03:08:13 UTC (rev 189271)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2015-09-03 03:16:47 UTC (rev 189272)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSInterfaceJIT jit(vm);
</span><span class="cx"> JumpList failures;
</span><del>- failures.append(JSC::branchStructure(jit,
</del><ins>+ failures.append(jit.branchStructure(
</ins><span class="cx"> NotEqual,
</span><span class="cx"> Address(regT0, JSCell::structureIDOffset()),
</span><span class="cx"> vm->stringStructure.get()));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccess32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp (189271 => 189272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp 2015-09-03 03:08:13 UTC (rev 189271)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp 2015-09-03 03:16:47 UTC (rev 189272)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSInterfaceJIT jit(vm);
</span><span class="cx"> JumpList failures;
</span><del>- failures.append(JSC::branchStructure(jit, NotEqual, Address(regT0, JSCell::structureIDOffset()), vm->stringStructure.get()));
</del><ins>+ failures.append(jit.branchStructure(NotEqual, Address(regT0, JSCell::structureIDOffset()), vm->stringStructure.get()));
</ins><span class="cx">
</span><span class="cx"> // Load string length to regT1, and start the process of loading the data pointer into regT0
</span><span class="cx"> jit.load32(Address(regT0, ThunkHelpers::jsStringLengthOffset()), regT1);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitRepatchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/Repatch.cpp (189271 => 189272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/Repatch.cpp 2015-09-03 03:08:13 UTC (rev 189271)
+++ trunk/Source/JavaScriptCore/jit/Repatch.cpp 2015-09-03 03:16:47 UTC (rev 189272)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx">
</span><span class="cx"> static void checkObjectPropertyCondition(
</span><span class="cx"> const ObjectPropertyCondition& condition, CodeBlock* codeBlock, StructureStubInfo& stubInfo,
</span><del>- MacroAssembler& jit, MacroAssembler::JumpList& failureCases, GPRReg scratchGPR)
</del><ins>+ CCallHelpers& jit, MacroAssembler::JumpList& failureCases, GPRReg scratchGPR)
</ins><span class="cx"> {
</span><span class="cx"> if (condition.isWatchableAssumingImpurePropertyWatchpoint()) {
</span><span class="cx"> condition.object()->structure()->addTransitionWatchpoint(
</span><span class="lines">@@ -146,14 +146,14 @@
</span><span class="cx"> RELEASE_ASSERT(condition.structureEnsuresValidityAssumingImpurePropertyWatchpoint(structure));
</span><span class="cx"> jit.move(MacroAssembler::TrustedImmPtr(condition.object()), scratchGPR);
</span><span class="cx"> failureCases.append(
</span><del>- branchStructure(
- jit, MacroAssembler::NotEqual,
</del><ins>+ jit.branchStructure(
+ MacroAssembler::NotEqual,
</ins><span class="cx"> MacroAssembler::Address(scratchGPR, JSCell::structureIDOffset()), structure));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void checkObjectPropertyConditions(
</span><span class="cx"> const ObjectPropertyConditionSet& set, CodeBlock* codeBlock, StructureStubInfo& stubInfo,
</span><del>- MacroAssembler& jit, MacroAssembler::JumpList& failureCases, GPRReg scratchGPR)
</del><ins>+ CCallHelpers& jit, MacroAssembler::JumpList& failureCases, GPRReg scratchGPR)
</ins><span class="cx"> {
</span><span class="cx"> for (const ObjectPropertyCondition& condition : set) {
</span><span class="cx"> checkObjectPropertyCondition(
</span><span class="lines">@@ -320,14 +320,14 @@
</span><span class="cx">
</span><span class="cx"> stubJit.loadPtr(MacroAssembler::Address(baseGPR, JSProxy::targetOffset()), scratchGPR);
</span><span class="cx">
</span><del>- failureCases.append(branchStructure(stubJit,
</del><ins>+ failureCases.append(stubJit.branchStructure(
</ins><span class="cx"> MacroAssembler::NotEqual,
</span><span class="cx"> MacroAssembler::Address(scratchGPR, JSCell::structureIDOffset()),
</span><span class="cx"> structure));
</span><span class="cx"> } else {
</span><span class="cx"> baseForGetGPR = baseGPR;
</span><span class="cx">
</span><del>- failureCases.append(branchStructure(stubJit,
</del><ins>+ failureCases.append(stubJit.branchStructure(
</ins><span class="cx"> MacroAssembler::NotEqual,
</span><span class="cx"> MacroAssembler::Address(baseForGetGPR, JSCell::structureIDOffset()),
</span><span class="cx"> structure));
</span><span class="lines">@@ -918,7 +918,7 @@
</span><span class="cx">
</span><span class="cx"> size_t numberOfPaddingBytes = allocator.preserveReusedRegistersByPushing(stubJit);
</span><span class="cx">
</span><del>- MacroAssembler::Jump badStructure = branchStructure(stubJit,
</del><ins>+ MacroAssembler::Jump badStructure = stubJit.branchStructure(
</ins><span class="cx"> MacroAssembler::NotEqual,
</span><span class="cx"> MacroAssembler::Address(baseGPR, JSCell::structureIDOffset()),
</span><span class="cx"> structure);
</span><span class="lines">@@ -1059,7 +1059,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(oldStructure->transitionWatchpointSetHasBeenInvalidated());
</span><span class="cx">
</span><del>- failureCases.append(branchStructure(stubJit,
</del><ins>+ failureCases.append(stubJit.branchStructure(
</ins><span class="cx"> MacroAssembler::NotEqual,
</span><span class="cx"> MacroAssembler::Address(baseGPR, JSCell::structureIDOffset()),
</span><span class="cx"> oldStructure));
</span><span class="lines">@@ -1532,7 +1532,7 @@
</span><span class="cx"> needToRestoreScratch = false;
</span><span class="cx">
</span><span class="cx"> MacroAssembler::JumpList failureCases;
</span><del>- failureCases.append(branchStructure(stubJit,
</del><ins>+ failureCases.append(stubJit.branchStructure(
</ins><span class="cx"> MacroAssembler::NotEqual,
</span><span class="cx"> MacroAssembler::Address(baseGPR, JSCell::structureIDOffset()),
</span><span class="cx"> structure));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitSpecializedThunkJITh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/SpecializedThunkJIT.h (189271 => 189272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/SpecializedThunkJIT.h 2015-09-03 03:08:13 UTC (rev 189271)
+++ trunk/Source/JavaScriptCore/jit/SpecializedThunkJIT.h 2015-09-03 03:16:47 UTC (rev 189272)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> void loadJSStringArgument(VM& vm, int argument, RegisterID dst)
</span><span class="cx"> {
</span><span class="cx"> loadCellArgument(argument, dst);
</span><del>- m_failures.append(branchStructure(*this, NotEqual,
</del><ins>+ m_failures.append(branchStructure(NotEqual,
</ins><span class="cx"> Address(dst, JSCell::structureIDOffset()),
</span><span class="cx"> vm.stringStructure.get()));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>