<!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>[175471] 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/175471">175471</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-11-03 09:56:29 -0800 (Mon, 03 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add scope operand to op_resolve_scope
https://bugs.webkit.org/show_bug.cgi?id=138253
Reviewed by Mark Lam.
Added scope operand to op_resolve_scope. Although the scope register is filled in with
the ScopeChain register, this operand is not used in the processing of the bytecode.
That will be addressed in a future patch.
* bytecode/BytecodeList.json: Lengthened the three bytecodes.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::dumpBytecode): Added code to dump the scope operand.
(JSC::CodeBlock::CodeBlock):
(JSC::CodeBlock::finalizeUnconditionally):
Updated the operand indecies for the processing of op_resolve_scope.
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::emitResolveScope):
(JSC::BytecodeGenerator::emitGetOwnScope):
(JSC::BytecodeGenerator::emitReturn):
Added scope register to these emit functions and the bytecodes they emit.
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::parseBlock):
* dfg/DFGCapabilities.cpp:
(JSC::DFG::capabilityLevel):
* jit/JITPropertyAccess.cpp:
(JSC::JIT::emit_op_resolve_scope):
(JSC::JIT::emitSlow_op_resolve_scope):
* jit/JITPropertyAccess32_64.cpp:
(JSC::JIT::emit_op_resolve_scope):
(JSC::JIT::emitSlow_op_resolve_scope):
* llint/LLIntSlowPaths.cpp:
(JSC::LLInt::LLINT_SLOW_PATH_DECL):
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:
Updated the operand indecies for the processing of op_resolve_scope.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeBytecodeListjson">trunk/Source/JavaScriptCore/bytecode/BytecodeList.json</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGCapabilitiescpp">trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITPropertyAccesscpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITPropertyAccess32_64cpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntSlowPathscpp">trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (175470 => 175471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-11-03 15:47:08 UTC (rev 175470)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-11-03 17:56:29 UTC (rev 175471)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2014-11-01 Michael Saboff <msaboff@apple.com>
+
+ Add scope operand to op_resolve_scope
+ https://bugs.webkit.org/show_bug.cgi?id=138253
+
+ Reviewed by Mark Lam.
+
+ Added scope operand to op_resolve_scope. Although the scope register is filled in with
+ the ScopeChain register, this operand is not used in the processing of the bytecode.
+ That will be addressed in a future patch.
+
+ * bytecode/BytecodeList.json: Lengthened the three bytecodes.
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::dumpBytecode): Added code to dump the scope operand.
+
+ (JSC::CodeBlock::CodeBlock):
+ (JSC::CodeBlock::finalizeUnconditionally):
+ Updated the operand indecies for the processing of op_resolve_scope.
+
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::emitResolveScope):
+ (JSC::BytecodeGenerator::emitGetOwnScope):
+ (JSC::BytecodeGenerator::emitReturn):
+ Added scope register to these emit functions and the bytecodes they emit.
+
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::parseBlock):
+ * dfg/DFGCapabilities.cpp:
+ (JSC::DFG::capabilityLevel):
+ * jit/JITPropertyAccess.cpp:
+ (JSC::JIT::emit_op_resolve_scope):
+ (JSC::JIT::emitSlow_op_resolve_scope):
+ * jit/JITPropertyAccess32_64.cpp:
+ (JSC::JIT::emit_op_resolve_scope):
+ (JSC::JIT::emitSlow_op_resolve_scope):
+ * llint/LLIntSlowPaths.cpp:
+ (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+ Updated the operand indecies for the processing of op_resolve_scope.
+
</ins><span class="cx"> 2014-11-01 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(CMake): Make it possible to build without introspection
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeBytecodeListjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/BytecodeList.json (175470 => 175471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/BytecodeList.json 2014-11-03 15:47:08 UTC (rev 175470)
+++ trunk/Source/JavaScriptCore/bytecode/BytecodeList.json 2014-11-03 17:56:29 UTC (rev 175471)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> { "name" : "op_construct_varargs", "length" : 9 },
</span><span class="cx"> { "name" : "op_strcat", "length" : 4 },
</span><span class="cx"> { "name" : "op_to_primitive", "length" : 3 },
</span><del>- { "name" : "op_resolve_scope", "length" : 6 },
</del><ins>+ { "name" : "op_resolve_scope", "length" : 7 },
</ins><span class="cx"> { "name" : "op_get_from_scope", "length" : 8 },
</span><span class="cx"> { "name" : "op_put_to_scope", "length" : 7 },
</span><span class="cx"> { "name" : "op_push_with_scope", "length" : 3 },
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (175470 => 175471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-11-03 15:47:08 UTC (rev 175470)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-11-03 17:56:29 UTC (rev 175471)
</span><span class="lines">@@ -1487,11 +1487,12 @@
</span><span class="cx"> }
</span><span class="cx"> case op_resolve_scope: {
</span><span class="cx"> int r0 = (++it)->u.operand;
</span><ins>+ int scope = (++it)->u.operand;
</ins><span class="cx"> int id0 = (++it)->u.operand;
</span><span class="cx"> ResolveModeAndType modeAndType = ResolveModeAndType((++it)->u.operand);
</span><span class="cx"> int depth = (++it)->u.operand;
</span><span class="cx"> printLocationAndOp(out, exec, location, it, "resolve_scope");
</span><del>- out.printf("%s, %s, %u<%s|%s>, %d", registerName(r0).data(), idName(id0, identifier(id0)).data(),
</del><ins>+ out.printf("%s, %s, %s, %u<%s|%s>, %d", registerName(r0).data(), registerName(scope).data(), idName(id0, identifier(id0)).data(),
</ins><span class="cx"> modeAndType.operand(), resolveModeName(modeAndType.mode()), resolveTypeName(modeAndType.type()),
</span><span class="cx"> depth);
</span><span class="cx"> ++it;
</span><span class="lines">@@ -1928,18 +1929,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case op_resolve_scope: {
</span><del>- const Identifier& ident = identifier(pc[2].u.operand);
- ResolveType type = static_cast<ResolveType>(pc[3].u.operand);
</del><ins>+ const Identifier& ident = identifier(pc[3].u.operand);
+ ResolveType type = static_cast<ResolveType>(pc[4].u.operand);
</ins><span class="cx"> if (type == LocalClosureVar) {
</span><del>- instructions[i + 3].u.operand = ClosureVar;
</del><ins>+ instructions[i + 4].u.operand = ClosureVar;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResolveOp op = JSScope::abstractResolve(m_globalObject->globalExec(), needsActivation(), scope, ident, Get, type);
</span><del>- instructions[i + 3].u.operand = op.type;
- instructions[i + 4].u.operand = op.depth;
</del><ins>+ instructions[i + 4].u.operand = op.type;
+ instructions[i + 5].u.operand = op.depth;
</ins><span class="cx"> if (op.lexicalEnvironment)
</span><del>- instructions[i + 5].u.lexicalEnvironment.set(*vm(), ownerExecutable, op.lexicalEnvironment);
</del><ins>+ instructions[i + 6].u.lexicalEnvironment.set(*vm(), ownerExecutable, op.lexicalEnvironment);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2545,7 +2546,7 @@
</span><span class="cx"> curInstruction[2].u.jsCell.clear();
</span><span class="cx"> break;
</span><span class="cx"> case op_resolve_scope: {
</span><del>- WriteBarrierBase<JSLexicalEnvironment>& lexicalEnvironment = curInstruction[5].u.lexicalEnvironment;
</del><ins>+ WriteBarrierBase<JSLexicalEnvironment>& lexicalEnvironment = curInstruction[6].u.lexicalEnvironment;
</ins><span class="cx"> if (!lexicalEnvironment || Heap::isMarked(lexicalEnvironment.get()))
</span><span class="cx"> break;
</span><span class="cx"> if (Options::verboseOSR())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (175470 => 175471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-11-03 15:47:08 UTC (rev 175470)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-11-03 17:56:29 UTC (rev 175471)
</span><span class="lines">@@ -1296,6 +1296,7 @@
</span><span class="cx"> if (!entry.isNull()) {
</span><span class="cx"> emitOpcode(op_resolve_scope);
</span><span class="cx"> instructions().append(kill(dst));
</span><ins>+ instructions().append(scopeRegister()->index());
</ins><span class="cx"> instructions().append(addConstant(identifier));
</span><span class="cx"> instructions().append(LocalClosureVar);
</span><span class="cx"> instructions().append(0);
</span><span class="lines">@@ -1310,6 +1311,7 @@
</span><span class="cx"> // resolve_scope dst, id, ResolveType, depth
</span><span class="cx"> emitOpcode(op_resolve_scope);
</span><span class="cx"> instructions().append(kill(dst));
</span><ins>+ instructions().append(scopeRegister()->index());
</ins><span class="cx"> instructions().append(addConstant(identifier));
</span><span class="cx"> instructions().append(resolveType());
</span><span class="cx"> instructions().append(0);
</span><span class="lines">@@ -1322,6 +1324,7 @@
</span><span class="cx"> {
</span><span class="cx"> emitOpcode(op_resolve_scope);
</span><span class="cx"> instructions().append(kill(dst));
</span><ins>+ instructions().append(scopeRegister()->index());
</ins><span class="cx"> instructions().append(addConstant(identifier));
</span><span class="cx"> instructions().append(LocalClosureVar);
</span><span class="cx"> // This should be m_localScopeDepth if we aren't doing
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (175470 => 175471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-11-03 15:47:08 UTC (rev 175470)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-11-03 17:56:29 UTC (rev 175471)
</span><span class="lines">@@ -3174,8 +3174,8 @@
</span><span class="cx">
</span><span class="cx"> case op_resolve_scope: {
</span><span class="cx"> int dst = currentInstruction[1].u.operand;
</span><del>- ResolveType resolveType = static_cast<ResolveType>(currentInstruction[3].u.operand);
- unsigned depth = currentInstruction[4].u.operand;
</del><ins>+ ResolveType resolveType = static_cast<ResolveType>(currentInstruction[4].u.operand);
+ unsigned depth = currentInstruction[5].u.operand;
</ins><span class="cx">
</span><span class="cx"> // get_from_scope and put_to_scope depend on this watchpoint forcing OSR exit, so they don't add their own watchpoints.
</span><span class="cx"> if (needsVarInjectionChecks(resolveType))
</span><span class="lines">@@ -3191,7 +3191,7 @@
</span><span class="cx"> case LocalClosureVar:
</span><span class="cx"> case ClosureVar:
</span><span class="cx"> case ClosureVarWithVarInjectionChecks: {
</span><del>- JSLexicalEnvironment* lexicalEnvironment = currentInstruction[5].u.lexicalEnvironment.get();
</del><ins>+ JSLexicalEnvironment* lexicalEnvironment = currentInstruction[6].u.lexicalEnvironment.get();
</ins><span class="cx"> if (lexicalEnvironment
</span><span class="cx"> && lexicalEnvironment->symbolTable()->m_functionEnteredOnce.isStillValid()) {
</span><span class="cx"> addToGraph(FunctionReentryWatchpoint, OpInfo(lexicalEnvironment->symbolTable()));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (175470 => 175471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp 2014-11-03 15:47:08 UTC (rev 175470)
+++ trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp 2014-11-03 17:56:29 UTC (rev 175471)
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx">
</span><span class="cx"> case op_resolve_scope: {
</span><span class="cx"> // We don't compile 'catch' or 'with', so there's no point in compiling variable resolution within them.
</span><del>- ResolveType resolveType = ResolveModeAndType(pc[3].u.operand).type();
</del><ins>+ ResolveType resolveType = ResolveModeAndType(pc[4].u.operand).type();
</ins><span class="cx"> if (resolveType == Dynamic)
</span><span class="cx"> return CannotCompile;
</span><span class="cx"> return CanCompileAndInline;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp (175470 => 175471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2014-11-03 15:47:08 UTC (rev 175470)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2014-11-03 17:56:29 UTC (rev 175471)
</span><span class="lines">@@ -602,8 +602,8 @@
</span><span class="cx"> void JIT::emit_op_resolve_scope(Instruction* currentInstruction)
</span><span class="cx"> {
</span><span class="cx"> int dst = currentInstruction[1].u.operand;
</span><del>- ResolveType resolveType = static_cast<ResolveType>(currentInstruction[3].u.operand);
- unsigned depth = currentInstruction[4].u.operand;
</del><ins>+ ResolveType resolveType = static_cast<ResolveType>(currentInstruction[4].u.operand);
+ unsigned depth = currentInstruction[5].u.operand;
</ins><span class="cx">
</span><span class="cx"> switch (resolveType) {
</span><span class="cx"> case GlobalProperty:
</span><span class="lines">@@ -629,13 +629,13 @@
</span><span class="cx"> void JIT::emitSlow_op_resolve_scope(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><span class="cx"> int dst = currentInstruction[1].u.operand;
</span><del>- ResolveType resolveType = static_cast<ResolveType>(currentInstruction[3].u.operand);
</del><ins>+ ResolveType resolveType = static_cast<ResolveType>(currentInstruction[4].u.operand);
</ins><span class="cx">
</span><span class="cx"> if (resolveType == GlobalProperty || resolveType == GlobalVar || resolveType == ClosureVar)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> linkSlowCase(iter);
</span><del>- int32_t indentifierIndex = currentInstruction[2].u.operand;
</del><ins>+ int32_t indentifierIndex = currentInstruction[3].u.operand;
</ins><span class="cx"> callOperation(operationResolveScope, dst, indentifierIndex);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccess32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp (175470 => 175471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp 2014-11-03 15:47:08 UTC (rev 175470)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp 2014-11-03 17:56:29 UTC (rev 175471)
</span><span class="lines">@@ -625,8 +625,8 @@
</span><span class="cx"> void JIT::emit_op_resolve_scope(Instruction* currentInstruction)
</span><span class="cx"> {
</span><span class="cx"> int dst = currentInstruction[1].u.operand;
</span><del>- ResolveType resolveType = static_cast<ResolveType>(currentInstruction[3].u.operand);
- unsigned depth = currentInstruction[4].u.operand;
</del><ins>+ ResolveType resolveType = static_cast<ResolveType>(currentInstruction[4].u.operand);
+ unsigned depth = currentInstruction[5].u.operand;
</ins><span class="cx">
</span><span class="cx"> switch (resolveType) {
</span><span class="cx"> case GlobalProperty:
</span><span class="lines">@@ -653,13 +653,13 @@
</span><span class="cx"> void JIT::emitSlow_op_resolve_scope(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><span class="cx"> int dst = currentInstruction[1].u.operand;
</span><del>- ResolveType resolveType = static_cast<ResolveType>(currentInstruction[3].u.operand);
</del><ins>+ ResolveType resolveType = static_cast<ResolveType>(currentInstruction[4].u.operand);
</ins><span class="cx">
</span><span class="cx"> if (resolveType == GlobalProperty || resolveType == GlobalVar || resolveType == ClosureVar)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> linkSlowCase(iter);
</span><del>- int32_t indentifierIndex = currentInstruction[2].u.operand;
</del><ins>+ int32_t indentifierIndex = currentInstruction[3].u.operand;
</ins><span class="cx"> callOperation(operationResolveScope, dst, indentifierIndex);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (175470 => 175471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2014-11-03 15:47:08 UTC (rev 175470)
+++ trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2014-11-03 17:56:29 UTC (rev 175471)
</span><span class="lines">@@ -1355,7 +1355,7 @@
</span><span class="cx"> LLINT_SLOW_PATH_DECL(slow_path_resolve_scope)
</span><span class="cx"> {
</span><span class="cx"> LLINT_BEGIN();
</span><del>- const Identifier& ident = exec->codeBlock()->identifier(pc[2].u.operand);
</del><ins>+ const Identifier& ident = exec->codeBlock()->identifier(pc[3].u.operand);
</ins><span class="cx"> LLINT_RETURN(JSScope::resolve(exec, exec->scope(), ident));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (175470 => 175471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-11-03 15:47:08 UTC (rev 175470)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-11-03 17:56:29 UTC (rev 175471)
</span><span class="lines">@@ -2159,7 +2159,7 @@
</span><span class="cx">
</span><span class="cx"> macro resolveScope()
</span><span class="cx"> loadp CodeBlock[cfr], t0
</span><del>- loadisFromInstruction(4, t2)
</del><ins>+ loadisFromInstruction(5, t2)
</ins><span class="cx">
</span><span class="cx"> loadp ScopeChain + PayloadOffset[cfr], t0
</span><span class="cx"> btiz t2, .resolveScopeLoopEnd
</span><span class="lines">@@ -2178,44 +2178,44 @@
</span><span class="cx">
</span><span class="cx"> _llint_op_resolve_scope:
</span><span class="cx"> traceExecution()
</span><del>- loadisFromInstruction(3, t0)
</del><ins>+ loadisFromInstruction(4, t0)
</ins><span class="cx">
</span><span class="cx"> #rGlobalProperty:
</span><span class="cx"> bineq t0, GlobalProperty, .rGlobalVar
</span><span class="cx"> getGlobalObject(1)
</span><del>- dispatch(6)
</del><ins>+ dispatch(7)
</ins><span class="cx">
</span><span class="cx"> .rGlobalVar:
</span><span class="cx"> bineq t0, GlobalVar, .rClosureVar
</span><span class="cx"> getGlobalObject(1)
</span><del>- dispatch(6)
</del><ins>+ dispatch(7)
</ins><span class="cx">
</span><span class="cx"> .rClosureVar:
</span><span class="cx"> bineq t0, ClosureVar, .rGlobalPropertyWithVarInjectionChecks
</span><span class="cx"> resolveScope()
</span><del>- dispatch(6)
</del><ins>+ dispatch(7)
</ins><span class="cx">
</span><span class="cx"> .rGlobalPropertyWithVarInjectionChecks:
</span><span class="cx"> bineq t0, GlobalPropertyWithVarInjectionChecks, .rGlobalVarWithVarInjectionChecks
</span><span class="cx"> varInjectionCheck(.rDynamic)
</span><span class="cx"> getGlobalObject(1)
</span><del>- dispatch(6)
</del><ins>+ dispatch(7)
</ins><span class="cx">
</span><span class="cx"> .rGlobalVarWithVarInjectionChecks:
</span><span class="cx"> bineq t0, GlobalVarWithVarInjectionChecks, .rClosureVarWithVarInjectionChecks
</span><span class="cx"> varInjectionCheck(.rDynamic)
</span><span class="cx"> getGlobalObject(1)
</span><del>- dispatch(6)
</del><ins>+ dispatch(7)
</ins><span class="cx">
</span><span class="cx"> .rClosureVarWithVarInjectionChecks:
</span><span class="cx"> bineq t0, ClosureVarWithVarInjectionChecks, .rDynamic
</span><span class="cx"> varInjectionCheck(.rDynamic)
</span><span class="cx"> resolveScope()
</span><del>- dispatch(6)
</del><ins>+ dispatch(7)
</ins><span class="cx">
</span><span class="cx"> .rDynamic:
</span><span class="cx"> callSlowPath(_llint_slow_path_resolve_scope)
</span><del>- dispatch(6)
</del><ins>+ dispatch(7)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> macro loadWithStructureCheck(operand, slowPath)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (175470 => 175471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-11-03 15:47:08 UTC (rev 175470)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-11-03 17:56:29 UTC (rev 175471)
</span><span class="lines">@@ -1992,7 +1992,7 @@
</span><span class="cx">
</span><span class="cx"> macro resolveScope()
</span><span class="cx"> loadp CodeBlock[cfr], t0
</span><del>- loadisFromInstruction(4, t2)
</del><ins>+ loadisFromInstruction(5, t2)
</ins><span class="cx"> loadp ScopeChain[cfr], t0
</span><span class="cx"> btiz t2, .resolveScopeLoopEnd
</span><span class="cx">
</span><span class="lines">@@ -2009,44 +2009,44 @@
</span><span class="cx">
</span><span class="cx"> _llint_op_resolve_scope:
</span><span class="cx"> traceExecution()
</span><del>- loadisFromInstruction(3, t0)
</del><ins>+ loadisFromInstruction(4, t0)
</ins><span class="cx">
</span><span class="cx"> #rGlobalProperty:
</span><span class="cx"> bineq t0, GlobalProperty, .rGlobalVar
</span><span class="cx"> getGlobalObject(1)
</span><del>- dispatch(6)
</del><ins>+ dispatch(7)
</ins><span class="cx">
</span><span class="cx"> .rGlobalVar:
</span><span class="cx"> bineq t0, GlobalVar, .rClosureVar
</span><span class="cx"> getGlobalObject(1)
</span><del>- dispatch(6)
</del><ins>+ dispatch(7)
</ins><span class="cx">
</span><span class="cx"> .rClosureVar:
</span><span class="cx"> bineq t0, ClosureVar, .rGlobalPropertyWithVarInjectionChecks
</span><span class="cx"> resolveScope()
</span><del>- dispatch(6)
</del><ins>+ dispatch(7)
</ins><span class="cx">
</span><span class="cx"> .rGlobalPropertyWithVarInjectionChecks:
</span><span class="cx"> bineq t0, GlobalPropertyWithVarInjectionChecks, .rGlobalVarWithVarInjectionChecks
</span><span class="cx"> varInjectionCheck(.rDynamic)
</span><span class="cx"> getGlobalObject(1)
</span><del>- dispatch(6)
</del><ins>+ dispatch(7)
</ins><span class="cx">
</span><span class="cx"> .rGlobalVarWithVarInjectionChecks:
</span><span class="cx"> bineq t0, GlobalVarWithVarInjectionChecks, .rClosureVarWithVarInjectionChecks
</span><span class="cx"> varInjectionCheck(.rDynamic)
</span><span class="cx"> getGlobalObject(1)
</span><del>- dispatch(6)
</del><ins>+ dispatch(7)
</ins><span class="cx">
</span><span class="cx"> .rClosureVarWithVarInjectionChecks:
</span><span class="cx"> bineq t0, ClosureVarWithVarInjectionChecks, .rDynamic
</span><span class="cx"> varInjectionCheck(.rDynamic)
</span><span class="cx"> resolveScope()
</span><del>- dispatch(6)
</del><ins>+ dispatch(7)
</ins><span class="cx">
</span><span class="cx"> .rDynamic:
</span><span class="cx"> callSlowPath(_llint_slow_path_resolve_scope)
</span><del>- dispatch(6)
</del><ins>+ dispatch(7)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> macro loadWithStructureCheck(operand, slowPath)
</span></span></pre>
</div>
</div>
</body>
</html>