<!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>[178856] 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/178856">178856</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2015-01-21 13:43:55 -0800 (Wed, 21 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate Scope slot from JavaScript CallFrame
https://bugs.webkit.org/show_bug.cgi?id=136724
Reviewed by Geoffrey Garen.
This finishes the removal of the scope chain slot from the call frame header.
* 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/FTLJSCall.cpp:
(JSC::FTL::JSCall::emit):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::compileNativeCallOrConstruct):
(JSC::FTL::LowerDFGToLLVM::compileCallOrConstruct):
* interpreter/JSStack.h:
* interpreter/VMInspector.cpp:
(JSC::VMInspector::dumpFrame):
* jit/JITCall.cpp:
(JSC::JIT::compileOpCall):
* jit/JITCall32_64.cpp:
(JSC::JIT::compileOpCall):
* jit/JITOpcodes32_64.cpp:
(JSC::JIT::privateCompileCTINativeCall):
* jit/Repatch.cpp:
(JSC::generateByIdStub):
(JSC::linkClosureCall):
* jit/ThunkGenerators.cpp:
(JSC::virtualForThunkGenerator):
(JSC::nativeForGenerator):
Deleted ScopeChain slot from JSStack. Removed all code where ScopeChain was being
read or set. In most cases this was where we make JS calls.
* interpreter/CallFrameClosure.h:
(JSC::CallFrameClosure::setArgument):
(JSC::CallFrameClosure::resetCallFrame): Deleted.
* interpreter/Interpreter.cpp:
(JSC::Interpreter::execute):
(JSC::Interpreter::executeCall):
(JSC::Interpreter::executeConstruct):
(JSC::Interpreter::prepareForRepeatCall):
* interpreter/ProtoCallFrame.cpp:
(JSC::ProtoCallFrame::init):
* interpreter/ProtoCallFrame.h:
(JSC::ProtoCallFrame::scope): Deleted.
(JSC::ProtoCallFrame::setScope): Deleted.
* llint/LLIntData.cpp:
(JSC::LLInt::Data::performAssertions):
* llint/LowLevelInterpreter.asm:
* llint/LowLevelInterpreter64.asm:
Removed the related scopeChainValue member from ProtoCallFrame. Reduced the number of
registers that needed to be copied from the ProtoCallFrame to a callee's frame
from 5 to 4.
* llint/LowLevelInterpreter32_64.asm:
In addition to the prior changes, also deleted the unused macro getDeBruijnScope.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</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="#trunkSourceJavaScriptCoreftlFTLJSCallcpp">trunk/Source/JavaScriptCore/ftl/FTLJSCall.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterCallFrameClosureh">trunk/Source/JavaScriptCore/interpreter/CallFrameClosure.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpretercpp">trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterJSStackh">trunk/Source/JavaScriptCore/interpreter/JSStack.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterProtoCallFramecpp">trunk/Source/JavaScriptCore/interpreter/ProtoCallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterProtoCallFrameh">trunk/Source/JavaScriptCore/interpreter/ProtoCallFrame.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterVMInspectorcpp">trunk/Source/JavaScriptCore/interpreter/VMInspector.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITCallcpp">trunk/Source/JavaScriptCore/jit/JITCall.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITCall32_64cpp">trunk/Source/JavaScriptCore/jit/JITCall32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodes32_64cpp">trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitRepatchcpp">trunk/Source/JavaScriptCore/jit/Repatch.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitThunkGeneratorscpp">trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntDatacpp">trunk/Source/JavaScriptCore/llint/LLIntData.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreterasm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -1,5 +1,69 @@
</span><span class="cx"> 2015-01-21 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><ins>+ Eliminate Scope slot from JavaScript CallFrame
+ https://bugs.webkit.org/show_bug.cgi?id=136724
+
+ Reviewed by Geoffrey Garen.
+
+ This finishes the removal of the scope chain slot from the call frame header.
+
+ * 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/FTLJSCall.cpp:
+ (JSC::FTL::JSCall::emit):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compileNativeCallOrConstruct):
+ (JSC::FTL::LowerDFGToLLVM::compileCallOrConstruct):
+ * interpreter/JSStack.h:
+ * interpreter/VMInspector.cpp:
+ (JSC::VMInspector::dumpFrame):
+ * jit/JITCall.cpp:
+ (JSC::JIT::compileOpCall):
+ * jit/JITCall32_64.cpp:
+ (JSC::JIT::compileOpCall):
+ * jit/JITOpcodes32_64.cpp:
+ (JSC::JIT::privateCompileCTINativeCall):
+ * jit/Repatch.cpp:
+ (JSC::generateByIdStub):
+ (JSC::linkClosureCall):
+ * jit/ThunkGenerators.cpp:
+ (JSC::virtualForThunkGenerator):
+ (JSC::nativeForGenerator):
+ Deleted ScopeChain slot from JSStack. Removed all code where ScopeChain was being
+ read or set. In most cases this was where we make JS calls.
+
+ * interpreter/CallFrameClosure.h:
+ (JSC::CallFrameClosure::setArgument):
+ (JSC::CallFrameClosure::resetCallFrame): Deleted.
+ * interpreter/Interpreter.cpp:
+ (JSC::Interpreter::execute):
+ (JSC::Interpreter::executeCall):
+ (JSC::Interpreter::executeConstruct):
+ (JSC::Interpreter::prepareForRepeatCall):
+ * interpreter/ProtoCallFrame.cpp:
+ (JSC::ProtoCallFrame::init):
+ * interpreter/ProtoCallFrame.h:
+ (JSC::ProtoCallFrame::scope): Deleted.
+ (JSC::ProtoCallFrame::setScope): Deleted.
+ * llint/LLIntData.cpp:
+ (JSC::LLInt::Data::performAssertions):
+ * llint/LowLevelInterpreter.asm:
+ * llint/LowLevelInterpreter64.asm:
+ Removed the related scopeChainValue member from ProtoCallFrame. Reduced the number of
+ registers that needed to be copied from the ProtoCallFrame to a callee's frame
+ from 5 to 4.
+
+ * llint/LowLevelInterpreter32_64.asm:
+ In addition to the prior changes, also deleted the unused macro getDeBruijnScope.
+
+2015-01-21 Michael Saboff <msaboff@apple.com>
+
</ins><span class="cx"> Eliminate construct methods from NullGetterFunction and NullSetterFunction classes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=140708
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGOSRExitCompilerCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -197,8 +197,6 @@
</span><span class="cx">
</span><span class="cx"> #if USE(JSVALUE64)
</span><span class="cx"> jit.storePtr(AssemblyHelpers::TrustedImmPtr(baselineCodeBlock), AssemblyHelpers::addressFor((VirtualRegister)(inlineCallFrame->stackOffset + JSStack::CodeBlock)));
</span><del>- if (!inlineCallFrame->isClosureCall)
- jit.store64(AssemblyHelpers::TrustedImm64(JSValue::encode(JSValue(inlineCallFrame->calleeConstant()->scope()))), AssemblyHelpers::addressFor((VirtualRegister)(inlineCallFrame->stackOffset + JSStack::ScopeChain)));
</del><span class="cx"> jit.store64(callerFrameGPR, AssemblyHelpers::addressForByteOffset(inlineCallFrame->callerFrameOffset()));
</span><span class="cx"> uint32_t locationBits = CallFrame::Location::encodeAsBytecodeOffset(codeOrigin.bytecodeIndex);
</span><span class="cx"> jit.store32(AssemblyHelpers::TrustedImm32(locationBits), AssemblyHelpers::tagFor((VirtualRegister)(inlineCallFrame->stackOffset + JSStack::ArgumentCount)));
</span><span class="lines">@@ -211,9 +209,6 @@
</span><span class="cx"> jit.loadPtr(AssemblyHelpers::addressFor(VirtualRegister(inlineCallFrame->stackOffset + unmodifiedArgumentsRegister(baselineCodeBlock->argumentsRegister()).offset())), GPRInfo::regT3);
</span><span class="cx"> #else // USE(JSVALUE64) // so this is the 32-bit part
</span><span class="cx"> jit.storePtr(AssemblyHelpers::TrustedImmPtr(baselineCodeBlock), AssemblyHelpers::addressFor((VirtualRegister)(inlineCallFrame->stackOffset + JSStack::CodeBlock)));
</span><del>- jit.store32(AssemblyHelpers::TrustedImm32(JSValue::CellTag), AssemblyHelpers::tagFor((VirtualRegister)(inlineCallFrame->stackOffset + JSStack::ScopeChain)));
- if (!inlineCallFrame->isClosureCall)
- jit.storePtr(AssemblyHelpers::TrustedImmPtr(inlineCallFrame->calleeConstant()->scope()), AssemblyHelpers::payloadFor((VirtualRegister)(inlineCallFrame->stackOffset + JSStack::ScopeChain)));
</del><span class="cx"> jit.storePtr(callerFrameGPR, AssemblyHelpers::addressForByteOffset(inlineCallFrame->callerFrameOffset()));
</span><span class="cx"> Instruction* instruction = baselineCodeBlock->instructions().begin() + codeOrigin.bytecodeIndex;
</span><span class="cx"> uint32_t locationBits = CallFrame::Location::encodeAsBytecodeInstruction(instruction);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPreciseLocalClobberizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPreciseLocalClobberize.h (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPreciseLocalClobberize.h 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/dfg/DFGPreciseLocalClobberize.h 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -131,10 +131,8 @@
</span><span class="cx"> for (InlineCallFrame* inlineCallFrame = m_node->origin.semantic.inlineCallFrame; inlineCallFrame; inlineCallFrame = inlineCallFrame->caller.inlineCallFrame) {
</span><span class="cx"> for (unsigned i = inlineCallFrame->arguments.size(); i-- > 1;)
</span><span class="cx"> m_read(VirtualRegister(inlineCallFrame->stackOffset + virtualRegisterForArgument(i).offset()));
</span><del>- if (inlineCallFrame->isClosureCall) {
- m_read(VirtualRegister(inlineCallFrame->stackOffset + JSStack::ScopeChain));
</del><ins>+ if (inlineCallFrame->isClosureCall)
</ins><span class="cx"> m_read(VirtualRegister(inlineCallFrame->stackOffset + JSStack::Callee));
</span><del>- }
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -696,9 +696,6 @@
</span><span class="cx">
</span><span class="cx"> slowPath.append(branchNotCell(callee.jsValueRegs()));
</span><span class="cx"> slowPath.append(m_jit.branchPtrWithPatch(MacroAssembler::NotEqual, calleePayloadGPR, targetToCheck));
</span><del>- m_jit.loadPtr(MacroAssembler::Address(calleePayloadGPR, OBJECT_OFFSETOF(JSFunction, m_scope)), resultPayloadGPR);
- m_jit.storePtr(resultPayloadGPR, calleeFramePayloadSlot(JSStack::ScopeChain));
- m_jit.storePtr(MacroAssembler::TrustedImm32(JSValue::CellTag), calleeFrameTagSlot(JSStack::ScopeChain));
</del><span class="cx">
</span><span class="cx"> JITCompiler::Call fastCall = m_jit.nearCall();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -676,9 +676,6 @@
</span><span class="cx">
</span><span class="cx"> slowPath = m_jit.branchPtrWithPatch(MacroAssembler::NotEqual, calleeGPR, targetToCheck, MacroAssembler::TrustedImmPtr(0));
</span><span class="cx">
</span><del>- m_jit.loadPtr(MacroAssembler::Address(calleeGPR, OBJECT_OFFSETOF(JSFunction, m_scope)), resultGPR);
- m_jit.store64(resultGPR, calleeFrameSlot(JSStack::ScopeChain));
-
</del><span class="cx"> JITCompiler::Call fastCall = m_jit.nearCall();
</span><span class="cx">
</span><span class="cx"> JITCompiler::Jump done = m_jit.jump();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLJSCallcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLJSCall.cpp (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLJSCall.cpp 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/ftl/FTLJSCall.cpp 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -57,15 +57,6 @@
</span><span class="cx"> CCallHelpers::NotEqual, GPRInfo::regT0, m_targetToCheck,
</span><span class="cx"> CCallHelpers::TrustedImmPtr(0));
</span><span class="cx">
</span><del>- jit.loadPtr(
- CCallHelpers::Address(GPRInfo::regT0, JSFunction::offsetOfScopeChain()),
- GPRInfo::regT1);
- jit.store64(
- GPRInfo::regT1,
- CCallHelpers::Address(
- CCallHelpers::stackPointerRegister,
- sizeof(Register) * (JSStack::ScopeChain - JSStack::CallerFrameAndPCSize)));
-
</del><span class="cx"> m_fastCall = jit.nearCall();
</span><span class="cx"> CCallHelpers::Jump done = jit.jump();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -3627,10 +3627,8 @@
</span><span class="cx"> if ((notInlinable = !callee))
</span><span class="cx"> callee = m_out.operation(function);
</span><span class="cx">
</span><del>- JSScope* scope = knownFunction->scopeUnchecked();
</del><span class="cx"> m_out.storePtr(m_callFrame, m_execStorage, m_heaps.CallFrame_callerFrame);
</span><span class="cx"> m_out.storePtr(constNull(m_out.intPtr), addressFor(m_execStorage, JSStack::CodeBlock));
</span><del>- m_out.storePtr(weakPointer(scope), addressFor(m_execStorage, JSStack::ScopeChain));
</del><span class="cx"> m_out.storePtr(weakPointer(knownFunction), addressFor(m_execStorage, JSStack::Callee));
</span><span class="cx">
</span><span class="cx"> m_out.store64(m_out.constInt64(numArgs), addressFor(m_execStorage, JSStack::ArgumentCount));
</span><span class="lines">@@ -3678,7 +3676,6 @@
</span><span class="cx"> arguments.append(m_out.constInt32(1 + JSStack::CallFrameHeaderSize - JSStack::CallerFrameAndPCSize + numArgs));
</span><span class="cx"> arguments.append(jsCallee); // callee -> %rax
</span><span class="cx"> arguments.append(getUndef(m_out.int64)); // code block
</span><del>- arguments.append(getUndef(m_out.int64)); // scope chain
</del><span class="cx"> arguments.append(jsCallee); // callee -> stack
</span><span class="cx"> arguments.append(m_out.constInt64(numArgs)); // argument count and zeros for the tag
</span><span class="cx"> if (dummyThisArgument)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterCallFrameClosureh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/CallFrameClosure.h (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/CallFrameClosure.h 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/interpreter/CallFrameClosure.h 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -49,11 +49,6 @@
</span><span class="cx"> {
</span><span class="cx"> protoCallFrame->setArgument(argument, value);
</span><span class="cx"> }
</span><del>-
- void resetCallFrame()
- {
- protoCallFrame->setScope(scope);
- }
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -900,7 +900,7 @@
</span><span class="cx"> ASSERT(codeBlock->numParameters() == 1); // 1 parameter for 'this'.
</span><span class="cx">
</span><span class="cx"> ProtoCallFrame protoCallFrame;
</span><del>- protoCallFrame.init(codeBlock, scope, JSCallee::create(vm, scope->globalObject(), scope), thisObj, 1);
</del><ins>+ protoCallFrame.init(codeBlock, JSCallee::create(vm, scope->globalObject(), scope), thisObj, 1);
</ins><span class="cx">
</span><span class="cx"> if (LegacyProfiler* profiler = vm.enabledProfiler())
</span><span class="cx"> profiler->willExecute(callFrame, program->sourceURL(), program->lineNo(), program->startColumn());
</span><span class="lines">@@ -963,7 +963,7 @@
</span><span class="cx"> return throwTerminatedExecutionException(callFrame);
</span><span class="cx">
</span><span class="cx"> ProtoCallFrame protoCallFrame;
</span><del>- protoCallFrame.init(newCodeBlock, scope, function, thisValue, argsCount, args.data());
</del><ins>+ protoCallFrame.init(newCodeBlock, function, thisValue, argsCount, args.data());
</ins><span class="cx">
</span><span class="cx"> if (LegacyProfiler* profiler = vm.enabledProfiler())
</span><span class="cx"> profiler->willExecute(callFrame, function);
</span><span class="lines">@@ -1034,7 +1034,7 @@
</span><span class="cx"> return throwTerminatedExecutionException(callFrame);
</span><span class="cx">
</span><span class="cx"> ProtoCallFrame protoCallFrame;
</span><del>- protoCallFrame.init(newCodeBlock, scope, constructor, jsUndefined(), argsCount, args.data());
</del><ins>+ protoCallFrame.init(newCodeBlock, constructor, jsUndefined(), argsCount, args.data());
</ins><span class="cx">
</span><span class="cx"> if (LegacyProfiler* profiler = vm.enabledProfiler())
</span><span class="cx"> profiler->willExecute(callFrame, constructor);
</span><span class="lines">@@ -1083,7 +1083,7 @@
</span><span class="cx">
</span><span class="cx"> size_t argsCount = argumentCountIncludingThis;
</span><span class="cx">
</span><del>- protoCallFrame->init(newCodeBlock, scope, function, jsUndefined(), argsCount, args);
</del><ins>+ protoCallFrame->init(newCodeBlock, function, jsUndefined(), argsCount, args);
</ins><span class="cx"> // Return the successful closure:
</span><span class="cx"> CallFrameClosure result = { callFrame, protoCallFrame, function, functionExecutable, &vm, scope, newCodeBlock->numParameters(), argumentCountIncludingThis };
</span><span class="cx"> return result;
</span><span class="lines">@@ -1100,7 +1100,6 @@
</span><span class="cx"> return jsNull();
</span><span class="cx">
</span><span class="cx"> StackStats::CheckPoint stackCheckPoint;
</span><del>- closure.resetCallFrame();
</del><span class="cx">
</span><span class="cx"> if (LegacyProfiler* profiler = vm.enabledProfiler())
</span><span class="cx"> profiler->willExecute(closure.oldCallFrame, closure.function);
</span><span class="lines">@@ -1187,7 +1186,7 @@
</span><span class="cx"> ASSERT(codeBlock->numParameters() == 1); // 1 parameter for 'this'.
</span><span class="cx">
</span><span class="cx"> ProtoCallFrame protoCallFrame;
</span><del>- protoCallFrame.init(codeBlock, scope, JSCallee::create(vm, scope->globalObject(), scope), thisValue, 1);
</del><ins>+ protoCallFrame.init(codeBlock, JSCallee::create(vm, scope->globalObject(), scope), thisValue, 1);
</ins><span class="cx">
</span><span class="cx"> if (LegacyProfiler* profiler = vm.enabledProfiler())
</span><span class="cx"> profiler->willExecute(callFrame, eval->sourceURL(), eval->lineNo(), eval->startColumn());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterJSStackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/JSStack.h (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/JSStack.h 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/interpreter/JSStack.h 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> enum CallFrameHeaderEntry {
</span><span class="cx"> CallerFrameAndPCSize = sizeof(CallerFrameAndPC) / sizeof(Register),
</span><span class="cx"> CodeBlock = CallerFrameAndPCSize,
</span><del>- ScopeChain,
</del><span class="cx"> Callee,
</span><span class="cx"> ArgumentCount,
</span><span class="cx"> CallFrameHeaderSize,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterProtoCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/ProtoCallFrame.cpp (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/ProtoCallFrame.cpp 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/interpreter/ProtoCallFrame.cpp 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -32,11 +32,10 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-void ProtoCallFrame::init(CodeBlock* codeBlock, JSScope* scope, JSObject* callee, JSValue thisValue, int argCountIncludingThis, JSValue* otherArgs)
</del><ins>+void ProtoCallFrame::init(CodeBlock* codeBlock, JSObject* callee, JSValue thisValue, int argCountIncludingThis, JSValue* otherArgs)
</ins><span class="cx"> {
</span><span class="cx"> this->args = otherArgs;
</span><span class="cx"> this->setCodeBlock(codeBlock);
</span><del>- this->setScope(scope);
</del><span class="cx"> this->setCallee(callee);
</span><span class="cx"> this->setArgumentCountIncludingThis(argCountIncludingThis);
</span><span class="cx"> if (codeBlock && argCountIncludingThis < codeBlock->numParameters())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterProtoCallFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/ProtoCallFrame.h (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/ProtoCallFrame.h 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/interpreter/ProtoCallFrame.h 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx">
</span><span class="cx"> struct ProtoCallFrame {
</span><span class="cx"> Register codeBlockValue;
</span><del>- Register scopeChainValue;
</del><span class="cx"> Register calleeValue;
</span><span class="cx"> Register argCountAndCodeOriginValue;
</span><span class="cx"> Register thisArg;
</span><span class="lines">@@ -40,14 +39,11 @@
</span><span class="cx"> bool arityMissMatch;
</span><span class="cx"> JSValue *args;
</span><span class="cx">
</span><del>- void init(CodeBlock*, JSScope*, JSObject*, JSValue, int, JSValue* otherArgs = 0);
</del><ins>+ void init(CodeBlock*, JSObject*, JSValue, int, JSValue* otherArgs = 0);
</ins><span class="cx">
</span><span class="cx"> CodeBlock* codeBlock() const { return codeBlockValue.Register::codeBlock(); }
</span><span class="cx"> void setCodeBlock(CodeBlock* codeBlock) { codeBlockValue = codeBlock; }
</span><span class="cx">
</span><del>- JSScope* scope() const { return scopeChainValue.Register::scope(); }
- void setScope(JSScope* scope) { scopeChainValue = scope; }
-
</del><span class="cx"> JSObject* callee() const { return calleeValue.Register::function(); }
</span><span class="cx"> void setCallee(JSObject* callee) { calleeValue = Register::withCallee(callee); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterVMInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/VMInspector.cpp (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/VMInspector.cpp 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/interpreter/VMInspector.cpp 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -73,14 +73,12 @@
</span><span class="cx"> if (prefix)
</span><span class="cx"> printf("%s ", prefix);
</span><span class="cx">
</span><del>- printf("frame [%d] %p { cb %p:%s, retPC %p:%s, scope %p:%s, callee %p:%s, callerFrame %p:%s, argc %d, vPC %p }",
</del><ins>+ printf("frame [%d] %p { cb %p:%s, retPC %p:%s, callee %p:%s, callerFrame %p:%s, argc %d, vPC %p }",
</ins><span class="cx"> frameCount, frame,
</span><span class="cx"> CAST<void*>(frame[JSStack::CodeBlock].payload()),
</span><span class="cx"> getTypeName(frame[JSStack::CodeBlock].jsValue()),
</span><span class="cx"> CAST<void*>(frame[JSStack::ReturnPC].payload()),
</span><span class="cx"> getTypeName(frame[JSStack::ReturnPC].jsValue()),
</span><del>- CAST<void*>(frame[JSStack::ScopeChain].payload()),
- getTypeName(frame[JSStack::ScopeChain].jsValue()),
</del><span class="cx"> CAST<void*>(frame[JSStack::Callee].payload()),
</span><span class="cx"> getTypeName(frame[JSStack::Callee].jsValue()),
</span><span class="cx"> CAST<void*>(frame[JSStack::CallerFrame].callFrame()),
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITCallcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITCall.cpp (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITCall.cpp 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/jit/JITCall.cpp 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -177,12 +177,11 @@
</span><span class="cx"> - Initializes ArgumentCount; CallerFrame; Callee.
</span><span class="cx">
</span><span class="cx"> For a JS call:
</span><del>- - Caller initializes ScopeChain.
</del><span class="cx"> - Callee initializes ReturnPC; CodeBlock.
</span><span class="cx"> - Callee restores callFrameRegister before return.
</span><span class="cx">
</span><span class="cx"> For a non-JS call:
</span><del>- - Caller initializes ScopeChain; ReturnPC; CodeBlock.
</del><ins>+ - Caller initializes ReturnPC; CodeBlock.
</ins><span class="cx"> - Caller restores callFrameRegister after return.
</span><span class="cx"> */
</span><span class="cx"> COMPILE_ASSERT(OPCODE_LENGTH(op_call) == OPCODE_LENGTH(op_construct), call_and_construct_opcodes_must_be_same_length);
</span><span class="lines">@@ -236,9 +235,6 @@
</span><span class="cx"> m_callCompilationInfo[callLinkInfoIndex].hotPathBegin = addressOfLinkedFunctionCheck;
</span><span class="cx"> m_callCompilationInfo[callLinkInfoIndex].callLinkInfo = info;
</span><span class="cx">
</span><del>- loadPtr(Address(regT0, OBJECT_OFFSETOF(JSFunction, m_scope)), regT2);
- store64(regT2, Address(MacroAssembler::stackPointerRegister, JSStack::ScopeChain * sizeof(Register) - sizeof(CallerFrameAndPC)));
-
</del><span class="cx"> m_callCompilationInfo[callLinkInfoIndex].hotPathOther = emitNakedCall();
</span><span class="cx">
</span><span class="cx"> addPtr(TrustedImm32(stackPointerOffsetFor(m_codeBlock) * sizeof(Register)), callFrameRegister, stackPointerRegister);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITCall32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITCall32_64.cpp (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITCall32_64.cpp 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/jit/JITCall32_64.cpp 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -264,12 +264,11 @@
</span><span class="cx"> - Initializes ArgumentCount; CallerFrame; Callee.
</span><span class="cx">
</span><span class="cx"> For a JS call:
</span><del>- - Caller initializes ScopeChain.
</del><span class="cx"> - Callee initializes ReturnPC; CodeBlock.
</span><span class="cx"> - Callee restores callFrameRegister before return.
</span><span class="cx">
</span><span class="cx"> For a non-JS call:
</span><del>- - Caller initializes ScopeChain; ReturnPC; CodeBlock.
</del><ins>+ - Caller initializes ReturnPC; CodeBlock.
</ins><span class="cx"> - Caller restores callFrameRegister after return.
</span><span class="cx"> */
</span><span class="cx">
</span><span class="lines">@@ -327,10 +326,6 @@
</span><span class="cx"> m_callCompilationInfo[callLinkInfoIndex].hotPathBegin = addressOfLinkedFunctionCheck;
</span><span class="cx"> m_callCompilationInfo[callLinkInfoIndex].callLinkInfo = info;
</span><span class="cx">
</span><del>- loadPtr(Address(regT0, OBJECT_OFFSETOF(JSFunction, m_scope)), regT2);
- store32(regT2, Address(MacroAssembler::stackPointerRegister, JSStack::ScopeChain * sizeof(Register) + PayloadOffset - sizeof(CallerFrameAndPC)));
- store32(TrustedImm32(JSValue::CellTag), Address(stackPointerRegister, JSStack::ScopeChain * sizeof(Register) + TagOffset - sizeof(CallerFrameAndPC)));
-
</del><span class="cx"> checkStackPointerAlignment();
</span><span class="cx"> m_callCompilationInfo[callLinkInfoIndex].hotPathOther = emitNakedCall();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodes32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -57,12 +57,6 @@
</span><span class="cx"> storePtr(callFrameRegister, &m_vm->topCallFrame);
</span><span class="cx">
</span><span class="cx"> #if CPU(X86)
</span><del>- // Load caller frame's scope chain into this callframe so that whatever we call can
- // get to its global data.
- emitGetCallerFrameFromCallFrameHeaderPtr(regT0);
- emitGetFromCallFrameHeaderPtr(JSStack::ScopeChain, regT1, regT0);
- emitPutCellToCallFrameHeader(regT1, JSStack::ScopeChain);
-
</del><span class="cx"> // Calling convention: f(ecx, edx, ...);
</span><span class="cx"> // Host function signature: f(ExecState*);
</span><span class="cx"> move(callFrameRegister, X86Registers::ecx);
</span><span class="lines">@@ -76,11 +70,6 @@
</span><span class="cx"> addPtr(TrustedImm32(8), stackPointerRegister);
</span><span class="cx">
</span><span class="cx"> #elif CPU(ARM) || CPU(SH4) || CPU(MIPS)
</span><del>- // Load caller frame's scope chain into this callframe so that whatever we call can get to its global data.
- emitGetCallerFrameFromCallFrameHeaderPtr(regT2);
- emitGetFromCallFrameHeaderPtr(JSStack::ScopeChain, regT1, regT2);
- emitPutCellToCallFrameHeader(regT1, JSStack::ScopeChain);
-
</del><span class="cx"> #if CPU(MIPS)
</span><span class="cx"> // Allocate stack space for (unused) 16 bytes (8-byte aligned) for 4 arguments.
</span><span class="cx"> subPtr(TrustedImm32(16), stackPointerRegister);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitRepatchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/Repatch.cpp (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/Repatch.cpp 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/jit/Repatch.cpp 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -511,13 +511,6 @@
</span><span class="cx"> MacroAssembler::NotEqual, loadedValueGPR, addressOfLinkFunctionCheck,
</span><span class="cx"> MacroAssembler::TrustedImmPtr(0));
</span><span class="cx">
</span><del>- // loadedValueGPR is already burned. We can reuse it. From here on we assume that
- // any volatile register will be clobbered anyway.
- stubJit.loadPtr(
- MacroAssembler::Address(loadedValueGPR, JSFunction::offsetOfScopeChain()),
- loadedValueGPR);
- stubJit.storeCell(
- loadedValueGPR, calleeFrame.withOffset(JSStack::ScopeChain * sizeof(Register)));
</del><span class="cx"> fastPathCall = stubJit.nearCall();
</span><span class="cx">
</span><span class="cx"> stubJit.addPtr(
</span><span class="lines">@@ -1685,23 +1678,6 @@
</span><span class="cx"> CCallHelpers::Address(calleeGPR, JSFunction::offsetOfExecutable()),
</span><span class="cx"> CCallHelpers::TrustedImmPtr(executable)));
</span><span class="cx">
</span><del>- stubJit.loadPtr(
- CCallHelpers::Address(calleeGPR, JSFunction::offsetOfScopeChain()),
- GPRInfo::returnValueGPR);
-
-#if USE(JSVALUE64)
- stubJit.store64(
- GPRInfo::returnValueGPR,
- CCallHelpers::Address(MacroAssembler::stackPointerRegister, static_cast<ptrdiff_t>(sizeof(Register) * JSStack::ScopeChain) + offsetToFrame));
-#else
- stubJit.storePtr(
- GPRInfo::returnValueGPR,
- CCallHelpers::Address(MacroAssembler::stackPointerRegister, static_cast<ptrdiff_t>(sizeof(Register) * JSStack::ScopeChain) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.payload) + offsetToFrame));
- stubJit.store32(
- CCallHelpers::TrustedImm32(JSValue::CellTag),
- CCallHelpers::Address(MacroAssembler::stackPointerRegister, static_cast<ptrdiff_t>(sizeof(Register) * JSStack::ScopeChain) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.tag) + offsetToFrame));
-#endif
-
</del><span class="cx"> AssemblyHelpers::Call call = stubJit.nearCall();
</span><span class="cx"> AssemblyHelpers::Jump done = stubJit.jump();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitThunkGeneratorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -214,17 +214,6 @@
</span><span class="cx"> // Now we know that we have a CodeBlock, and we're committed to making a fast
</span><span class="cx"> // call.
</span><span class="cx">
</span><del>- jit.loadPtr(
- CCallHelpers::Address(GPRInfo::regT0, JSFunction::offsetOfScopeChain()),
- GPRInfo::regT1);
-#if USE(JSVALUE64)
- jit.emitPutToCallFrameHeaderBeforePrologue(GPRInfo::regT1, JSStack::ScopeChain);
-#else
- jit.emitPutPayloadToCallFrameHeaderBeforePrologue(GPRInfo::regT1, JSStack::ScopeChain);
- jit.emitPutTagToCallFrameHeaderBeforePrologue(CCallHelpers::TrustedImm32(JSValue::CellTag),
- JSStack::ScopeChain);
-#endif
-
</del><span class="cx"> // Make a tail call. This will return back to JIT code.
</span><span class="cx"> emitPointerValidation(jit, GPRInfo::regT4);
</span><span class="cx"> jit.jump(GPRInfo::regT4);
</span><span class="lines">@@ -276,12 +265,6 @@
</span><span class="cx"> jit.storePtr(JSInterfaceJIT::callFrameRegister, &vm->topCallFrame);
</span><span class="cx">
</span><span class="cx"> #if CPU(X86)
</span><del>- // Load callee's scope chain into this callframe so that whatever we call can
- // get to its global data.
- jit.emitGetFromCallFrameHeaderPtr(JSStack::Callee, JSInterfaceJIT::regT1);
- jit.loadPtr(JSInterfaceJIT::Address(JSInterfaceJIT::regT1, JSCallee::offsetOfScopeChain()), JSInterfaceJIT::regT1);
- jit.emitPutCellToCallFrameHeader(JSInterfaceJIT::regT1, JSStack::ScopeChain);
-
</del><span class="cx"> // Calling convention: f(ecx, edx, ...);
</span><span class="cx"> // Host function signature: f(ExecState*);
</span><span class="cx"> jit.move(JSInterfaceJIT::callFrameRegister, X86Registers::ecx);
</span><span class="lines">@@ -296,11 +279,6 @@
</span><span class="cx"> jit.addPtr(JSInterfaceJIT::TrustedImm32(8), JSInterfaceJIT::stackPointerRegister);
</span><span class="cx">
</span><span class="cx"> #elif CPU(X86_64)
</span><del>- // Load callee's scope chain into this callframe so that whatever we call can
- // get to its global data.
- jit.emitGetFromCallFrameHeaderPtr(JSStack::Callee, JSInterfaceJIT::regT1);
- jit.loadPtr(JSInterfaceJIT::Address(JSInterfaceJIT::regT1, JSCallee::offsetOfScopeChain()), JSInterfaceJIT::regT1);
- jit.emitPutCellToCallFrameHeader(JSInterfaceJIT::regT1, JSStack::ScopeChain);
</del><span class="cx"> #if !OS(WINDOWS)
</span><span class="cx"> // Calling convention: f(edi, esi, edx, ecx, ...);
</span><span class="cx"> // Host function signature: f(ExecState*);
</span><span class="lines">@@ -333,12 +311,6 @@
</span><span class="cx"> COMPILE_ASSERT(ARM64Registers::x1 != JSInterfaceJIT::regT3, T3_not_trampled_by_arg_1);
</span><span class="cx"> COMPILE_ASSERT(ARM64Registers::x2 != JSInterfaceJIT::regT3, T3_not_trampled_by_arg_2);
</span><span class="cx">
</span><del>- // Load callee's scope chain into this callframe so that whatever we call can
- // get to its global data.
- jit.emitGetFromCallFrameHeaderPtr(JSStack::Callee, JSInterfaceJIT::regT1);
- jit.loadPtr(JSInterfaceJIT::Address(JSInterfaceJIT::regT1, JSCallee::offsetOfScopeChain()), JSInterfaceJIT::regT1);
- jit.emitPutCellToCallFrameHeader(JSInterfaceJIT::regT1, JSStack::ScopeChain);
-
</del><span class="cx"> // Host function signature: f(ExecState*);
</span><span class="cx"> jit.move(JSInterfaceJIT::callFrameRegister, ARM64Registers::x0);
</span><span class="cx">
</span><span class="lines">@@ -346,12 +318,6 @@
</span><span class="cx"> jit.loadPtr(JSInterfaceJIT::Address(ARM64Registers::x1, JSFunction::offsetOfExecutable()), ARM64Registers::x2);
</span><span class="cx"> jit.call(JSInterfaceJIT::Address(ARM64Registers::x2, executableOffsetToFunction));
</span><span class="cx"> #elif CPU(ARM) || CPU(SH4) || CPU(MIPS)
</span><del>- // Load callee's scope chain into this callframe so that whatever we call can
- // get to its global data.
- jit.emitGetFromCallFrameHeaderPtr(JSStack::Callee, JSInterfaceJIT::regT1);
- jit.loadPtr(JSInterfaceJIT::Address(JSInterfaceJIT::regT1, JSCallee::offsetOfScopeChain()), JSInterfaceJIT::regT1);
- jit.emitPutCellToCallFrameHeader(JSInterfaceJIT::regT1, JSStack::ScopeChain);
-
</del><span class="cx"> #if CPU(MIPS)
</span><span class="cx"> // Allocate stack space for (unused) 16 bytes (8-byte aligned) for 4 arguments.
</span><span class="cx"> jit.subPtr(JSInterfaceJIT::TrustedImm32(16), JSInterfaceJIT::stackPointerRegister);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntData.cpp (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntData.cpp 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/llint/LLIntData.cpp 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -73,10 +73,10 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> #if USE(JSVALUE64)
</span><span class="cx"> const ptrdiff_t PtrSize = 8;
</span><del>- const ptrdiff_t CallFrameHeaderSlots = 6;
</del><ins>+ const ptrdiff_t CallFrameHeaderSlots = 5;
</ins><span class="cx"> #else // USE(JSVALUE64) // i.e. 32-bit version
</span><span class="cx"> const ptrdiff_t PtrSize = 4;
</span><del>- const ptrdiff_t CallFrameHeaderSlots = 5;
</del><ins>+ const ptrdiff_t CallFrameHeaderSlots = 4;
</ins><span class="cx"> #endif
</span><span class="cx"> const ptrdiff_t SlotSize = 8;
</span><span class="cx"> #endif
</span><span class="lines">@@ -89,8 +89,7 @@
</span><span class="cx"> ASSERT(JSStack::CallerFrameAndPCSize == (PtrSize * 2) / SlotSize);
</span><span class="cx"> ASSERT(CallFrame::returnPCOffset() == CallFrame::callerFrameOffset() + PtrSize);
</span><span class="cx"> ASSERT(JSStack::CodeBlock * sizeof(Register) == CallFrame::returnPCOffset() + PtrSize);
</span><del>- ASSERT(JSStack::ScopeChain * sizeof(Register) == JSStack::CodeBlock * sizeof(Register) + SlotSize);
- ASSERT(JSStack::Callee * sizeof(Register) == JSStack::ScopeChain * sizeof(Register) + SlotSize);
</del><ins>+ ASSERT(JSStack::Callee * sizeof(Register) == JSStack::CodeBlock * sizeof(Register) + SlotSize);
</ins><span class="cx"> ASSERT(JSStack::ArgumentCount * sizeof(Register) == JSStack::Callee * sizeof(Register) + SlotSize);
</span><span class="cx"> ASSERT(JSStack::ThisArgument * sizeof(Register) == JSStack::ArgumentCount * sizeof(Register) + SlotSize);
</span><span class="cx"> ASSERT(JSStack::CallFrameHeaderSize == JSStack::ThisArgument);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreterasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -34,10 +34,10 @@
</span><span class="cx">
</span><span class="cx"> if JSVALUE64
</span><span class="cx"> const PtrSize = 8
</span><del>- const CallFrameHeaderSlots = 6
</del><ins>+ const CallFrameHeaderSlots = 5
</ins><span class="cx"> else
</span><span class="cx"> const PtrSize = 4
</span><del>- const CallFrameHeaderSlots = 5
</del><ins>+ const CallFrameHeaderSlots = 4
</ins><span class="cx"> const CallFrameAlignSlots = 1
</span><span class="cx"> end
</span><span class="cx"> const SlotSize = 8
</span><span class="lines">@@ -50,8 +50,7 @@
</span><span class="cx"> const CallerFrame = 0
</span><span class="cx"> const ReturnPC = CallerFrame + PtrSize
</span><span class="cx"> const CodeBlock = ReturnPC + PtrSize
</span><del>-const ScopeChain = CodeBlock + SlotSize
-const Callee = ScopeChain + SlotSize
</del><ins>+const Callee = CodeBlock + SlotSize
</ins><span class="cx"> const ArgumentCount = Callee + SlotSize
</span><span class="cx"> const ThisArgumentOffset = ArgumentCount + SlotSize
</span><span class="cx"> const CallFrameHeaderSize = ThisArgumentOffset
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -287,7 +287,7 @@
</span><span class="cx">
</span><span class="cx"> .stackHeightOK:
</span><span class="cx"> move temp1, sp
</span><del>- move 5, temp1
</del><ins>+ move 4, temp1
</ins><span class="cx">
</span><span class="cx"> .copyHeaderLoop:
</span><span class="cx"> subi 1, temp1
</span><span class="lines">@@ -1940,14 +1940,11 @@
</span><span class="cx"> lshifti 3, t3
</span><span class="cx"> negi t3
</span><span class="cx"> addp cfr, t3 # t3 contains the new value of cfr
</span><del>- loadp JSFunction::m_scope[t2], t0
</del><span class="cx"> storei t2, Callee + PayloadOffset[t3]
</span><del>- storei t0, ScopeChain + PayloadOffset[t3]
</del><span class="cx"> loadi 12[PC], t2
</span><span class="cx"> storei PC, ArgumentCount + TagOffset[cfr]
</span><span class="cx"> storei t2, ArgumentCount + PayloadOffset[t3]
</span><span class="cx"> storei CellTag, Callee + TagOffset[t3]
</span><del>- storei CellTag, ScopeChain + TagOffset[t3]
</del><span class="cx"> addp CallerFrameAndPCSize, t3
</span><span class="cx"> callTargetFunction(t1, t3)
</span><span class="cx">
</span><span class="lines">@@ -2029,41 +2026,6 @@
</span><span class="cx"> traceExecution() # This needs to be here because we don't want to clobber t0, t1, t2, t3 above.
</span><span class="cx"> dispatch(2)
</span><span class="cx">
</span><del>-
-# Gives you the scope in t0, while allowing you to optionally perform additional checks on the
-# scopes as they are traversed. scopeCheck() is called with two arguments: the register
-# holding the scope, and a register that can be used for scratch. Note that this does not
-# use t3, so you can hold stuff in t3 if need be.
-macro getDeBruijnScope(deBruijinIndexOperand, scopeCheck)
- loadp ScopeChain + PayloadOffset[cfr], t0
- loadi deBruijinIndexOperand, t2
-
- btiz t2, .done
-
- loadp CodeBlock[cfr], t1
- bineq CodeBlock::m_codeType[t1], FunctionCode, .loop
- btbz CodeBlock::m_needsActivation[t1], .loop
-
- loadi CodeBlock::m_lexicalEnvironmentRegister[t1], t1
-
- # Need to conditionally skip over one scope.
- bieq TagOffset[cfr, t1, 8], EmptyValueTag, .noActivation
- scopeCheck(t0, t1)
- loadp JSScope::m_next[t0], t0
-.noActivation:
- subi 1, t2
-
- btiz t2, .done
-.loop:
- scopeCheck(t0, t1)
- loadp JSScope::m_next[t0], t0
- subi 1, t2
- btinz t2, .loop
-
-.done:
-
-end
-
</del><span class="cx"> _llint_op_end:
</span><span class="cx"> traceExecution()
</span><span class="cx"> checkSwitchToJITForEpilogue()
</span><span class="lines">@@ -2095,9 +2057,6 @@
</span><span class="cx"> functionPrologue()
</span><span class="cx"> storep 0, CodeBlock[cfr]
</span><span class="cx"> loadi Callee + PayloadOffset[cfr], t1
</span><del>- loadi JSCallee::m_scope[t1], t0
- storei CellTag, ScopeChain + TagOffset[cfr]
- storei t0, ScopeChain + PayloadOffset[cfr]
</del><span class="cx"> // Callee is still in t1 for code below
</span><span class="cx"> if X86 or X86_WIN
</span><span class="cx"> subp 8, sp # align stack pointer
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (178855 => 178856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2015-01-21 19:46:13 UTC (rev 178855)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2015-01-21 21:43:55 UTC (rev 178856)
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx">
</span><span class="cx"> .stackHeightOK:
</span><span class="cx"> move temp1, sp
</span><del>- move 5, temp1
</del><ins>+ move 4, temp1
</ins><span class="cx">
</span><span class="cx"> .copyHeaderLoop:
</span><span class="cx"> subi 1, temp1
</span><span class="lines">@@ -1799,9 +1799,7 @@
</span><span class="cx"> lshifti 3, t3
</span><span class="cx"> negp t3
</span><span class="cx"> addp cfr, t3
</span><del>- loadp JSFunction::m_scope[t2], t0
</del><span class="cx"> storeq t2, Callee[t3]
</span><del>- storeq t0, ScopeChain[t3]
</del><span class="cx"> loadisFromInstruction(3, t2)
</span><span class="cx"> storei PC, ArgumentCount + TagOffset[cfr]
</span><span class="cx"> storei t2, ArgumentCount + PayloadOffset[t3]
</span><span class="lines">@@ -1930,9 +1928,6 @@
</span><span class="cx"> andp MarkedBlockMask, t0, t1
</span><span class="cx"> loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t1], t1
</span><span class="cx"> storep cfr, VM::topCallFrame[t1]
</span><del>- // Callee still in t0
- loadp JSCallee::m_scope[t0], t1
- storeq t1, ScopeChain[cfr]
</del><span class="cx"> move cfr, arg1
</span><span class="cx"> loadp Callee[cfr], arg2
</span><span class="cx"> loadp JSFunction::m_executable[arg2], temp
</span><span class="lines">@@ -1952,9 +1947,6 @@
</span><span class="cx"> andp MarkedBlockMask, t0, t1
</span><span class="cx"> loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t1], t1
</span><span class="cx"> storep cfr, VM::topCallFrame[t1]
</span><del>- // Callee still in t0
- loadp JSCallee::m_scope[t0], t1
- storep t1, ScopeChain[cfr]
</del><span class="cx"> preserveReturnAddressAfterCall(t3)
</span><span class="cx"> storep t3, ReturnPC[cfr]
</span><span class="cx"> move cfr, t0
</span></span></pre>
</div>
</div>
</body>
</html>