<!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>[199394] 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/199394">199394</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-04-12 15:42:06 -0700 (Tue, 12 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Lets not iterate over the constant pool twice every time we link a code block
https://bugs.webkit.org/show_bug.cgi?id=156517
Reviewed by Mark Lam.
I introduced a second iteration over the constant pool when I implemented
block scoping. I did this because we must clone all the symbol tables when
we link a CodeBlock. We can just do this cloning when setting the constant
registers for the first time. There is no need to iterate over the constant
pool a second time.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::finishCreation):
(JSC::CodeBlock::~CodeBlock):
(JSC::CodeBlock::setConstantRegisters):
(JSC::CodeBlock::setAlternative):
* bytecode/CodeBlock.h:
(JSC::CodeBlock::replaceConstant):
(JSC::CodeBlock::setConstantRegisters): Deleted.</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="#trunkSourceJavaScriptCorebytecodeCodeBlockh">trunk/Source/JavaScriptCore/bytecode/CodeBlock.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (199393 => 199394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-04-12 22:40:25 UTC (rev 199393)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-04-12 22:42:06 UTC (rev 199394)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-04-12 Saam barati <sbarati@apple.com>
+
+ Lets not iterate over the constant pool twice every time we link a code block
+ https://bugs.webkit.org/show_bug.cgi?id=156517
+
+ Reviewed by Mark Lam.
+
+ I introduced a second iteration over the constant pool when I implemented
+ block scoping. I did this because we must clone all the symbol tables when
+ we link a CodeBlock. We can just do this cloning when setting the constant
+ registers for the first time. There is no need to iterate over the constant
+ pool a second time.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::finishCreation):
+ (JSC::CodeBlock::~CodeBlock):
+ (JSC::CodeBlock::setConstantRegisters):
+ (JSC::CodeBlock::setAlternative):
+ * bytecode/CodeBlock.h:
+ (JSC::CodeBlock::replaceConstant):
+ (JSC::CodeBlock::setConstantRegisters): Deleted.
+
</ins><span class="cx"> 2016-04-12 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> ES6: Implement String.prototype.split and RegExp.prototype[@@split].
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (199393 => 199394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2016-04-12 22:40:25 UTC (rev 199393)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2016-04-12 22:42:06 UTC (rev 199394)
</span><span class="lines">@@ -1886,31 +1886,6 @@
</span><span class="cx"> m_constantRegisters[registerIndex].set(*m_vm, this, m_globalObject->jsCellForLinkTimeConstant(type));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !ASSERT_DISABLED
- HashSet<int, WTF::IntHash<int>, WTF::UnsignedWithZeroKeyHashTraits<int>> clonedConstantSymbolTables;
-#endif
- {
-#if !ASSERT_DISABLED
- HashSet<SymbolTable*> clonedSymbolTables;
-#endif
- bool hasTypeProfiler = !!vm.typeProfiler();
- for (unsigned i = 0; i < m_constantRegisters.size(); i++) {
- if (m_constantRegisters[i].get().isEmpty())
- continue;
- if (SymbolTable* symbolTable = jsDynamicCast<SymbolTable*>(m_constantRegisters[i].get())) {
- ASSERT(clonedSymbolTables.add(symbolTable).isNewEntry);
- if (hasTypeProfiler) {
- ConcurrentJITLocker locker(symbolTable->m_lock);
- symbolTable->prepareForTypeProfiling(locker);
- }
- m_constantRegisters[i].set(*m_vm, this, symbolTable->cloneScopePart(*m_vm));
-#if !ASSERT_DISABLED
- clonedConstantSymbolTables.add(i + FirstConstantRegisterIndex);
-#endif
- }
- }
- }
-
</del><span class="cx"> // We already have the cloned symbol table for the module environment since we need to instantiate
</span><span class="cx"> // the module environments before linking the code block. We replace the stored symbol table with the already cloned one.
</span><span class="cx"> if (UnlinkedModuleProgramCodeBlock* unlinkedModuleProgramCodeBlock = jsDynamicCast<UnlinkedModuleProgramCodeBlock*>(unlinkedCodeBlock)) {
</span><span class="lines">@@ -2106,14 +2081,6 @@
</span><span class="cx"> case op_get_array_length:
</span><span class="cx"> CRASH();
</span><span class="cx">
</span><del>-#if !ASSERT_DISABLED
- case op_create_lexical_environment: {
- int symbolTableIndex = pc[3].u.operand;
- ASSERT(clonedConstantSymbolTables.contains(symbolTableIndex));
- break;
- }
-#endif
-
</del><span class="cx"> case op_resolve_scope: {
</span><span class="cx"> const Identifier& ident = identifier(pc[3].u.operand);
</span><span class="cx"> ResolveType type = static_cast<ResolveType>(pc[4].u.operand);
</span><span class="lines">@@ -2177,7 +2144,6 @@
</span><span class="cx"> // Only do watching if the property we're putting to is not anonymous.
</span><span class="cx"> if (static_cast<unsigned>(pc[2].u.operand) != UINT_MAX) {
</span><span class="cx"> int symbolTableIndex = pc[5].u.operand;
</span><del>- ASSERT(clonedConstantSymbolTables.contains(symbolTableIndex));
</del><span class="cx"> SymbolTable* symbolTable = jsCast<SymbolTable*>(getConstant(symbolTableIndex));
</span><span class="cx"> const Identifier& ident = identifier(pc[2].u.operand);
</span><span class="cx"> ConcurrentJITLocker locker(symbolTable->m_lock);
</span><span class="lines">@@ -2248,7 +2214,6 @@
</span><span class="cx"> }
</span><span class="cx"> case ProfileTypeBytecodeLocallyResolved: {
</span><span class="cx"> int symbolTableIndex = pc[2].u.operand;
</span><del>- ASSERT(clonedConstantSymbolTables.contains(symbolTableIndex));
</del><span class="cx"> SymbolTable* symbolTable = jsCast<SymbolTable*>(getConstant(symbolTableIndex));
</span><span class="cx"> const Identifier& ident = identifier(pc[4].u.operand);
</span><span class="cx"> ConcurrentJITLocker locker(symbolTable->m_lock);
</span><span class="lines">@@ -2419,6 +2384,31 @@
</span><span class="cx"> #endif // ENABLE(JIT)
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CodeBlock::setConstantRegisters(const Vector<WriteBarrier<Unknown>>& constants, const Vector<SourceCodeRepresentation>& constantsSourceCodeRepresentation)
+{
+ ASSERT(constants.size() == constantsSourceCodeRepresentation.size());
+ size_t count = constants.size();
+ m_constantRegisters.resizeToFit(count);
+ bool hasTypeProfiler = !!m_vm->typeProfiler();
+ for (size_t i = 0; i < count; i++) {
+ JSValue constant = constants[i].get();
+
+ if (!constant.isEmpty()) {
+ if (SymbolTable* symbolTable = jsDynamicCast<SymbolTable*>(constant)) {
+ if (hasTypeProfiler) {
+ ConcurrentJITLocker locker(symbolTable->m_lock);
+ symbolTable->prepareForTypeProfiling(locker);
+ }
+ constant = symbolTable->cloneScopePart(*m_vm);
+ }
+ }
+
+ m_constantRegisters[i].set(*m_vm, this, constant);
+ }
+
+ m_constantsSourceCodeRepresentation = constantsSourceCodeRepresentation;
+}
+
</ins><span class="cx"> void CodeBlock::setAlternative(VM& vm, CodeBlock* alternative)
</span><span class="cx"> {
</span><span class="cx"> m_alternative.set(vm, this, alternative);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (199393 => 199394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2016-04-12 22:40:25 UTC (rev 199393)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2016-04-12 22:42:06 UTC (rev 199394)
</span><span class="lines">@@ -936,15 +936,7 @@
</span><span class="cx">
</span><span class="cx"> void updateAllPredictionsAndCountLiveness(unsigned& numberOfLiveNonArgumentValueProfiles, unsigned& numberOfSamplesInProfiles);
</span><span class="cx">
</span><del>- void setConstantRegisters(const Vector<WriteBarrier<Unknown>>& constants, const Vector<SourceCodeRepresentation>& constantsSourceCodeRepresentation)
- {
- ASSERT(constants.size() == constantsSourceCodeRepresentation.size());
- size_t count = constants.size();
- m_constantRegisters.resizeToFit(count);
- for (size_t i = 0; i < count; i++)
- m_constantRegisters[i].set(*m_vm, this, constants[i].get());
- m_constantsSourceCodeRepresentation = constantsSourceCodeRepresentation;
- }
</del><ins>+ void setConstantRegisters(const Vector<WriteBarrier<Unknown>>& constants, const Vector<SourceCodeRepresentation>& constantsSourceCodeRepresentation);
</ins><span class="cx">
</span><span class="cx"> void replaceConstant(int index, JSValue value)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>