<!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>[173797] 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/173797">173797</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-09-21 12:18:40 -0700 (Sun, 21 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Structure::getConcurrently() doesn't need to take a VM& argument.
Rubber stamped by Dan Bernstein.
Removed the extra argument, and then removed similar arguments from other methods until
I could build successfully again. It turned out that many methods took a VM& argument
just for calling getConcurrently().
* bytecode/CodeBlock.cpp:
(JSC::dumpStructure):
(JSC::dumpChain):
(JSC::CodeBlock::printGetByIdCacheStatus):
(JSC::CodeBlock::printPutByIdCacheStatus):
* bytecode/ComplexGetStatus.cpp:
(JSC::ComplexGetStatus::computeFor):
* bytecode/GetByIdStatus.cpp:
(JSC::GetByIdStatus::computeFromLLInt):
(JSC::GetByIdStatus::computeForStubInfo):
(JSC::GetByIdStatus::computeFor):
* bytecode/GetByIdStatus.h:
* bytecode/PutByIdStatus.cpp:
(JSC::PutByIdStatus::computeFromLLInt):
(JSC::PutByIdStatus::computeForStubInfo):
(JSC::PutByIdStatus::computeFor):
* bytecode/PutByIdStatus.h:
* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::parseBlock):
* dfg/DFGConstantFoldingPhase.cpp:
(JSC::DFG::ConstantFoldingPhase::foldConstants):
* dfg/DFGFixupPhase.cpp:
(JSC::DFG::FixupPhase::isStringPrototypeMethodSane):
* runtime/IntendedStructureChain.cpp:
(JSC::IntendedStructureChain::mayInterceptStoreTo):
* runtime/IntendedStructureChain.h:
* runtime/Structure.cpp:
(JSC::Structure::getConcurrently):
* runtime/Structure.h:
* runtime/StructureInlines.h:
(JSC::Structure::getConcurrently):</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="#trunkSourceJavaScriptCorebytecodeComplexGetStatuscpp">trunk/Source/JavaScriptCore/bytecode/ComplexGetStatus.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeGetByIdStatuscpp">trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeGetByIdStatush">trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodePutByIdStatuscpp">trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodePutByIdStatush">trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGConstantFoldingPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGFixupPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntendedStructureChaincpp">trunk/Source/JavaScriptCore/runtime/IntendedStructureChain.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntendedStructureChainh">trunk/Source/JavaScriptCore/runtime/IntendedStructureChain.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStructurecpp">trunk/Source/JavaScriptCore/runtime/Structure.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStructureh">trunk/Source/JavaScriptCore/runtime/Structure.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStructureInlinesh">trunk/Source/JavaScriptCore/runtime/StructureInlines.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (173796 => 173797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-09-21 18:26:18 UTC (rev 173796)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-09-21 19:18:40 UTC (rev 173797)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2014-09-21 Filip Pizlo <fpizlo@apple.com>
+
+ Structure::getConcurrently() doesn't need to take a VM& argument.
+
+ Rubber stamped by Dan Bernstein.
+
+ Removed the extra argument, and then removed similar arguments from other methods until
+ I could build successfully again. It turned out that many methods took a VM& argument
+ just for calling getConcurrently().
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::dumpStructure):
+ (JSC::dumpChain):
+ (JSC::CodeBlock::printGetByIdCacheStatus):
+ (JSC::CodeBlock::printPutByIdCacheStatus):
+ * bytecode/ComplexGetStatus.cpp:
+ (JSC::ComplexGetStatus::computeFor):
+ * bytecode/GetByIdStatus.cpp:
+ (JSC::GetByIdStatus::computeFromLLInt):
+ (JSC::GetByIdStatus::computeForStubInfo):
+ (JSC::GetByIdStatus::computeFor):
+ * bytecode/GetByIdStatus.h:
+ * bytecode/PutByIdStatus.cpp:
+ (JSC::PutByIdStatus::computeFromLLInt):
+ (JSC::PutByIdStatus::computeForStubInfo):
+ (JSC::PutByIdStatus::computeFor):
+ * bytecode/PutByIdStatus.h:
+ * dfg/DFGAbstractInterpreterInlines.h:
+ (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::parseBlock):
+ * dfg/DFGConstantFoldingPhase.cpp:
+ (JSC::DFG::ConstantFoldingPhase::foldConstants):
+ * dfg/DFGFixupPhase.cpp:
+ (JSC::DFG::FixupPhase::isStringPrototypeMethodSane):
+ * runtime/IntendedStructureChain.cpp:
+ (JSC::IntendedStructureChain::mayInterceptStoreTo):
+ * runtime/IntendedStructureChain.h:
+ * runtime/Structure.cpp:
+ (JSC::Structure::getConcurrently):
+ * runtime/Structure.h:
+ * runtime/StructureInlines.h:
+ (JSC::Structure::getConcurrently):
+
</ins><span class="cx"> 2014-09-20 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> FTL OSRExit construction should be based on methods that return ExitValues rather than methods that add ExitValues to OSRExit
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (173796 => 173797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-09-21 18:26:18 UTC (rev 173796)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-09-21 19:18:40 UTC (rev 173797)
</span><span class="lines">@@ -291,19 +291,19 @@
</span><span class="cx"> it += 4; // Increment up to the value profiler.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void dumpStructure(PrintStream& out, const char* name, ExecState* exec, Structure* structure, const Identifier& ident)
</del><ins>+static void dumpStructure(PrintStream& out, const char* name, Structure* structure, const Identifier& ident)
</ins><span class="cx"> {
</span><span class="cx"> if (!structure)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> out.printf("%s = %p", name, structure);
</span><span class="cx">
</span><del>- PropertyOffset offset = structure->getConcurrently(exec->vm(), ident.impl());
</del><ins>+ PropertyOffset offset = structure->getConcurrently(ident.impl());
</ins><span class="cx"> if (offset != invalidOffset)
</span><span class="cx"> out.printf(" (offset = %d)", offset);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void dumpChain(PrintStream& out, ExecState* exec, StructureChain* chain, const Identifier& ident)
</del><ins>+static void dumpChain(PrintStream& out, StructureChain* chain, const Identifier& ident)
</ins><span class="cx"> {
</span><span class="cx"> out.printf("chain = %p: [", chain);
</span><span class="cx"> bool first = true;
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx"> first = false;
</span><span class="cx"> else
</span><span class="cx"> out.printf(", ");
</span><del>- dumpStructure(out, "struct", exec, currentStructure->get(), ident);
</del><ins>+ dumpStructure(out, "struct", currentStructure->get(), ident);
</ins><span class="cx"> }
</span><span class="cx"> out.printf("]");
</span><span class="cx"> }
</span><span class="lines">@@ -331,7 +331,7 @@
</span><span class="cx"> out.printf(" llint(array_length)");
</span><span class="cx"> else if (Structure* structure = instruction[4].u.structure.get()) {
</span><span class="cx"> out.printf(" llint(");
</span><del>- dumpStructure(out, "struct", exec, structure, ident);
</del><ins>+ dumpStructure(out, "struct", structure, ident);
</ins><span class="cx"> out.printf(")");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -368,17 +368,17 @@
</span><span class="cx">
</span><span class="cx"> if (baseStructure) {
</span><span class="cx"> out.printf(", ");
</span><del>- dumpStructure(out, "struct", exec, baseStructure, ident);
</del><ins>+ dumpStructure(out, "struct", baseStructure, ident);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (prototypeStructure) {
</span><span class="cx"> out.printf(", ");
</span><del>- dumpStructure(out, "prototypeStruct", exec, baseStructure, ident);
</del><ins>+ dumpStructure(out, "prototypeStruct", baseStructure, ident);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (chain) {
</span><span class="cx"> out.printf(", ");
</span><del>- dumpChain(out, exec, chain, ident);
</del><ins>+ dumpChain(out, chain, ident);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (list) {
</span><span class="lines">@@ -387,10 +387,10 @@
</span><span class="cx"> if (i)
</span><span class="cx"> out.printf(", ");
</span><span class="cx"> out.printf("(");
</span><del>- dumpStructure(out, "base", exec, list->at(i).structure(), ident);
</del><ins>+ dumpStructure(out, "base", list->at(i).structure(), ident);
</ins><span class="cx"> if (list->at(i).chain()) {
</span><span class="cx"> out.printf(", ");
</span><del>- dumpChain(out, exec, list->at(i).chain(), ident);
</del><ins>+ dumpChain(out, list->at(i).chain(), ident);
</ins><span class="cx"> }
</span><span class="cx"> out.printf(")");
</span><span class="cx"> }
</span><span class="lines">@@ -417,7 +417,7 @@
</span><span class="cx"> case op_put_by_id:
</span><span class="cx"> case op_put_by_id_out_of_line:
</span><span class="cx"> out.print(" llint(");
</span><del>- dumpStructure(out, "struct", exec, structure, ident);
</del><ins>+ dumpStructure(out, "struct", structure, ident);
</ins><span class="cx"> out.print(")");
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -426,12 +426,12 @@
</span><span class="cx"> case op_put_by_id_transition_direct_out_of_line:
</span><span class="cx"> case op_put_by_id_transition_normal_out_of_line:
</span><span class="cx"> out.print(" llint(");
</span><del>- dumpStructure(out, "prev", exec, structure, ident);
</del><ins>+ dumpStructure(out, "prev", structure, ident);
</ins><span class="cx"> out.print(", ");
</span><del>- dumpStructure(out, "next", exec, instruction[6].u.structure.get(), ident);
</del><ins>+ dumpStructure(out, "next", instruction[6].u.structure.get(), ident);
</ins><span class="cx"> if (StructureChain* chain = instruction[7].u.structureChain.get()) {
</span><span class="cx"> out.print(", ");
</span><del>- dumpChain(out, exec, chain, ident);
</del><ins>+ dumpChain(out, chain, ident);
</ins><span class="cx"> }
</span><span class="cx"> out.print(")");
</span><span class="cx"> break;
</span><span class="lines">@@ -454,17 +454,17 @@
</span><span class="cx"> switch (stubInfo.accessType) {
</span><span class="cx"> case access_put_by_id_replace:
</span><span class="cx"> out.print("replace, ");
</span><del>- dumpStructure(out, "struct", exec, stubInfo.u.putByIdReplace.baseObjectStructure.get(), ident);
</del><ins>+ dumpStructure(out, "struct", stubInfo.u.putByIdReplace.baseObjectStructure.get(), ident);
</ins><span class="cx"> break;
</span><span class="cx"> case access_put_by_id_transition_normal:
</span><span class="cx"> case access_put_by_id_transition_direct:
</span><span class="cx"> out.print("transition, ");
</span><del>- dumpStructure(out, "prev", exec, stubInfo.u.putByIdTransition.previousStructure.get(), ident);
</del><ins>+ dumpStructure(out, "prev", stubInfo.u.putByIdTransition.previousStructure.get(), ident);
</ins><span class="cx"> out.print(", ");
</span><del>- dumpStructure(out, "next", exec, stubInfo.u.putByIdTransition.structure.get(), ident);
</del><ins>+ dumpStructure(out, "next", stubInfo.u.putByIdTransition.structure.get(), ident);
</ins><span class="cx"> if (StructureChain* chain = stubInfo.u.putByIdTransition.chain.get()) {
</span><span class="cx"> out.print(", ");
</span><del>- dumpChain(out, exec, chain, ident);
</del><ins>+ dumpChain(out, chain, ident);
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case access_put_by_id_list: {
</span><span class="lines">@@ -477,21 +477,21 @@
</span><span class="cx">
</span><span class="cx"> if (access.isReplace()) {
</span><span class="cx"> out.print("replace, ");
</span><del>- dumpStructure(out, "struct", exec, access.oldStructure(), ident);
</del><ins>+ dumpStructure(out, "struct", access.oldStructure(), ident);
</ins><span class="cx"> } else if (access.isSetter()) {
</span><span class="cx"> out.print("setter, ");
</span><del>- dumpStructure(out, "struct", exec, access.oldStructure(), ident);
</del><ins>+ dumpStructure(out, "struct", access.oldStructure(), ident);
</ins><span class="cx"> } else if (access.isCustom()) {
</span><span class="cx"> out.print("custom, ");
</span><del>- dumpStructure(out, "struct", exec, access.oldStructure(), ident);
</del><ins>+ dumpStructure(out, "struct", access.oldStructure(), ident);
</ins><span class="cx"> } else if (access.isTransition()) {
</span><span class="cx"> out.print("transition, ");
</span><del>- dumpStructure(out, "prev", exec, access.oldStructure(), ident);
</del><ins>+ dumpStructure(out, "prev", access.oldStructure(), ident);
</ins><span class="cx"> out.print(", ");
</span><del>- dumpStructure(out, "next", exec, access.newStructure(), ident);
</del><ins>+ dumpStructure(out, "next", access.newStructure(), ident);
</ins><span class="cx"> if (access.chain()) {
</span><span class="cx"> out.print(", ");
</span><del>- dumpChain(out, exec, access.chain(), ident);
</del><ins>+ dumpChain(out, access.chain(), ident);
</ins><span class="cx"> }
</span><span class="cx"> } else
</span><span class="cx"> out.print("unknown");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeComplexGetStatuscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/ComplexGetStatus.cpp (173796 => 173797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/ComplexGetStatus.cpp 2014-09-21 18:26:18 UTC (rev 173796)
+++ trunk/Source/JavaScriptCore/bytecode/ComplexGetStatus.cpp 2014-09-21 19:18:40 UTC (rev 173797)
</span><span class="lines">@@ -62,11 +62,9 @@
</span><span class="cx">
</span><span class="cx"> ASSERT_UNUSED(currentObject, currentObject);
</span><span class="cx">
</span><del>- result.m_offset = currentStructure->getConcurrently(
- *profiledBlock->vm(), uid, result.m_attributes);
</del><ins>+ result.m_offset = currentStructure->getConcurrently(uid, result.m_attributes);
</ins><span class="cx"> } else {
</span><del>- result.m_offset = headStructure->getConcurrently(
- *profiledBlock->vm(), uid, result.m_attributes);
</del><ins>+ result.m_offset = headStructure->getConcurrently(uid, result.m_attributes);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!isValidOffset(result.m_offset))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeGetByIdStatuscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp (173796 => 173797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp 2014-09-21 18:26:18 UTC (rev 173796)
+++ trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp 2014-09-21 19:18:40 UTC (rev 173797)
</span><span class="lines">@@ -84,8 +84,7 @@
</span><span class="cx"> return GetByIdStatus(NoInformation, false);
</span><span class="cx">
</span><span class="cx"> unsigned attributesIgnored;
</span><del>- PropertyOffset offset = structure->getConcurrently(
- *profiledBlock->vm(), uid, attributesIgnored);
</del><ins>+ PropertyOffset offset = structure->getConcurrently(uid, attributesIgnored);
</ins><span class="cx"> if (!isValidOffset(offset))
</span><span class="cx"> return GetByIdStatus(NoInformation, false);
</span><span class="cx">
</span><span class="lines">@@ -150,8 +149,7 @@
</span><span class="cx"> return GetByIdStatus(slowPathState, true);
</span><span class="cx"> unsigned attributesIgnored;
</span><span class="cx"> GetByIdVariant variant;
</span><del>- variant.m_offset = structure->getConcurrently(
- *profiledBlock->vm(), uid, attributesIgnored);
</del><ins>+ variant.m_offset = structure->getConcurrently(uid, attributesIgnored);
</ins><span class="cx"> if (!isValidOffset(variant.m_offset))
</span><span class="cx"> return GetByIdStatus(slowPathState, true);
</span><span class="cx">
</span><span class="lines">@@ -263,7 +261,7 @@
</span><span class="cx"> return computeFor(profiledBlock, baselineMap, codeOrigin.bytecodeIndex, uid);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GetByIdStatus GetByIdStatus::computeFor(VM& vm, const StructureSet& set, StringImpl* uid)
</del><ins>+GetByIdStatus GetByIdStatus::computeFor(const StructureSet& set, StringImpl* uid)
</ins><span class="cx"> {
</span><span class="cx"> // For now we only handle the super simple self access case. We could handle the
</span><span class="cx"> // prototype case in the future.
</span><span class="lines">@@ -286,7 +284,7 @@
</span><span class="cx"> return GetByIdStatus(TakesSlowPath);
</span><span class="cx">
</span><span class="cx"> unsigned attributes;
</span><del>- PropertyOffset offset = structure->getConcurrently(vm, uid, attributes);
</del><ins>+ PropertyOffset offset = structure->getConcurrently(uid, attributes);
</ins><span class="cx"> if (!isValidOffset(offset))
</span><span class="cx"> return GetByIdStatus(TakesSlowPath); // It's probably a prototype lookup. Give up on life for now, even though we could totally be way smarter about it.
</span><span class="cx"> if (attributes & Accessor)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeGetByIdStatush"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.h (173796 => 173797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.h 2014-09-21 18:26:18 UTC (rev 173796)
+++ trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.h 2014-09-21 19:18:40 UTC (rev 173797)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static GetByIdStatus computeFor(CodeBlock*, StubInfoMap&, unsigned bytecodeIndex, StringImpl* uid);
</span><del>- static GetByIdStatus computeFor(VM&, const StructureSet&, StringImpl* uid);
</del><ins>+ static GetByIdStatus computeFor(const StructureSet&, StringImpl* uid);
</ins><span class="cx">
</span><span class="cx"> static GetByIdStatus computeFor(CodeBlock* baselineBlock, CodeBlock* dfgBlock, StubInfoMap& baselineMap, StubInfoMap& dfgMap, CodeOrigin, StringImpl* uid);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodePutByIdStatuscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp (173796 => 173797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp 2014-09-21 18:26:18 UTC (rev 173796)
+++ trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp 2014-09-21 19:18:40 UTC (rev 173797)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx">
</span><span class="cx"> if (instruction[0].u.opcode == LLInt::getOpcode(op_put_by_id)
</span><span class="cx"> || instruction[0].u.opcode == LLInt::getOpcode(op_put_by_id_out_of_line)) {
</span><del>- PropertyOffset offset = structure->getConcurrently(*profiledBlock->vm(), uid);
</del><ins>+ PropertyOffset offset = structure->getConcurrently(uid);
</ins><span class="cx"> if (!isValidOffset(offset))
</span><span class="cx"> return PutByIdStatus(NoInformation);
</span><span class="cx">
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> ASSERT(newStructure);
</span><span class="cx"> ASSERT(chain);
</span><span class="cx">
</span><del>- PropertyOffset offset = newStructure->getConcurrently(*profiledBlock->vm(), uid);
</del><ins>+ PropertyOffset offset = newStructure->getConcurrently(uid);
</ins><span class="cx"> if (!isValidOffset(offset))
</span><span class="cx"> return PutByIdStatus(NoInformation);
</span><span class="cx">
</span><span class="lines">@@ -146,8 +146,7 @@
</span><span class="cx">
</span><span class="cx"> case access_put_by_id_replace: {
</span><span class="cx"> PropertyOffset offset =
</span><del>- stubInfo->u.putByIdReplace.baseObjectStructure->getConcurrently(
- *profiledBlock->vm(), uid);
</del><ins>+ stubInfo->u.putByIdReplace.baseObjectStructure->getConcurrently(uid);
</ins><span class="cx"> if (isValidOffset(offset)) {
</span><span class="cx"> return PutByIdVariant::replace(
</span><span class="cx"> stubInfo->u.putByIdReplace.baseObjectStructure.get(), offset);
</span><span class="lines">@@ -159,8 +158,7 @@
</span><span class="cx"> case access_put_by_id_transition_direct: {
</span><span class="cx"> ASSERT(stubInfo->u.putByIdTransition.previousStructure->transitionWatchpointSetHasBeenInvalidated());
</span><span class="cx"> PropertyOffset offset =
</span><del>- stubInfo->u.putByIdTransition.structure->getConcurrently(
- *profiledBlock->vm(), uid);
</del><ins>+ stubInfo->u.putByIdTransition.structure->getConcurrently(uid);
</ins><span class="cx"> if (isValidOffset(offset)) {
</span><span class="cx"> RefPtr<IntendedStructureChain> chain;
</span><span class="cx"> if (stubInfo->u.putByIdTransition.chain) {
</span><span class="lines">@@ -204,7 +202,7 @@
</span><span class="cx"> switch (access.type()) {
</span><span class="cx"> case PutByIdAccess::Replace: {
</span><span class="cx"> Structure* structure = access.structure();
</span><del>- PropertyOffset offset = structure->getConcurrently(*profiledBlock->vm(), uid);
</del><ins>+ PropertyOffset offset = structure->getConcurrently(uid);
</ins><span class="cx"> if (!isValidOffset(offset))
</span><span class="cx"> return PutByIdStatus(slowPathState);
</span><span class="cx"> variant = PutByIdVariant::replace(structure, offset);
</span><span class="lines">@@ -213,7 +211,7 @@
</span><span class="cx">
</span><span class="cx"> case PutByIdAccess::Transition: {
</span><span class="cx"> PropertyOffset offset =
</span><del>- access.newStructure()->getConcurrently(*profiledBlock->vm(), uid);
</del><ins>+ access.newStructure()->getConcurrently(uid);
</ins><span class="cx"> if (!isValidOffset(offset))
</span><span class="cx"> return PutByIdStatus(slowPathState);
</span><span class="cx"> RefPtr<IntendedStructureChain> chain;
</span><span class="lines">@@ -310,7 +308,7 @@
</span><span class="cx"> return computeFor(baselineBlock, baselineMap, codeOrigin.bytecodeIndex, uid);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PutByIdStatus PutByIdStatus::computeFor(VM& vm, JSGlobalObject* globalObject, const StructureSet& set, StringImpl* uid, bool isDirect)
</del><ins>+PutByIdStatus PutByIdStatus::computeFor(JSGlobalObject* globalObject, const StructureSet& set, StringImpl* uid, bool isDirect)
</ins><span class="cx"> {
</span><span class="cx"> if (toUInt32FromStringImpl(uid) != PropertyName::NotAnIndex)
</span><span class="cx"> return PutByIdStatus(TakesSlowPath);
</span><span class="lines">@@ -330,7 +328,7 @@
</span><span class="cx"> return PutByIdStatus(TakesSlowPath);
</span><span class="cx">
</span><span class="cx"> unsigned attributes;
</span><del>- PropertyOffset offset = structure->getConcurrently(vm, uid, attributes);
</del><ins>+ PropertyOffset offset = structure->getConcurrently(uid, attributes);
</ins><span class="cx"> if (isValidOffset(offset)) {
</span><span class="cx"> if (attributes & CustomAccessor)
</span><span class="cx"> return PutByIdStatus(MakesCalls);
</span><span class="lines">@@ -370,7 +368,7 @@
</span><span class="cx"> chain = adoptRef(new IntendedStructureChain(globalObject, structure));
</span><span class="cx">
</span><span class="cx"> // If the prototype chain has setters or read-only properties, then give up.
</span><del>- if (chain->mayInterceptStoreTo(vm, uid))
</del><ins>+ if (chain->mayInterceptStoreTo(uid))
</ins><span class="cx"> return PutByIdStatus(TakesSlowPath);
</span><span class="cx">
</span><span class="cx"> // If the prototype chain hasn't been normalized (i.e. there are proxies or dictionaries)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodePutByIdStatush"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.h (173796 => 173797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.h 2014-09-21 18:26:18 UTC (rev 173796)
+++ trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.h 2014-09-21 19:18:40 UTC (rev 173797)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static PutByIdStatus computeFor(CodeBlock*, StubInfoMap&, unsigned bytecodeIndex, StringImpl* uid);
</span><del>- static PutByIdStatus computeFor(VM&, JSGlobalObject*, const StructureSet&, StringImpl* uid, bool isDirect);
</del><ins>+ static PutByIdStatus computeFor(JSGlobalObject*, const StructureSet&, StringImpl* uid, bool isDirect);
</ins><span class="cx">
</span><span class="cx"> static PutByIdStatus computeFor(CodeBlock* baselineBlock, CodeBlock* dfgBlock, StubInfoMap& baselineMap, StubInfoMap& dfgMap, CodeOrigin, StringImpl* uid);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (173796 => 173797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2014-09-21 18:26:18 UTC (rev 173796)
+++ trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2014-09-21 19:18:40 UTC (rev 173797)
</span><span class="lines">@@ -1422,8 +1422,7 @@
</span><span class="cx"> if (!value.m_structure.isTop() && !value.m_structure.isClobbered()
</span><span class="cx"> && (node->child1().useKind() == CellUse || !(value.m_type & ~SpecCell))) {
</span><span class="cx"> GetByIdStatus status = GetByIdStatus::computeFor(
</span><del>- m_graph.m_vm, value.m_structure.set(),
- m_graph.identifiers()[node->identifierNumber()]);
</del><ins>+ value.m_structure.set(), m_graph.identifiers()[node->identifierNumber()]);
</ins><span class="cx"> if (status.isSimple()) {
</span><span class="cx"> // Figure out what the result is going to be - is it TOP, a constant, or maybe
</span><span class="cx"> // something more subtle?
</span><span class="lines">@@ -1761,7 +1760,6 @@
</span><span class="cx"> AbstractValue& value = forNode(node->child1());
</span><span class="cx"> if (!value.m_structure.isTop() && !value.m_structure.isClobbered()) {
</span><span class="cx"> PutByIdStatus status = PutByIdStatus::computeFor(
</span><del>- m_graph.m_vm,
</del><span class="cx"> m_graph.globalObjectFor(node->origin.semantic),
</span><span class="cx"> value.m_structure.set(),
</span><span class="cx"> m_graph.identifiers()[node->identifierNumber()],
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (173796 => 173797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-09-21 18:26:18 UTC (rev 173796)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-09-21 19:18:40 UTC (rev 173797)
</span><span class="lines">@@ -3236,7 +3236,7 @@
</span><span class="cx"> case GlobalProperty:
</span><span class="cx"> case GlobalPropertyWithVarInjectionChecks: {
</span><span class="cx"> SpeculatedType prediction = getPrediction();
</span><del>- GetByIdStatus status = GetByIdStatus::computeFor(*m_vm, structure, uid);
</del><ins>+ GetByIdStatus status = GetByIdStatus::computeFor(structure, uid);
</ins><span class="cx"> if (status.state() != GetByIdStatus::Simple
</span><span class="cx"> || status.numVariants() != 1
</span><span class="cx"> || status[0].structureSet().size() != 1) {
</span><span class="lines">@@ -3320,7 +3320,7 @@
</span><span class="cx"> switch (resolveType) {
</span><span class="cx"> case GlobalProperty:
</span><span class="cx"> case GlobalPropertyWithVarInjectionChecks: {
</span><del>- PutByIdStatus status = PutByIdStatus::computeFor(*m_vm, globalObject, structure, uid, false);
</del><ins>+ PutByIdStatus status = PutByIdStatus::computeFor(globalObject, structure, uid, false);
</ins><span class="cx"> if (status.numVariants() != 1
</span><span class="cx"> || status[0].kind() != PutByIdVariant::Replace
</span><span class="cx"> || status[0].structure().size() != 1) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGConstantFoldingPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp (173796 => 173797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp 2014-09-21 18:26:18 UTC (rev 173796)
+++ trunk/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp 2014-09-21 19:18:40 UTC (rev 173797)
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> GetByIdStatus status = GetByIdStatus::computeFor(
</span><del>- vm(), baseValue.m_structure.set(), m_graph.identifiers()[identifierNumber]);
</del><ins>+ baseValue.m_structure.set(), m_graph.identifiers()[identifierNumber]);
</ins><span class="cx"> if (!status.isSimple())
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -300,7 +300,6 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> PutByIdStatus status = PutByIdStatus::computeFor(
</span><del>- vm(),
</del><span class="cx"> m_graph.globalObjectFor(origin.semantic),
</span><span class="cx"> baseValue.m_structure.set(),
</span><span class="cx"> m_graph.identifiers()[identifierNumber],
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (173796 => 173797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2014-09-21 18:26:18 UTC (rev 173796)
+++ trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2014-09-21 19:18:40 UTC (rev 173797)
</span><span class="lines">@@ -1372,7 +1372,7 @@
</span><span class="cx"> {
</span><span class="cx"> unsigned attributesUnused;
</span><span class="cx"> PropertyOffset offset =
</span><del>- stringPrototypeStructure->getConcurrently(vm(), uid, attributesUnused);
</del><ins>+ stringPrototypeStructure->getConcurrently(uid, attributesUnused);
</ins><span class="cx"> if (!isValidOffset(offset))
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntendedStructureChaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntendedStructureChain.cpp (173796 => 173797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntendedStructureChain.cpp 2014-09-21 18:26:18 UTC (rev 173796)
+++ trunk/Source/JavaScriptCore/runtime/IntendedStructureChain.cpp 2014-09-21 19:18:40 UTC (rev 173797)
</span><span class="lines">@@ -103,11 +103,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool IntendedStructureChain::mayInterceptStoreTo(VM& vm, StringImpl* uid)
</del><ins>+bool IntendedStructureChain::mayInterceptStoreTo(StringImpl* uid)
</ins><span class="cx"> {
</span><span class="cx"> for (unsigned i = 0; i < m_vector.size(); ++i) {
</span><span class="cx"> unsigned attributes;
</span><del>- PropertyOffset offset = m_vector[i]->getConcurrently(vm, uid, attributes);
</del><ins>+ PropertyOffset offset = m_vector[i]->getConcurrently(uid, attributes);
</ins><span class="cx"> if (!isValidOffset(offset))
</span><span class="cx"> continue;
</span><span class="cx"> if (attributes & (ReadOnly | Accessor))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntendedStructureChainh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntendedStructureChain.h (173796 => 173797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntendedStructureChain.h 2014-09-21 18:26:18 UTC (rev 173796)
+++ trunk/Source/JavaScriptCore/runtime/IntendedStructureChain.h 2014-09-21 19:18:40 UTC (rev 173797)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> bool isStillValid() const;
</span><span class="cx"> bool matches(StructureChain*) const;
</span><del>- bool mayInterceptStoreTo(VM&, StringImpl* uid);
</del><ins>+ bool mayInterceptStoreTo(StringImpl* uid);
</ins><span class="cx"> bool isNormalized();
</span><span class="cx">
</span><span class="cx"> bool takesSlowPathInDFGForImpureProperty();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStructurecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Structure.cpp (173796 => 173797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Structure.cpp 2014-09-21 18:26:18 UTC (rev 173796)
+++ trunk/Source/JavaScriptCore/runtime/Structure.cpp 2014-09-21 19:18:40 UTC (rev 173797)
</span><span class="lines">@@ -850,7 +850,7 @@
</span><span class="cx"> return PropertyTable::create(vm, numberOfSlotsForLastOffset(m_offset, m_inlineCapacity));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PropertyOffset Structure::getConcurrently(VM&, StringImpl* uid, unsigned& attributes)
</del><ins>+PropertyOffset Structure::getConcurrently(StringImpl* uid, unsigned& attributes)
</ins><span class="cx"> {
</span><span class="cx"> Vector<Structure*, 8> structures;
</span><span class="cx"> Structure* structure;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStructureh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Structure.h (173796 => 173797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Structure.h 2014-09-21 18:26:18 UTC (rev 173796)
+++ trunk/Source/JavaScriptCore/runtime/Structure.h 2014-09-21 19:18:40 UTC (rev 173797)
</span><span class="lines">@@ -262,8 +262,8 @@
</span><span class="cx"> PropertyOffset get(VM&, PropertyName);
</span><span class="cx"> PropertyOffset get(VM&, PropertyName, unsigned& attributes);
</span><span class="cx">
</span><del>- PropertyOffset getConcurrently(VM&, StringImpl* uid);
- PropertyOffset getConcurrently(VM&, StringImpl* uid, unsigned& attributes);
</del><ins>+ PropertyOffset getConcurrently(StringImpl* uid);
+ PropertyOffset getConcurrently(StringImpl* uid, unsigned& attributes);
</ins><span class="cx">
</span><span class="cx"> void setHasGetterSetterPropertiesWithProtoCheck(bool is__proto__)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStructureInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StructureInlines.h (173796 => 173797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StructureInlines.h 2014-09-21 18:26:18 UTC (rev 173796)
+++ trunk/Source/JavaScriptCore/runtime/StructureInlines.h 2014-09-21 19:18:40 UTC (rev 173797)
</span><span class="lines">@@ -104,10 +104,10 @@
</span><span class="cx"> return entry->offset;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline PropertyOffset Structure::getConcurrently(VM& vm, StringImpl* uid)
</del><ins>+inline PropertyOffset Structure::getConcurrently(StringImpl* uid)
</ins><span class="cx"> {
</span><span class="cx"> unsigned attributesIgnored;
</span><del>- return getConcurrently(vm, uid, attributesIgnored);
</del><ins>+ return getConcurrently(uid, attributesIgnored);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool Structure::hasIndexingHeader(const JSCell* cell) const
</span></span></pre>
</div>
</div>
</body>
</html>