<!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>[198868] 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/198868">198868</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-03-30 17:47:15 -0700 (Wed, 30 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change some release asserts in CodeBlock linking into debug asserts
https://bugs.webkit.org/show_bug.cgi?id=155500
Reviewed by Filip Pizlo.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::finishCreation):</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (198867 => 198868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-31 00:40:11 UTC (rev 198867)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-31 00:47:15 UTC (rev 198868)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-03-30 Saam Barati <sbarati@apple.com>
+
+ Change some release asserts in CodeBlock linking into debug asserts
+ https://bugs.webkit.org/show_bug.cgi?id=155500
+
+ Reviewed by Filip Pizlo.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::finishCreation):
+
</ins><span class="cx"> 2016-03-30 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused ScriptProfiler.Samples.totalTime
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (198867 => 198868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2016-03-31 00:40:11 UTC (rev 198867)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2016-03-31 00:47:15 UTC (rev 198868)
</span><span class="lines">@@ -1869,20 +1869,27 @@
</span><span class="cx"> m_constantRegisters[registerIndex].set(*m_vm, this, m_globalObject->jsCellForLinkTimeConstant(type));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !ASSERT_DISABLED
</ins><span class="cx"> HashSet<int, WTF::IntHash<int>, WTF::UnsignedWithZeroKeyHashTraits<int>> clonedConstantSymbolTables;
</span><ins>+#endif
</ins><span class="cx"> {
</span><ins>+#if !ASSERT_DISABLED
</ins><span class="cx"> HashSet<SymbolTable*> clonedSymbolTables;
</span><ins>+#endif
+ bool hasTypeProfiler = !!vm.typeProfiler();
</ins><span class="cx"> for (unsigned i = 0; i < m_constantRegisters.size(); i++) {
</span><span class="cx"> if (m_constantRegisters[i].get().isEmpty())
</span><span class="cx"> continue;
</span><span class="cx"> if (SymbolTable* symbolTable = jsDynamicCast<SymbolTable*>(m_constantRegisters[i].get())) {
</span><del>- RELEASE_ASSERT(clonedSymbolTables.add(symbolTable).isNewEntry);
- if (m_vm->typeProfiler()) {
</del><ins>+ ASSERT(clonedSymbolTables.add(symbolTable).isNewEntry);
+ if (hasTypeProfiler) {
</ins><span class="cx"> ConcurrentJITLocker locker(symbolTable->m_lock);
</span><span class="cx"> symbolTable->prepareForTypeProfiling(locker);
</span><span class="cx"> }
</span><span class="cx"> m_constantRegisters[i].set(*m_vm, this, symbolTable->cloneScopePart(*m_vm));
</span><ins>+#if !ASSERT_DISABLED
</ins><span class="cx"> clonedConstantSymbolTables.add(i + FirstConstantRegisterIndex);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1898,10 +1905,11 @@
</span><span class="cx"> replaceConstant(unlinkedModuleProgramCodeBlock->moduleEnvironmentSymbolTableConstantRegisterOffset(), clonedSymbolTable);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool shouldUpdateFunctionHasExecutedCache = vm.typeProfiler() || vm.controlFlowProfiler();
</ins><span class="cx"> m_functionDecls = RefCountedArray<WriteBarrier<FunctionExecutable>>(unlinkedCodeBlock->numberOfFunctionDecls());
</span><span class="cx"> for (size_t count = unlinkedCodeBlock->numberOfFunctionDecls(), i = 0; i < count; ++i) {
</span><span class="cx"> UnlinkedFunctionExecutable* unlinkedExecutable = unlinkedCodeBlock->functionDecl(i);
</span><del>- if (vm.typeProfiler() || vm.controlFlowProfiler())
</del><ins>+ if (shouldUpdateFunctionHasExecutedCache)
</ins><span class="cx"> vm.functionHasExecutedCache()->insertUnexecutedRange(ownerExecutable->sourceID(), unlinkedExecutable->typeProfilingStartOffset(), unlinkedExecutable->typeProfilingEndOffset());
</span><span class="cx"> m_functionDecls[i].set(*m_vm, this, unlinkedExecutable->link(*m_vm, ownerExecutable->source()));
</span><span class="cx"> }
</span><span class="lines">@@ -1909,7 +1917,7 @@
</span><span class="cx"> m_functionExprs = RefCountedArray<WriteBarrier<FunctionExecutable>>(unlinkedCodeBlock->numberOfFunctionExprs());
</span><span class="cx"> for (size_t count = unlinkedCodeBlock->numberOfFunctionExprs(), i = 0; i < count; ++i) {
</span><span class="cx"> UnlinkedFunctionExecutable* unlinkedExecutable = unlinkedCodeBlock->functionExpr(i);
</span><del>- if (vm.typeProfiler() || vm.controlFlowProfiler())
</del><ins>+ if (shouldUpdateFunctionHasExecutedCache)
</ins><span class="cx"> vm.functionHasExecutedCache()->insertUnexecutedRange(ownerExecutable->sourceID(), unlinkedExecutable->typeProfilingStartOffset(), unlinkedExecutable->typeProfilingEndOffset());
</span><span class="cx"> m_functionExprs[i].set(*m_vm, this, unlinkedExecutable->link(*m_vm, ownerExecutable->source()));
</span><span class="cx"> }
</span><span class="lines">@@ -2081,11 +2089,13 @@
</span><span class="cx"> case op_get_array_length:
</span><span class="cx"> CRASH();
</span><span class="cx">
</span><ins>+#if !ASSERT_DISABLED
</ins><span class="cx"> case op_create_lexical_environment: {
</span><span class="cx"> int symbolTableIndex = pc[3].u.operand;
</span><del>- RELEASE_ASSERT(clonedConstantSymbolTables.contains(symbolTableIndex));
</del><ins>+ ASSERT(clonedConstantSymbolTables.contains(symbolTableIndex));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> case op_resolve_scope: {
</span><span class="cx"> const Identifier& ident = identifier(pc[3].u.operand);
</span><span class="lines">@@ -2150,12 +2160,12 @@
</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>- RELEASE_ASSERT(clonedConstantSymbolTables.contains(symbolTableIndex));
</del><ins>+ ASSERT(clonedConstantSymbolTables.contains(symbolTableIndex));
</ins><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="cx"> auto iter = symbolTable->find(locker, ident.impl());
</span><del>- RELEASE_ASSERT(iter != symbolTable->end(locker));
</del><ins>+ ASSERT(iter != symbolTable->end(locker));
</ins><span class="cx"> iter->value.prepareToWatch();
</span><span class="cx"> instructions[i + 5].u.watchpointSet = iter->value.watchpointSet();
</span><span class="cx"> } else
</span><span class="lines">@@ -2221,7 +2231,7 @@
</span><span class="cx"> }
</span><span class="cx"> case ProfileTypeBytecodeLocallyResolved: {
</span><span class="cx"> int symbolTableIndex = pc[2].u.operand;
</span><del>- RELEASE_ASSERT(clonedConstantSymbolTables.contains(symbolTableIndex));
</del><ins>+ ASSERT(clonedConstantSymbolTables.contains(symbolTableIndex));
</ins><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></pre>
</div>
</div>
</body>
</html>