<!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>[201235] 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/201235">201235</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-05-20 17:17:30 -0700 (Fri, 20 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>JSScope::abstractAccess doesn't need to copy the SymbolTableEntry, it can use it by reference
https://bugs.webkit.org/show_bug.cgi?id=157956
Reviewed by Geoffrey Garen.
A SymbolTableEntry may be a FatEntry. Copying a FatEntry is slow because we have to
malloc memory for it, then free the malloced memory once the entry goes out of
scope. abstractAccess uses a SymbolTableEntry temporarily when performing scope
accesses during bytecode linking. It copies out the SymbolTableEntry every time
it does a SymbolTable lookup. This is not cheap when the entry happens to be a
FatEntry. We should really just be using a reference to the entry because
there is no need to copy it in such a scenario.
* runtime/JSScope.cpp:
(JSC::abstractAccess):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSScopecpp">trunk/Source/JavaScriptCore/runtime/JSScope.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (201234 => 201235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-05-20 23:56:34 UTC (rev 201234)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-05-21 00:17:30 UTC (rev 201235)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-05-20 Saam barati <sbarati@apple.com>
+
+ JSScope::abstractAccess doesn't need to copy the SymbolTableEntry, it can use it by reference
+ https://bugs.webkit.org/show_bug.cgi?id=157956
+
+ Reviewed by Geoffrey Garen.
+
+ A SymbolTableEntry may be a FatEntry. Copying a FatEntry is slow because we have to
+ malloc memory for it, then free the malloced memory once the entry goes out of
+ scope. abstractAccess uses a SymbolTableEntry temporarily when performing scope
+ accesses during bytecode linking. It copies out the SymbolTableEntry every time
+ it does a SymbolTable lookup. This is not cheap when the entry happens to be a
+ FatEntry. We should really just be using a reference to the entry because
+ there is no need to copy it in such a scenario.
+
+ * runtime/JSScope.cpp:
+ (JSC::abstractAccess):
+
</ins><span class="cx"> 2016-05-20 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: retained size for typed arrays does not count native backing store
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSScope.cpp (201234 => 201235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSScope.cpp 2016-05-20 23:56:34 UTC (rev 201234)
+++ trunk/Source/JavaScriptCore/runtime/JSScope.cpp 2016-05-21 00:17:30 UTC (rev 201235)
</span><span class="lines">@@ -56,19 +56,21 @@
</span><span class="cx"> op = ResolveOp(Dynamic, 0, 0, 0, 0, 0);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><ins>+ SymbolTable* symbolTable = lexicalEnvironment->symbolTable();
+ ConcurrentJITLocker locker(symbolTable->m_lock);
+ auto iter = symbolTable->find(locker, ident.impl());
+ if (iter != symbolTable->end(locker)) {
+ SymbolTableEntry& entry = iter->value;
+ ASSERT(!entry.isNull());
+ if (entry.isReadOnly() && getOrPut == Put) {
+ // We know the property will be at this lexical environment scope, but we don't know how to cache it.
+ op = ResolveOp(Dynamic, 0, 0, 0, 0, 0);
+ return true;
+ }
</ins><span class="cx">
</span><del>- SymbolTableEntry entry = lexicalEnvironment->symbolTable()->get(ident.impl());
- if (entry.isReadOnly() && getOrPut == Put) {
- // We know the property will be at this lexical environment scope, but we don't know how to cache it.
- op = ResolveOp(Dynamic, 0, 0, 0, 0, 0);
- return true;
- }
-
- if (!entry.isNull()) {
</del><span class="cx"> op = ResolveOp(makeType(ClosureVar, needsVarInjectionChecks), depth, 0, lexicalEnvironment, entry.watchpointSet(), entry.scopeOffset().offset());
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> if (scope->type() == ModuleEnvironmentType) {
</span><span class="cx"> JSModuleEnvironment* moduleEnvironment = jsCast<JSModuleEnvironment*>(scope);
</span><span class="cx"> JSModuleRecord* moduleRecord = moduleEnvironment->moduleRecord();
</span><span class="lines">@@ -76,22 +78,30 @@
</span><span class="cx"> if (resolution.type == JSModuleRecord::Resolution::Type::Resolved) {
</span><span class="cx"> JSModuleRecord* importedRecord = resolution.moduleRecord;
</span><span class="cx"> JSModuleEnvironment* importedEnvironment = importedRecord->moduleEnvironment();
</span><del>- SymbolTableEntry entry = importedEnvironment->symbolTable()->get(resolution.localName.impl());
</del><ins>+ SymbolTable* symbolTable = importedEnvironment->symbolTable();
+ ConcurrentJITLocker locker(symbolTable->m_lock);
+ auto iter = symbolTable->find(locker, resolution.localName.impl());
+ ASSERT(iter != symbolTable->end(locker));
+ SymbolTableEntry& entry = iter->value;
</ins><span class="cx"> ASSERT(!entry.isNull());
</span><span class="cx"> op = ResolveOp(makeType(ModuleVar, needsVarInjectionChecks), depth, 0, importedEnvironment, entry.watchpointSet(), entry.scopeOffset().offset(), resolution.localName.impl());
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (lexicalEnvironment->symbolTable()->usesNonStrictEval())
</del><ins>+ if (symbolTable->usesNonStrictEval())
</ins><span class="cx"> needsVarInjectionChecks = true;
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (scope->isGlobalLexicalEnvironment()) {
</span><span class="cx"> JSGlobalLexicalEnvironment* globalLexicalEnvironment = jsCast<JSGlobalLexicalEnvironment*>(scope);
</span><del>- SymbolTableEntry entry = globalLexicalEnvironment->symbolTable()->get(ident.impl());
- if (!entry.isNull()) {
</del><ins>+ SymbolTable* symbolTable = globalLexicalEnvironment->symbolTable();
+ ConcurrentJITLocker locker(symbolTable->m_lock);
+ auto iter = symbolTable->find(locker, ident.impl());
+ if (iter != symbolTable->end(locker)) {
+ SymbolTableEntry& entry = iter->value;
+ ASSERT(!entry.isNull());
</ins><span class="cx"> if (getOrPut == Put && entry.isReadOnly() && !isInitialization(initializationMode)) {
</span><span class="cx"> // We know the property will be at global lexical environment, but we don't know how to cache it.
</span><span class="cx"> op = ResolveOp(Dynamic, 0, 0, 0, 0, 0);
</span><span class="lines">@@ -118,18 +128,24 @@
</span><span class="cx">
</span><span class="cx"> if (scope->isGlobalObject()) {
</span><span class="cx"> JSGlobalObject* globalObject = jsCast<JSGlobalObject*>(scope);
</span><del>- SymbolTableEntry entry = globalObject->symbolTable()->get(ident.impl());
- if (!entry.isNull()) {
- if (getOrPut == Put && entry.isReadOnly()) {
- // We know the property will be at global scope, but we don't know how to cache it.
- op = ResolveOp(Dynamic, 0, 0, 0, 0, 0);
</del><ins>+ {
+ SymbolTable* symbolTable = globalObject->symbolTable();
+ ConcurrentJITLocker locker(symbolTable->m_lock);
+ auto iter = symbolTable->find(locker, ident.impl());
+ if (iter != symbolTable->end(locker)) {
+ SymbolTableEntry& entry = iter->value;
+ ASSERT(!entry.isNull());
+ if (getOrPut == Put && entry.isReadOnly()) {
+ // We know the property will be at global scope, but we don't know how to cache it.
+ op = ResolveOp(Dynamic, 0, 0, 0, 0, 0);
+ return true;
+ }
+
+ op = ResolveOp(
+ makeType(GlobalVar, needsVarInjectionChecks), depth, 0, 0, entry.watchpointSet(),
+ reinterpret_cast<uintptr_t>(globalObject->variableAt(entry.scopeOffset()).slot()));
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-
- op = ResolveOp(
- makeType(GlobalVar, needsVarInjectionChecks), depth, 0, 0, entry.watchpointSet(),
- reinterpret_cast<uintptr_t>(globalObject->variableAt(entry.scopeOffset()).slot()));
- return true;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PropertySlot slot(globalObject, PropertySlot::InternalMethodType::VMInquiry);
</span></span></pre>
</div>
</div>
</body>
</html>