<!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>[162390] 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/162390">162390</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-01-20 16:46:17 -0800 (Mon, 20 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>op_captured_mov and op_new_captured_func in UnlinkedCodeBlocks should use the IdentifierMap instead of the strings directly
https://bugs.webkit.org/show_bug.cgi?id=127311
<rdar://problem/15853958>
Reviewed by Andreas Kling.
This makes UnlinkedCodeBlocks use 32-bit instruction streams again.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::CodeBlock):
* bytecode/UnlinkedCodeBlock.h:
(JSC::UnlinkedInstruction::UnlinkedInstruction):
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::addVar):
(JSC::BytecodeGenerator::emitInitLazyRegister):
(JSC::BytecodeGenerator::createArgumentsIfNecessary):
* bytecompiler/BytecodeGenerator.h:
(JSC::BytecodeGenerator::watchableVariable):
(JSC::BytecodeGenerator::hasWatchableVariable):</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="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (162389 => 162390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-21 00:45:05 UTC (rev 162389)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-21 00:46:17 UTC (rev 162390)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-01-20 Filip Pizlo <fpizlo@apple.com>
+
+ op_captured_mov and op_new_captured_func in UnlinkedCodeBlocks should use the IdentifierMap instead of the strings directly
+ https://bugs.webkit.org/show_bug.cgi?id=127311
+ <rdar://problem/15853958>
+
+ Reviewed by Andreas Kling.
+
+ This makes UnlinkedCodeBlocks use 32-bit instruction streams again.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::CodeBlock):
+ * bytecode/UnlinkedCodeBlock.h:
+ (JSC::UnlinkedInstruction::UnlinkedInstruction):
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::addVar):
+ (JSC::BytecodeGenerator::emitInitLazyRegister):
+ (JSC::BytecodeGenerator::createArgumentsIfNecessary):
+ * bytecompiler/BytecodeGenerator.h:
+ (JSC::BytecodeGenerator::watchableVariable):
+ (JSC::BytecodeGenerator::hasWatchableVariable):
+
</ins><span class="cx"> 2014-01-20 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Removing CodeBlock::opDebugBytecodeOffsetForLineAndColumn() and friends.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (162389 => 162390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-01-21 00:45:05 UTC (rev 162389)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-01-21 00:46:17 UTC (rev 162390)
</span><span class="lines">@@ -1815,9 +1815,11 @@
</span><span class="cx">
</span><span class="cx"> case op_captured_mov:
</span><span class="cx"> case op_new_captured_func: {
</span><del>- StringImpl* uid = pc[i + 3].u.uid;
- if (!uid)
</del><ins>+ if (pc[i + 3].u.index == UINT_MAX) {
+ instructions[i + 3].u.watchpointSet = 0;
</ins><span class="cx"> break;
</span><ins>+ }
+ StringImpl* uid = identifier(pc[i + 3].u.index).impl();
</ins><span class="cx"> RELEASE_ASSERT(didCloneSymbolTable);
</span><span class="cx"> ConcurrentJITLocker locker(m_symbolTable->m_lock);
</span><span class="cx"> SymbolTable::Map::iterator iter = m_symbolTable->find(locker, uid);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h (162389 => 162390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2014-01-21 00:45:05 UTC (rev 162389)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2014-01-21 00:46:17 UTC (rev 162390)
</span><span class="lines">@@ -228,11 +228,10 @@
</span><span class="cx"> UnlinkedInstruction() { u.operand = 0; }
</span><span class="cx"> UnlinkedInstruction(OpcodeID opcode) { u.opcode = opcode; }
</span><span class="cx"> UnlinkedInstruction(int operand) { u.operand = operand; }
</span><del>- UnlinkedInstruction(StringImpl* uid) { u.uid = uid; }
</del><span class="cx"> union {
</span><span class="cx"> OpcodeID opcode;
</span><span class="cx"> int32_t operand;
</span><del>- StringImpl* uid;
</del><ins>+ unsigned index;
</ins><span class="cx"> } u;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (162389 => 162390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-01-21 00:45:05 UTC (rev 162389)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-01-21 00:46:17 UTC (rev 162390)
</span><span class="lines">@@ -132,8 +132,8 @@
</span><span class="cx">
</span><span class="cx"> if (watchMode == IsWatchable) {
</span><span class="cx"> while (m_watchableVariables.size() < static_cast<size_t>(m_codeBlock->m_numVars))
</span><del>- m_watchableVariables.append(nullptr);
- m_watchableVariables.append(ident.impl());
</del><ins>+ m_watchableVariables.append(Identifier());
+ m_watchableVariables.append(ident);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> r0 = addVar();
</span><span class="lines">@@ -469,7 +469,7 @@
</span><span class="cx"> {
</span><span class="cx"> emitOpcode(op_init_lazy_reg);
</span><span class="cx"> instructions().append(reg->index());
</span><del>- ASSERT(!watchableVariable(reg->index()));
</del><ins>+ ASSERT(!hasWatchableVariable(reg->index()));
</ins><span class="cx"> return reg;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1628,7 +1628,7 @@
</span><span class="cx">
</span><span class="cx"> emitOpcode(op_create_arguments);
</span><span class="cx"> instructions().append(m_codeBlock->argumentsRegister().offset());
</span><del>- ASSERT(!watchableVariable(m_codeBlock->argumentsRegister().offset()));
</del><ins>+ ASSERT(!hasWatchableVariable(m_codeBlock->argumentsRegister().offset()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BytecodeGenerator::createActivationIfNecessary()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h (162389 => 162390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2014-01-21 00:45:05 UTC (rev 162389)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2014-01-21 00:46:17 UTC (rev 162390)
</span><span class="lines">@@ -591,16 +591,24 @@
</span><span class="cx"> void createActivationIfNecessary();
</span><span class="cx"> RegisterID* createLazyRegisterIfNecessary(RegisterID*);
</span><span class="cx">
</span><del>- StringImpl* watchableVariable(int operand)
</del><ins>+ unsigned watchableVariable(int operand)
</ins><span class="cx"> {
</span><span class="cx"> VirtualRegister reg(operand);
</span><span class="cx"> if (!reg.isLocal())
</span><del>- return 0;
</del><ins>+ return UINT_MAX;
</ins><span class="cx"> if (static_cast<size_t>(reg.toLocal()) >= m_watchableVariables.size())
</span><del>- return 0;
- return m_watchableVariables[reg.toLocal()];
</del><ins>+ return UINT_MAX;
+ Identifier& ident = m_watchableVariables[reg.toLocal()];
+ if (ident.isNull())
+ return UINT_MAX;
+ return addConstant(ident);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool hasWatchableVariable(int operand)
+ {
+ return watchableVariable(operand) != UINT_MAX;
+ }
+
</ins><span class="cx"> Vector<UnlinkedInstruction, 0, UnsafeVectorOverflow> m_instructions;
</span><span class="cx">
</span><span class="cx"> bool m_shouldEmitDebugHooks;
</span><span class="lines">@@ -620,7 +628,7 @@
</span><span class="cx"> RegisterID* m_activationRegister;
</span><span class="cx"> RegisterID* m_emptyValueRegister;
</span><span class="cx"> RegisterID* m_globalObjectRegister;
</span><del>- Vector<StringImpl*, 16> m_watchableVariables;
</del><ins>+ Vector<Identifier, 16> m_watchableVariables;
</ins><span class="cx"> SegmentedVector<RegisterID, 32> m_constantPoolRegisters;
</span><span class="cx"> SegmentedVector<RegisterID, 32> m_calleeRegisters;
</span><span class="cx"> SegmentedVector<RegisterID, 32> m_parameters;
</span></span></pre>
</div>
</div>
</body>
</html>