<!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>[172808] 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/172808">172808</a></dd>
<dt>Author</dt> <dd>oliver@apple.com</dd>
<dt>Date</dt> <dd>2014-08-20 13:47:45 -0700 (Wed, 20 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop implicitly skipping a function's own activation when walking the scope chain
https://bugs.webkit.org/show_bug.cgi?id=136118
Reviewed by Geoffrey Garen.
Remove the current logic that implicitly skips a function's
own activation when walking the scope chain. This is ground
work for ensuring that all closed variable access is made
through the function's activation. This leads to a further
10% regression on earley, but we're already tracking the
overall performance regression.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::CodeBlock):
* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::getScope):
(JSC::DFG::ByteCodeParser::parseBlock):
* dfg/DFGClobberize.h:
(JSC::DFG::clobberize):
* dfg/DFGDoesGC.cpp:
(JSC::DFG::doesGC):
* dfg/DFGFixupPhase.cpp:
(JSC::DFG::FixupPhase::fixupNode):
* dfg/DFGHeapLocation.cpp:
(WTF::printInternal):
* dfg/DFGHeapLocation.h:
* dfg/DFGNodeType.h:
* dfg/DFGPredictionPropagationPhase.cpp:
(JSC::DFG::PredictionPropagationPhase::propagate):
* dfg/DFGSafeToExecute.h:
(JSC::DFG::safeToExecute):
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* jit/JITPropertyAccess.cpp:
(JSC::JIT::emitResolveClosure):
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:
* runtime/JSScope.cpp:
(JSC::JSScope::abstractResolve):
* runtime/JSScope.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGClobberizeh">trunk/Source/JavaScriptCore/dfg/DFGClobberize.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGDoesGCcpp">trunk/Source/JavaScriptCore/dfg/DFGDoesGC.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGFixupPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGHeapLocationcpp">trunk/Source/JavaScriptCore/dfg/DFGHeapLocation.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGHeapLocationh">trunk/Source/JavaScriptCore/dfg/DFGHeapLocation.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGNodeTypeh">trunk/Source/JavaScriptCore/dfg/DFGNodeType.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPredictionPropagationPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSafeToExecuteh">trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.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="#trunkSourceJavaScriptCorejitJITPropertyAccesscpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp</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>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSScopecpp">trunk/Source/JavaScriptCore/runtime/JSScope.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSScopeh">trunk/Source/JavaScriptCore/runtime/JSScope.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (172807 => 172808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-08-20 20:28:24 UTC (rev 172807)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-08-20 20:47:45 UTC (rev 172808)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2014-08-20 Oliver Hunt <oliver@apple.com>
+
+ Stop implicitly skipping a function's own activation when walking the scope chain
+ https://bugs.webkit.org/show_bug.cgi?id=136118
+
+ Reviewed by Geoffrey Garen.
+
+ Remove the current logic that implicitly skips a function's
+ own activation when walking the scope chain. This is ground
+ work for ensuring that all closed variable access is made
+ through the function's activation. This leads to a further
+ 10% regression on earley, but we're already tracking the
+ overall performance regression.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::CodeBlock):
+ * dfg/DFGAbstractInterpreterInlines.h:
+ (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::getScope):
+ (JSC::DFG::ByteCodeParser::parseBlock):
+ * dfg/DFGClobberize.h:
+ (JSC::DFG::clobberize):
+ * dfg/DFGDoesGC.cpp:
+ (JSC::DFG::doesGC):
+ * dfg/DFGFixupPhase.cpp:
+ (JSC::DFG::FixupPhase::fixupNode):
+ * dfg/DFGHeapLocation.cpp:
+ (WTF::printInternal):
+ * dfg/DFGHeapLocation.h:
+ * dfg/DFGNodeType.h:
+ * dfg/DFGPredictionPropagationPhase.cpp:
+ (JSC::DFG::PredictionPropagationPhase::propagate):
+ * dfg/DFGSafeToExecute.h:
+ (JSC::DFG::safeToExecute):
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * jit/JITPropertyAccess.cpp:
+ (JSC::JIT::emitResolveClosure):
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+ * runtime/JSScope.cpp:
+ (JSC::JSScope::abstractResolve):
+ * runtime/JSScope.h:
+
</ins><span class="cx"> 2014-08-20 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: Web Inspector crashes when reloading apple.com with Timeline recording active
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (172807 => 172808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-08-20 20:28:24 UTC (rev 172807)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-08-20 20:47:45 UTC (rev 172808)
</span><span class="lines">@@ -1944,7 +1944,7 @@
</span><span class="cx"> const Identifier& ident = identifier(pc[2].u.operand);
</span><span class="cx"> ResolveType type = static_cast<ResolveType>(pc[3].u.operand);
</span><span class="cx">
</span><del>- ResolveOp op = JSScope::abstractResolve(m_globalObject->globalExec(), scope, ident, Get, type);
</del><ins>+ ResolveOp op = JSScope::abstractResolve(m_globalObject->globalExec(), needsActivation(), scope, ident, Get, type);
</ins><span class="cx"> instructions[i + 3].u.operand = op.type;
</span><span class="cx"> instructions[i + 4].u.operand = op.depth;
</span><span class="cx"> if (op.activation)
</span><span class="lines">@@ -1961,7 +1961,7 @@
</span><span class="cx"> // get_from_scope dst, scope, id, ResolveModeAndType, Structure, Operand
</span><span class="cx"> const Identifier& ident = identifier(pc[3].u.operand);
</span><span class="cx"> ResolveModeAndType modeAndType = ResolveModeAndType(pc[4].u.operand);
</span><del>- ResolveOp op = JSScope::abstractResolve(m_globalObject->globalExec(), scope, ident, Get, modeAndType.type());
</del><ins>+ ResolveOp op = JSScope::abstractResolve(m_globalObject->globalExec(), needsActivation(), scope, ident, Get, modeAndType.type());
</ins><span class="cx">
</span><span class="cx"> instructions[i + 4].u.operand = ResolveModeAndType(modeAndType.mode(), op.type).operand();
</span><span class="cx"> if (op.type == GlobalVar || op.type == GlobalVarWithVarInjectionChecks)
</span><span class="lines">@@ -1977,7 +1977,7 @@
</span><span class="cx"> // put_to_scope scope, id, value, ResolveModeAndType, Structure, Operand
</span><span class="cx"> const Identifier& ident = identifier(pc[2].u.operand);
</span><span class="cx"> ResolveModeAndType modeAndType = ResolveModeAndType(pc[4].u.operand);
</span><del>- ResolveOp op = JSScope::abstractResolve(m_globalObject->globalExec(), scope, ident, Put, modeAndType.type());
</del><ins>+ ResolveOp op = JSScope::abstractResolve(m_globalObject->globalExec(), needsActivation(), scope, ident, Put, modeAndType.type());
</ins><span class="cx">
</span><span class="cx"> instructions[i + 4].u.operand = ResolveModeAndType(modeAndType.mode(), op.type).operand();
</span><span class="cx"> if (op.type == GlobalVar || op.type == GlobalVarWithVarInjectionChecks)
</span><span class="lines">@@ -2008,7 +2008,7 @@
</span><span class="cx"> case ProfileTypesBytecodeGetFromScope: {
</span><span class="cx"> const Identifier& ident = identifier(pc[4].u.operand);
</span><span class="cx"> ResolveType type = static_cast<ResolveType>(pc[5].u.operand);
</span><del>- ResolveOp op = JSScope::abstractResolve(m_globalObject->globalExec(), scope, ident, (flag == ProfileTypesBytecodeGetFromScope ? Get : Put), type);
</del><ins>+ ResolveOp op = JSScope::abstractResolve(m_globalObject->globalExec(), needsActivation(), scope, ident, (flag == ProfileTypesBytecodeGetFromScope ? Get : Put), type);
</ins><span class="cx">
</span><span class="cx"> // FIXME: handle other values for op.type here, and also consider what to do when we can't statically determine the globalID
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=135184
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (172807 => 172808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2014-08-20 20:28:24 UTC (rev 172807)
+++ trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2014-08-20 20:47:45 UTC (rev 172808)
</span><span class="lines">@@ -1386,7 +1386,6 @@
</span><span class="cx">
</span><span class="cx"> case GetScope: // FIXME: We could get rid of these if we know that the JSFunction is a constant. https://bugs.webkit.org/show_bug.cgi?id=106202
</span><span class="cx"> case GetMyScope:
</span><del>- case SkipTopScope:
</del><span class="cx"> forNode(node).setType(SpecObjectOther);
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (172807 => 172808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-08-20 20:28:24 UTC (rev 172807)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-08-20 20:47:45 UTC (rev 172808)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> bool isDirect);
</span><span class="cx"> void emitChecks(const ConstantStructureCheckVector&);
</span><span class="cx">
</span><del>- Node* getScope(bool skipTop, unsigned skipCount);
</del><ins>+ Node* getScope(unsigned skipCount);
</ins><span class="cx">
</span><span class="cx"> // Prepare to parse a block.
</span><span class="cx"> void prepareToParseBlock();
</span><span class="lines">@@ -2023,13 +2023,9 @@
</span><span class="cx"> m_constants.resize(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Node* ByteCodeParser::getScope(bool skipTop, unsigned skipCount)
</del><ins>+Node* ByteCodeParser::getScope(unsigned skipCount)
</ins><span class="cx"> {
</span><span class="cx"> Node* localBase = get(VirtualRegister(JSStack::ScopeChain));
</span><del>- if (skipTop) {
- ASSERT(!inlineCallFrame());
- localBase = addToGraph(SkipTopScope, localBase);
- }
</del><span class="cx"> for (unsigned n = skipCount; n--;)
</span><span class="cx"> localBase = addToGraph(SkipScope, localBase);
</span><span class="cx"> return localBase;
</span><span class="lines">@@ -2929,8 +2925,7 @@
</span><span class="cx"> set(VirtualRegister(dst), weakJSConstant(activation));
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- set(VirtualRegister(dst),
- getScope(m_inlineStackTop->m_codeBlock->needsActivation(), depth));
</del><ins>+ set(VirtualRegister(dst), getScope(depth));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case Dynamic:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGClobberizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGClobberize.h (172807 => 172808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGClobberize.h 2014-08-20 20:28:24 UTC (rev 172807)
+++ trunk/Source/JavaScriptCore/dfg/DFGClobberize.h 2014-08-20 20:47:45 UTC (rev 172808)
</span><span class="lines">@@ -748,11 +748,6 @@
</span><span class="cx"> def(PureValue(node));
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- case SkipTopScope:
- read(AbstractHeap(Variables, graph.activationRegister()));
- def(HeapLocation(SkipTopScopeLoc, AbstractHeap(Variables, graph.activationRegister()), node->child1()), node);
- return;
-
</del><span class="cx"> case GetClosureRegisters:
</span><span class="cx"> read(JSVariableObject_registers);
</span><span class="cx"> def(HeapLocation(ClosureRegistersLoc, JSVariableObject_registers, node->child1()), node);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGDoesGCcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGDoesGC.cpp (172807 => 172808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGDoesGC.cpp 2014-08-20 20:28:24 UTC (rev 172807)
+++ trunk/Source/JavaScriptCore/dfg/DFGDoesGC.cpp 2014-08-20 20:47:45 UTC (rev 172808)
</span><span class="lines">@@ -96,7 +96,6 @@
</span><span class="cx"> case CheckArray:
</span><span class="cx"> case GetScope:
</span><span class="cx"> case GetMyScope:
</span><del>- case SkipTopScope:
</del><span class="cx"> case SkipScope:
</span><span class="cx"> case GetClosureRegisters:
</span><span class="cx"> case GetClosureVar:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (172807 => 172808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2014-08-20 20:28:24 UTC (rev 172807)
+++ trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2014-08-20 20:47:45 UTC (rev 172808)
</span><span class="lines">@@ -853,7 +853,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case GetClosureRegisters:
</span><del>- case SkipTopScope:
</del><span class="cx"> case SkipScope:
</span><span class="cx"> case GetScope:
</span><span class="cx"> case GetGetter:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGHeapLocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGHeapLocation.cpp (172807 => 172808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGHeapLocation.cpp 2014-08-20 20:28:24 UTC (rev 172807)
+++ trunk/Source/JavaScriptCore/dfg/DFGHeapLocation.cpp 2014-08-20 20:47:45 UTC (rev 172808)
</span><span class="lines">@@ -136,10 +136,6 @@
</span><span class="cx"> out.print("NamedPropertyLoc");
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- case SkipTopScopeLoc:
- out.print("SkipTopScopeLoc");
- return;
-
</del><span class="cx"> case TypedArrayByteOffsetLoc:
</span><span class="cx"> out.print("TypedArrayByteOffsetLoc");
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGHeapLocationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGHeapLocation.h (172807 => 172808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGHeapLocation.h 2014-08-20 20:28:24 UTC (rev 172807)
+++ trunk/Source/JavaScriptCore/dfg/DFGHeapLocation.h 2014-08-20 20:47:45 UTC (rev 172808)
</span><span class="lines">@@ -55,7 +55,6 @@
</span><span class="cx"> MyArgumentsLengthLoc,
</span><span class="cx"> NamedPropertyLoc,
</span><span class="cx"> SetterLoc,
</span><del>- SkipTopScopeLoc,
</del><span class="cx"> TypeOfLoc,
</span><span class="cx"> TypedArrayByteOffsetLoc,
</span><span class="cx"> VarInjectionWatchpointLoc,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGNodeTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGNodeType.h (172807 => 172808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGNodeType.h 2014-08-20 20:28:24 UTC (rev 172807)
+++ trunk/Source/JavaScriptCore/dfg/DFGNodeType.h 2014-08-20 20:47:45 UTC (rev 172808)
</span><span class="lines">@@ -175,7 +175,6 @@
</span><span class="cx"> macro(GetTypedArrayByteOffset, NodeResultInt32) \
</span><span class="cx"> macro(GetScope, NodeResultJS) \
</span><span class="cx"> macro(GetMyScope, NodeResultJS) \
</span><del>- macro(SkipTopScope, NodeResultJS) \
</del><span class="cx"> macro(SkipScope, NodeResultJS) \
</span><span class="cx"> macro(GetClosureRegisters, NodeResultStorage) \
</span><span class="cx"> macro(GetClosureVar, NodeResultJS) \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPredictionPropagationPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp (172807 => 172808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp 2014-08-20 20:28:24 UTC (rev 172807)
+++ trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp 2014-08-20 20:47:45 UTC (rev 172808)
</span><span class="lines">@@ -460,7 +460,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case GetMyScope:
</span><del>- case SkipTopScope:
</del><span class="cx"> case SkipScope: {
</span><span class="cx"> changed |= setPrediction(SpecObjectOther);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSafeToExecuteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h (172807 => 172808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h 2014-08-20 20:28:24 UTC (rev 172807)
+++ trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h 2014-08-20 20:47:45 UTC (rev 172808)
</span><span class="lines">@@ -166,7 +166,6 @@
</span><span class="cx"> case ArrayifyToStructure:
</span><span class="cx"> case GetScope:
</span><span class="cx"> case GetMyScope:
</span><del>- case SkipTopScope:
</del><span class="cx"> case SkipScope:
</span><span class="cx"> case GetClosureRegisters:
</span><span class="cx"> case GetClosureVar:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (172807 => 172808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2014-08-20 20:28:24 UTC (rev 172807)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2014-08-20 20:47:45 UTC (rev 172808)
</span><span class="lines">@@ -3512,16 +3512,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case SkipTopScope: {
- SpeculateCellOperand scope(this, node->child1());
- GPRTemporary result(this, Reuse, scope);
- GPRReg resultGPR = result.gpr();
- m_jit.move(scope.gpr(), resultGPR);
- m_jit.loadPtr(JITCompiler::Address(resultGPR, JSScope::offsetOfNext()), resultGPR);
- cellResult(resultGPR, node);
- break;
- }
-
</del><span class="cx"> case SkipScope: {
</span><span class="cx"> SpeculateCellOperand scope(this, node->child1());
</span><span class="cx"> GPRTemporary result(this, Reuse, scope);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (172807 => 172808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2014-08-20 20:28:24 UTC (rev 172807)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2014-08-20 20:47:45 UTC (rev 172808)
</span><span class="lines">@@ -3622,16 +3622,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case SkipTopScope: {
- SpeculateCellOperand scope(this, node->child1());
- GPRTemporary result(this, Reuse, scope);
- GPRReg resultGPR = result.gpr();
- m_jit.move(scope.gpr(), resultGPR);
- m_jit.loadPtr(JITCompiler::Address(resultGPR, JSScope::offsetOfNext()), resultGPR);
- cellResult(resultGPR, node);
- break;
- }
-
</del><span class="cx"> case SkipScope: {
</span><span class="cx"> SpeculateCellOperand scope(this, node->child1());
</span><span class="cx"> GPRTemporary result(this, Reuse, scope);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp (172807 => 172808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2014-08-20 20:28:24 UTC (rev 172807)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2014-08-20 20:47:45 UTC (rev 172808)
</span><span class="lines">@@ -594,10 +594,6 @@
</span><span class="cx"> {
</span><span class="cx"> emitVarInjectionCheck(needsVarInjectionChecks);
</span><span class="cx"> emitGetVirtualRegister(JSStack::ScopeChain, regT0);
</span><del>- if (m_codeBlock->needsActivation()) {
- emitGetVirtualRegister(m_codeBlock->activationRegister(), regT1);
- loadPtr(Address(regT0, JSScope::offsetOfNext()), regT0);
- }
</del><span class="cx"> for (unsigned i = 0; i < depth; ++i)
</span><span class="cx"> loadPtr(Address(regT0, JSScope::offsetOfNext()), regT0);
</span><span class="cx"> emitPutVirtualRegister(dst);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (172807 => 172808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-08-20 20:28:24 UTC (rev 172807)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-08-20 20:47:45 UTC (rev 172808)
</span><span class="lines">@@ -2201,11 +2201,7 @@
</span><span class="cx"> macro resolveScope()
</span><span class="cx"> loadp CodeBlock[cfr], t0
</span><span class="cx"> loadisFromInstruction(4, t2)
</span><del>- btbz CodeBlock::m_needsActivation[t0], .resolveScopeAfterActivationCheck
- loadis CodeBlock::m_activationRegister[t0], t1
- addi 1, t2
</del><span class="cx">
</span><del>-.resolveScopeAfterActivationCheck:
</del><span class="cx"> loadp ScopeChain[cfr], t0
</span><span class="cx"> btiz t2, .resolveScopeLoopEnd
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (172807 => 172808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-08-20 20:28:24 UTC (rev 172807)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-08-20 20:47:45 UTC (rev 172808)
</span><span class="lines">@@ -2034,11 +2034,6 @@
</span><span class="cx"> macro resolveScope()
</span><span class="cx"> loadp CodeBlock[cfr], t0
</span><span class="cx"> loadisFromInstruction(4, t2)
</span><del>- btbz CodeBlock::m_needsActivation[t0], .resolveScopeAfterActivationCheck
- loadis CodeBlock::m_activationRegister[t0], t1
- addi 1, t2
-
-.resolveScopeAfterActivationCheck:
</del><span class="cx"> loadp ScopeChain[cfr], t0
</span><span class="cx"> btiz t2, .resolveScopeLoopEnd
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSScope.cpp (172807 => 172808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSScope.cpp 2014-08-20 20:28:24 UTC (rev 172807)
+++ trunk/Source/JavaScriptCore/runtime/JSScope.cpp 2014-08-20 20:47:45 UTC (rev 172808)
</span><span class="lines">@@ -148,13 +148,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ResolveOp JSScope::abstractResolve(ExecState* exec, JSScope* scope, const Identifier& ident, GetOrPut getOrPut, ResolveType unlinkedType)
</del><ins>+ResolveOp JSScope::abstractResolve(ExecState* exec, bool hasTopActivation, JSScope* scope, const Identifier& ident, GetOrPut getOrPut, ResolveType unlinkedType)
</ins><span class="cx"> {
</span><span class="cx"> ResolveOp op(Dynamic, 0, 0, 0, 0, 0);
</span><span class="cx"> if (unlinkedType == Dynamic)
</span><span class="cx"> return op;
</span><span class="cx">
</span><del>- size_t depth = 0;
</del><ins>+ size_t depth = hasTopActivation ? 1 : 0;
</ins><span class="cx"> bool needsVarInjectionChecks = JSC::needsVarInjectionChecks(unlinkedType);
</span><span class="cx"> for (; scope; scope = scope->next()) {
</span><span class="cx"> if (abstractAccess(exec, scope, ident, getOrPut, depth, needsVarInjectionChecks, op))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSScope.h (172807 => 172808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSScope.h 2014-08-20 20:28:24 UTC (rev 172807)
+++ trunk/Source/JavaScriptCore/runtime/JSScope.h 2014-08-20 20:47:45 UTC (rev 172808)
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> JS_EXPORT_PRIVATE static JSObject* objectAtScope(JSScope*);
</span><span class="cx">
</span><span class="cx"> static JSValue resolve(ExecState*, JSScope*, const Identifier&);
</span><del>- static ResolveOp abstractResolve(ExecState*, JSScope*, const Identifier&, GetOrPut, ResolveType);
</del><ins>+ static ResolveOp abstractResolve(ExecState*, bool hasTopActivation, JSScope*, const Identifier&, GetOrPut, ResolveType);
</ins><span class="cx">
</span><span class="cx"> static void visitChildren(JSCell*, SlotVisitor&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>