<!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>[181482] 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/181482">181482</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-13 11:19:43 -0700 (Fri, 13 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>BytecodeGenerator needs to be re-entrant to support miranda functions
https://bugs.webkit.org/show_bug.cgi?id=142627
Reviewed by Filip Pizlo.
Made CodeCache::getGlobalCodeBlock and CodeCache::getFunctionExecutableFromGlobalCode re-entrant
by not keeping AddResult while invoking BytecodeGenerator::generate.
This is needed to support Miranda functions since they need to be lazily initialized.
* runtime/CodeCache.cpp:
(JSC::CodeCache::getGlobalCodeBlock):
(JSC::CodeCache::getFunctionExecutableFromGlobalCode):
* runtime/CodeCache.h:
(JSC::CodeCacheMap::findCacheAndUpdateAge): Extracted from add.
(JSC::CodeCacheMap::addCache): Extracted from add.
(JSC::CodeCacheMap::add): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCodeCachecpp">trunk/Source/JavaScriptCore/runtime/CodeCache.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCodeCacheh">trunk/Source/JavaScriptCore/runtime/CodeCache.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (181481 => 181482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-03-13 18:02:40 UTC (rev 181481)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-03-13 18:19:43 UTC (rev 181482)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-03-13 Ryosuke Niwa <rniwa@webkit.org>
+
+ BytecodeGenerator needs to be re-entrant to support miranda functions
+ https://bugs.webkit.org/show_bug.cgi?id=142627
+
+ Reviewed by Filip Pizlo.
+
+ Made CodeCache::getGlobalCodeBlock and CodeCache::getFunctionExecutableFromGlobalCode re-entrant
+ by not keeping AddResult while invoking BytecodeGenerator::generate.
+
+ This is needed to support Miranda functions since they need to be lazily initialized.
+
+ * runtime/CodeCache.cpp:
+ (JSC::CodeCache::getGlobalCodeBlock):
+ (JSC::CodeCache::getFunctionExecutableFromGlobalCode):
+ * runtime/CodeCache.h:
+ (JSC::CodeCacheMap::findCacheAndUpdateAge): Extracted from add.
+ (JSC::CodeCacheMap::addCache): Extracted from add.
+ (JSC::CodeCacheMap::add): Deleted.
+
</ins><span class="cx"> 2015-03-13 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Introduce WTF::Atomic to wrap std::atomic for a friendlier CAS.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCodeCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CodeCache.cpp (181481 => 181482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CodeCache.cpp 2015-03-13 18:02:40 UTC (rev 181481)
+++ trunk/Source/JavaScriptCore/runtime/CodeCache.cpp 2015-03-13 18:19:43 UTC (rev 181482)
</span><span class="lines">@@ -78,10 +78,10 @@
</span><span class="cx"> UnlinkedCodeBlockType* CodeCache::getGlobalCodeBlock(VM& vm, ExecutableType* executable, const SourceCode& source, JSParserStrictness strictness, DebuggerMode debuggerMode, ProfilerMode profilerMode, ParserError& error)
</span><span class="cx"> {
</span><span class="cx"> SourceCodeKey key = SourceCodeKey(source, String(), CacheTypes<UnlinkedCodeBlockType>::codeType, strictness);
</span><del>- CodeCacheMap::AddResult addResult = m_sourceCode.add(key, SourceCodeValue());
</del><ins>+ SourceCodeValue* cache = m_sourceCode.findCacheAndUpdateAge(key);
</ins><span class="cx"> bool canCache = debuggerMode == DebuggerOff && profilerMode == ProfilerOff && !vm.typeProfiler() && !vm.controlFlowProfiler();
</span><del>- if (!addResult.isNewEntry && canCache) {
- UnlinkedCodeBlockType* unlinkedCodeBlock = jsCast<UnlinkedCodeBlockType*>(addResult.iterator->value.cell.get());
</del><ins>+ if (cache && canCache) {
+ UnlinkedCodeBlockType* unlinkedCodeBlock = jsCast<UnlinkedCodeBlockType*>(cache->cell.get());
</ins><span class="cx"> unsigned firstLine = source.firstLine() + unlinkedCodeBlock->firstLine();
</span><span class="cx"> unsigned lineCount = unlinkedCodeBlock->lineCount();
</span><span class="cx"> unsigned startColumn = unlinkedCodeBlock->startColumn() + source.startColumn();
</span><span class="lines">@@ -93,10 +93,9 @@
</span><span class="cx">
</span><span class="cx"> typedef typename CacheTypes<UnlinkedCodeBlockType>::RootNode RootNode;
</span><span class="cx"> std::unique_ptr<RootNode> rootNode = parse<RootNode>(&vm, source, 0, Identifier(), strictness, JSParseProgramCode, error);
</span><del>- if (!rootNode) {
- m_sourceCode.remove(addResult.iterator);
- return 0;
- }
</del><ins>+ if (!rootNode)
+ return nullptr;
+
</ins><span class="cx"> unsigned lineCount = rootNode->lastLine() - rootNode->lineNo();
</span><span class="cx"> unsigned startColumn = rootNode->startColumn() + 1;
</span><span class="cx"> bool endColumnIsOnStartLine = !lineCount;
</span><span class="lines">@@ -109,17 +108,13 @@
</span><span class="cx">
</span><span class="cx"> auto generator = std::make_unique<BytecodeGenerator>(vm, rootNode.get(), unlinkedCodeBlock, debuggerMode, profilerMode);
</span><span class="cx"> error = generator->generate();
</span><del>- if (error.isValid()) {
- m_sourceCode.remove(addResult.iterator);
</del><ins>+ if (error.isValid())
</ins><span class="cx"> return nullptr;
</span><del>- }
</del><span class="cx">
</span><del>- if (!canCache) {
- m_sourceCode.remove(addResult.iterator);
</del><ins>+ if (!canCache)
</ins><span class="cx"> return unlinkedCodeBlock;
</span><del>- }
</del><span class="cx">
</span><del>- addResult.iterator->value = SourceCodeValue(vm, unlinkedCodeBlock, m_sourceCode.age());
</del><ins>+ m_sourceCode.addCache(key, SourceCodeValue(vm, unlinkedCodeBlock, m_sourceCode.age()));
</ins><span class="cx"> return unlinkedCodeBlock;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -136,15 +131,14 @@
</span><span class="cx"> UnlinkedFunctionExecutable* CodeCache::getFunctionExecutableFromGlobalCode(VM& vm, const Identifier& name, const SourceCode& source, ParserError& error)
</span><span class="cx"> {
</span><span class="cx"> SourceCodeKey key = SourceCodeKey(source, name.string(), SourceCodeKey::FunctionType, JSParseNormal);
</span><del>- CodeCacheMap::AddResult addResult = m_sourceCode.add(key, SourceCodeValue());
- if (!addResult.isNewEntry)
- return jsCast<UnlinkedFunctionExecutable*>(addResult.iterator->value.cell.get());
</del><ins>+ SourceCodeValue* cache = m_sourceCode.findCacheAndUpdateAge(key);
+ if (cache)
+ return jsCast<UnlinkedFunctionExecutable*>(cache->cell.get());
</ins><span class="cx">
</span><span class="cx"> JSTextPosition positionBeforeLastNewline;
</span><span class="cx"> std::unique_ptr<ProgramNode> program = parse<ProgramNode>(&vm, source, 0, Identifier(), JSParseNormal, JSParseProgramCode, error, &positionBeforeLastNewline);
</span><span class="cx"> if (!program) {
</span><span class="cx"> RELEASE_ASSERT(error.isValid());
</span><del>- m_sourceCode.remove(addResult.iterator);
</del><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -165,7 +159,7 @@
</span><span class="cx"> UnlinkedFunctionExecutable* functionExecutable = UnlinkedFunctionExecutable::create(&vm, source, body, UnlinkedNormalFunction);
</span><span class="cx"> functionExecutable->m_nameValue.set(vm, functionExecutable, jsString(&vm, name.string()));
</span><span class="cx">
</span><del>- addResult.iterator->value = SourceCodeValue(vm, functionExecutable, m_sourceCode.age());
</del><ins>+ m_sourceCode.addCache(key, SourceCodeValue(vm, functionExecutable, m_sourceCode.age()));
</ins><span class="cx"> return functionExecutable;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCodeCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CodeCache.h (181481 => 181482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CodeCache.h 2015-03-13 18:02:40 UTC (rev 181481)
+++ trunk/Source/JavaScriptCore/runtime/CodeCache.h 2015-03-13 18:19:43 UTC (rev 181482)
</span><span class="lines">@@ -144,18 +144,15 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- AddResult add(const SourceCodeKey& key, const SourceCodeValue& value)
</del><ins>+ SourceCodeValue* findCacheAndUpdateAge(const SourceCodeKey& key)
</ins><span class="cx"> {
</span><span class="cx"> prune();
</span><span class="cx">
</span><del>- AddResult addResult = m_map.add(key, value);
- if (addResult.isNewEntry) {
- m_size += key.length();
- m_age += key.length();
- return addResult;
- }
</del><ins>+ iterator findResult = m_map.find(key);
+ if (findResult == m_map.end())
+ return nullptr;
</ins><span class="cx">
</span><del>- int64_t age = m_age - addResult.iterator->value.age;
</del><ins>+ int64_t age = m_age - findResult->value.age;
</ins><span class="cx"> if (age > m_capacity) {
</span><span class="cx"> // A requested object is older than the cache's capacity. We can
</span><span class="cx"> // infer that requested objects are subject to high eviction probability,
</span><span class="lines">@@ -170,8 +167,21 @@
</span><span class="cx"> m_capacity = m_minCapacity;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- addResult.iterator->value.age = m_age;
</del><ins>+ findResult->value.age = m_age;
</ins><span class="cx"> m_age += key.length();
</span><ins>+
+ return &findResult->value;
+ }
+
+ AddResult addCache(const SourceCodeKey& key, const SourceCodeValue& value)
+ {
+ prune();
+
+ AddResult addResult = m_map.add(key, value);
+ ASSERT(addResult.isNewEntry);
+
+ m_size += key.length();
+ m_age += key.length();
</ins><span class="cx"> return addResult;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>