<!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>[191965] 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/191965">191965</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2015-11-03 12:02:02 -0800 (Tue, 03 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename InlineCallFrame:: getCallerSkippingDeadFrames to something more descriptive
https://bugs.webkit.org/show_bug.cgi?id=150832
Reviewed by Geoffrey Garen.
Renamed InlineCallFrame::getCallerSkippingDeadFrames() to getCallerSkippingTailCalls().
Did similar renaming to helper InlineCallFrame::computeCallerSkippingTailCalls() and
InlineCallFrame::getCallerInlineFrameSkippingTailCalls().
* bytecode/InlineCallFrame.h:
(JSC::InlineCallFrame::computeCallerSkippingTailCalls):
(JSC::InlineCallFrame::getCallerSkippingTailCalls):
(JSC::InlineCallFrame::getCallerInlineFrameSkippingTailCalls):
(JSC::InlineCallFrame::computeCallerSkippingDeadFrames): Deleted.
(JSC::InlineCallFrame::getCallerSkippingDeadFrames): Deleted.
(JSC::InlineCallFrame::getCallerInlineFrameSkippingDeadFrames): Deleted.
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::allInlineFramesAreTailCalls):
(JSC::DFG::ByteCodeParser::currentCodeOrigin):
(JSC::DFG::ByteCodeParser::getPredictionWithoutOSRExit):
* dfg/DFGGraph.cpp:
(JSC::DFG::Graph::isLiveInBytecode):
* dfg/DFGGraph.h:
(JSC::DFG::Graph::forAllLocalsLiveInBytecode):
* dfg/DFGOSRExitCompilerCommon.cpp:
(JSC::DFG::reifyInlinedCallFrames):
* dfg/DFGPreciseLocalClobberize.h:
(JSC::DFG::PreciseLocalClobberizeAdaptor::readTop):
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::emitCall):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::emitCall):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::codeOriginDescriptionOfCallSite):
* interpreter/StackVisitor.cpp:
(JSC::StackVisitor::gotoNextFrame):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeInlineCallFrameh">trunk/Source/JavaScriptCore/bytecode/InlineCallFrame.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGGraphcpp">trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGGraphh">trunk/Source/JavaScriptCore/dfg/DFGGraph.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGOSRExitCompilerCommoncpp">trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPreciseLocalClobberizeh">trunk/Source/JavaScriptCore/dfg/DFGPreciseLocalClobberize.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterStackVisitorcpp">trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (191964 => 191965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-11-03 19:59:57 UTC (rev 191964)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-11-03 20:02:02 UTC (rev 191965)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2015-11-03 Michael Saboff <msaboff@apple.com>
+
+ Rename InlineCallFrame:: getCallerSkippingDeadFrames to something more descriptive
+ https://bugs.webkit.org/show_bug.cgi?id=150832
+
+ Reviewed by Geoffrey Garen.
+
+ Renamed InlineCallFrame::getCallerSkippingDeadFrames() to getCallerSkippingTailCalls().
+ Did similar renaming to helper InlineCallFrame::computeCallerSkippingTailCalls() and
+ InlineCallFrame::getCallerInlineFrameSkippingTailCalls().
+
+ * bytecode/InlineCallFrame.h:
+ (JSC::InlineCallFrame::computeCallerSkippingTailCalls):
+ (JSC::InlineCallFrame::getCallerSkippingTailCalls):
+ (JSC::InlineCallFrame::getCallerInlineFrameSkippingTailCalls):
+ (JSC::InlineCallFrame::computeCallerSkippingDeadFrames): Deleted.
+ (JSC::InlineCallFrame::getCallerSkippingDeadFrames): Deleted.
+ (JSC::InlineCallFrame::getCallerInlineFrameSkippingDeadFrames): Deleted.
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::allInlineFramesAreTailCalls):
+ (JSC::DFG::ByteCodeParser::currentCodeOrigin):
+ (JSC::DFG::ByteCodeParser::getPredictionWithoutOSRExit):
+ * dfg/DFGGraph.cpp:
+ (JSC::DFG::Graph::isLiveInBytecode):
+ * dfg/DFGGraph.h:
+ (JSC::DFG::Graph::forAllLocalsLiveInBytecode):
+ * dfg/DFGOSRExitCompilerCommon.cpp:
+ (JSC::DFG::reifyInlinedCallFrames):
+ * dfg/DFGPreciseLocalClobberize.h:
+ (JSC::DFG::PreciseLocalClobberizeAdaptor::readTop):
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::emitCall):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::emitCall):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::codeOriginDescriptionOfCallSite):
+ * interpreter/StackVisitor.cpp:
+ (JSC::StackVisitor::gotoNextFrame):
+
</ins><span class="cx"> 2015-11-02 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> B3/Air should use bubble sort for their insertion sets, because it's faster than std::stable_sort
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeInlineCallFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/InlineCallFrame.h (191964 => 191965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/InlineCallFrame.h 2015-11-03 19:59:57 UTC (rev 191964)
+++ trunk/Source/JavaScriptCore/bytecode/InlineCallFrame.h 2015-11-03 20:02:02 UTC (rev 191965)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> return isTail(static_cast<Kind>(kind));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static CodeOrigin* computeCallerSkippingDeadFrames(InlineCallFrame* inlineCallFrame, Kind* callerCallKind = nullptr)
</del><ins>+ static CodeOrigin* computeCallerSkippingTailCalls(InlineCallFrame* inlineCallFrame, Kind* callerCallKind = nullptr)
</ins><span class="cx"> {
</span><span class="cx"> CodeOrigin* codeOrigin;
</span><span class="cx"> bool tailCallee;
</span><span class="lines">@@ -167,14 +167,14 @@
</span><span class="cx"> return codeOrigin;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CodeOrigin* getCallerSkippingDeadFrames(Kind* callerCallKind = nullptr)
</del><ins>+ CodeOrigin* getCallerSkippingTailCalls(Kind* callerCallKind = nullptr)
</ins><span class="cx"> {
</span><del>- return computeCallerSkippingDeadFrames(this, callerCallKind);
</del><ins>+ return computeCallerSkippingTailCalls(this, callerCallKind);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InlineCallFrame* getCallerInlineFrameSkippingDeadFrames()
</del><ins>+ InlineCallFrame* getCallerInlineFrameSkippingTailCalls()
</ins><span class="cx"> {
</span><del>- CodeOrigin* caller = getCallerSkippingDeadFrames();
</del><ins>+ CodeOrigin* caller = getCallerSkippingTailCalls();
</ins><span class="cx"> return caller ? caller->inlineCallFrame : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (191964 => 191965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-11-03 19:59:57 UTC (rev 191964)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-11-03 20:02:02 UTC (rev 191965)
</span><span class="lines">@@ -652,7 +652,7 @@
</span><span class="cx">
</span><span class="cx"> bool allInlineFramesAreTailCalls()
</span><span class="cx"> {
</span><del>- return !inlineCallFrame() || !inlineCallFrame()->getCallerSkippingDeadFrames();
</del><ins>+ return !inlineCallFrame() || !inlineCallFrame()->getCallerSkippingTailCalls();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CodeOrigin currentCodeOrigin()
</span><span class="lines">@@ -815,7 +815,7 @@
</span><span class="cx"> prediction = SpecFullTop;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- CodeOrigin* codeOrigin = inlineCallFrame()->getCallerSkippingDeadFrames();
</del><ins>+ CodeOrigin* codeOrigin = inlineCallFrame()->getCallerSkippingTailCalls();
</ins><span class="cx"> if (!codeOrigin) {
</span><span class="cx"> prediction = SpecFullTop;
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGGraphcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp (191964 => 191965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp 2015-11-03 19:59:57 UTC (rev 191964)
+++ trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp 2015-11-03 20:02:02 UTC (rev 191965)
</span><span class="lines">@@ -1000,7 +1000,7 @@
</span><span class="cx"> && static_cast<size_t>(reg.toArgument()) < inlineCallFrame->arguments.size())
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- codeOriginPtr = inlineCallFrame->getCallerSkippingDeadFrames();
</del><ins>+ codeOriginPtr = inlineCallFrame->getCallerSkippingTailCalls();
</ins><span class="cx">
</span><span class="cx"> // The first inline call frame could be an inline tail call
</span><span class="cx"> if (!codeOriginPtr)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGGraphh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGGraph.h (191964 => 191965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGGraph.h 2015-11-03 19:59:57 UTC (rev 191964)
+++ trunk/Source/JavaScriptCore/dfg/DFGGraph.h 2015-11-03 20:02:02 UTC (rev 191965)
</span><span class="lines">@@ -762,7 +762,7 @@
</span><span class="cx"> for (VirtualRegister reg = exclusionStart; reg < exclusionEnd; reg += 1)
</span><span class="cx"> functor(reg);
</span><span class="cx">
</span><del>- codeOriginPtr = inlineCallFrame->getCallerSkippingDeadFrames();
</del><ins>+ codeOriginPtr = inlineCallFrame->getCallerSkippingTailCalls();
</ins><span class="cx">
</span><span class="cx"> // The first inline call frame could be an inline tail call
</span><span class="cx"> if (!codeOriginPtr)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGOSRExitCompilerCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp (191964 => 191965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp 2015-11-03 19:59:57 UTC (rev 191964)
+++ trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp 2015-11-03 20:02:02 UTC (rev 191965)
</span><span class="lines">@@ -143,11 +143,11 @@
</span><span class="cx"> jit.storePtr(AssemblyHelpers::TrustedImmPtr(jit.baselineCodeBlock()), AssemblyHelpers::addressFor((VirtualRegister)JSStack::CodeBlock));
</span><span class="cx">
</span><span class="cx"> const CodeOrigin* codeOrigin;
</span><del>- for (codeOrigin = &exit.m_codeOrigin; codeOrigin && codeOrigin->inlineCallFrame; codeOrigin = codeOrigin->inlineCallFrame->getCallerSkippingDeadFrames()) {
</del><ins>+ for (codeOrigin = &exit.m_codeOrigin; codeOrigin && codeOrigin->inlineCallFrame; codeOrigin = codeOrigin->inlineCallFrame->getCallerSkippingTailCalls()) {
</ins><span class="cx"> InlineCallFrame* inlineCallFrame = codeOrigin->inlineCallFrame;
</span><span class="cx"> CodeBlock* baselineCodeBlock = jit.baselineCodeBlockFor(*codeOrigin);
</span><span class="cx"> InlineCallFrame::Kind trueCallerCallKind;
</span><del>- CodeOrigin* trueCaller = inlineCallFrame->getCallerSkippingDeadFrames(&trueCallerCallKind);
</del><ins>+ CodeOrigin* trueCaller = inlineCallFrame->getCallerSkippingTailCalls(&trueCallerCallKind);
</ins><span class="cx"> GPRReg callerFrameGPR = GPRInfo::callFrameRegister;
</span><span class="cx">
</span><span class="cx"> if (!trueCaller) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPreciseLocalClobberizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPreciseLocalClobberize.h (191964 => 191965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPreciseLocalClobberize.h 2015-11-03 19:59:57 UTC (rev 191964)
+++ trunk/Source/JavaScriptCore/dfg/DFGPreciseLocalClobberize.h 2015-11-03 20:02:02 UTC (rev 191965)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> m_read(VirtualRegister(i));
</span><span class="cx">
</span><span class="cx"> // Read all of the inline arguments and call frame headers that we didn't already capture.
</span><del>- for (InlineCallFrame* inlineCallFrame = m_node->origin.semantic.inlineCallFrame; inlineCallFrame; inlineCallFrame = inlineCallFrame->getCallerInlineFrameSkippingDeadFrames()) {
</del><ins>+ for (InlineCallFrame* inlineCallFrame = m_node->origin.semantic.inlineCallFrame; inlineCallFrame; inlineCallFrame = inlineCallFrame->getCallerInlineFrameSkippingTailCalls()) {
</ins><span class="cx"> for (unsigned i = inlineCallFrame->arguments.size(); i-- > 1;)
</span><span class="cx"> m_read(VirtualRegister(inlineCallFrame->stackOffset + virtualRegisterForArgument(i).offset()));
</span><span class="cx"> if (inlineCallFrame->isClosureCall)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (191964 => 191965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-11-03 19:59:57 UTC (rev 191964)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-11-03 20:02:02 UTC (rev 191965)
</span><span class="lines">@@ -855,10 +855,10 @@
</span><span class="cx"> JITCompiler::JumpList slowPath;
</span><span class="cx">
</span><span class="cx"> CodeOrigin staticOrigin = node->origin.semantic;
</span><del>- ASSERT(!isTail || !staticOrigin.inlineCallFrame || !staticOrigin.inlineCallFrame->getCallerSkippingDeadFrames());
- ASSERT(!isEmulatedTail || (staticOrigin.inlineCallFrame && staticOrigin.inlineCallFrame->getCallerSkippingDeadFrames()));
</del><ins>+ ASSERT(!isTail || !staticOrigin.inlineCallFrame || !staticOrigin.inlineCallFrame->getCallerSkippingTailCalls());
+ ASSERT(!isEmulatedTail || (staticOrigin.inlineCallFrame && staticOrigin.inlineCallFrame->getCallerSkippingTailCalls()));
</ins><span class="cx"> CodeOrigin dynamicOrigin =
</span><del>- isEmulatedTail ? *staticOrigin.inlineCallFrame->getCallerSkippingDeadFrames() : staticOrigin;
</del><ins>+ isEmulatedTail ? *staticOrigin.inlineCallFrame->getCallerSkippingTailCalls() : staticOrigin;
</ins><span class="cx"> CallSiteIndex callSite = m_jit.recordCallSiteAndGenerateExceptionHandlingOSRExitIfNeeded(dynamicOrigin, m_stream->size());
</span><span class="cx"> m_jit.emitStoreCallSiteIndex(callSite);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (191964 => 191965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-11-03 19:59:57 UTC (rev 191964)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-11-03 20:02:02 UTC (rev 191965)
</span><span class="lines">@@ -820,10 +820,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CodeOrigin staticOrigin = node->origin.semantic;
</span><del>- ASSERT(!isTail || !staticOrigin.inlineCallFrame || !staticOrigin.inlineCallFrame->getCallerSkippingDeadFrames());
- ASSERT(!isEmulatedTail || (staticOrigin.inlineCallFrame && staticOrigin.inlineCallFrame->getCallerSkippingDeadFrames()));
</del><ins>+ ASSERT(!isTail || !staticOrigin.inlineCallFrame || !staticOrigin.inlineCallFrame->getCallerSkippingTailCalls());
+ ASSERT(!isEmulatedTail || (staticOrigin.inlineCallFrame && staticOrigin.inlineCallFrame->getCallerSkippingTailCalls()));
</ins><span class="cx"> CodeOrigin dynamicOrigin =
</span><del>- isEmulatedTail ? *staticOrigin.inlineCallFrame->getCallerSkippingDeadFrames() : staticOrigin;
</del><ins>+ isEmulatedTail ? *staticOrigin.inlineCallFrame->getCallerSkippingTailCalls() : staticOrigin;
</ins><span class="cx">
</span><span class="cx"> CallSiteIndex callSite = m_jit.recordCallSiteAndGenerateExceptionHandlingOSRExitIfNeeded(dynamicOrigin, m_stream->size());
</span><span class="cx"> m_jit.emitStoreCallSiteIndex(callSite);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (191964 => 191965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-11-03 19:59:57 UTC (rev 191964)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-11-03 20:02:02 UTC (rev 191965)
</span><span class="lines">@@ -8744,7 +8744,7 @@
</span><span class="cx"> // to baz and baz is inlined in bar. And then baz makes a tail-call to jaz,
</span><span class="cx"> // and jaz is inlined in baz. We want the callframe for jaz to appear to
</span><span class="cx"> // have caller be bar.
</span><del>- codeOrigin = *codeOrigin.inlineCallFrame->getCallerSkippingDeadFrames();
</del><ins>+ codeOrigin = *codeOrigin.inlineCallFrame->getCallerSkippingTailCalls();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return codeOrigin;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterStackVisitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp (191964 => 191965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp 2015-11-03 19:59:57 UTC (rev 191964)
+++ trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp 2015-11-03 20:02:02 UTC (rev 191965)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx"> if (m_frame.isInlinedFrame()) {
</span><span class="cx"> InlineCallFrame* inlineCallFrame = m_frame.inlineCallFrame();
</span><del>- CodeOrigin* callerCodeOrigin = inlineCallFrame->getCallerSkippingDeadFrames();
</del><ins>+ CodeOrigin* callerCodeOrigin = inlineCallFrame->getCallerSkippingTailCalls();
</ins><span class="cx"> if (!callerCodeOrigin) {
</span><span class="cx"> while (inlineCallFrame) {
</span><span class="cx"> readInlinedFrame(m_frame.callFrame(), &inlineCallFrame->directCaller);
</span></span></pre>
</div>
</div>
</body>
</html>