<!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>[159462] 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/159462">159462</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2013-11-18 15:19:53 -0800 (Mon, 18 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>put_to_scope[5] should not point to the structure if it's a variable access, but it should point to the WatchpointSet
https://bugs.webkit.org/show_bug.cgi?id=124539

Reviewed by Mark Hahnenberg.
        
This is in preparation for getting put_to_scope to directly invalidate the watchpoint set
on stores, which will allow us to run constant inference on all globals.

* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::CodeBlock):
(JSC::CodeBlock::finalizeUnconditionally):
* bytecode/Instruction.h:
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::parseBlock):
* runtime/JSScope.cpp:
(JSC::abstractAccess):
(JSC::JSScope::abstractResolve):
* runtime/JSScope.h:
(JSC::ResolveOp::ResolveOp):
* runtime/SymbolTable.h:
(JSC::SymbolTableEntry::watchpointSet):</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="#trunkSourceJavaScriptCorebytecodeInstructionh">trunk/Source/JavaScriptCore/bytecode/Instruction.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSScopecpp">trunk/Source/JavaScriptCore/runtime/JSScope.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSScopeh">trunk/Source/JavaScriptCore/runtime/JSScope.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeSymbolTableh">trunk/Source/JavaScriptCore/runtime/SymbolTable.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (159461 => 159462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2013-11-18 23:16:16 UTC (rev 159461)
+++ trunk/Source/JavaScriptCore/ChangeLog        2013-11-18 23:19:53 UTC (rev 159462)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2013-11-18  Filip Pizlo  &lt;fpizlo@apple.com&gt;
+
+        put_to_scope[5] should not point to the structure if it's a variable access, but it should point to the WatchpointSet
+        https://bugs.webkit.org/show_bug.cgi?id=124539
+
+        Reviewed by Mark Hahnenberg.
+        
+        This is in preparation for getting put_to_scope to directly invalidate the watchpoint set
+        on stores, which will allow us to run constant inference on all globals.
+
+        * bytecode/CodeBlock.cpp:
+        (JSC::CodeBlock::CodeBlock):
+        (JSC::CodeBlock::finalizeUnconditionally):
+        * bytecode/Instruction.h:
+        * dfg/DFGByteCodeParser.cpp:
+        (JSC::DFG::ByteCodeParser::parseBlock):
+        * runtime/JSScope.cpp:
+        (JSC::abstractAccess):
+        (JSC::JSScope::abstractResolve):
+        * runtime/JSScope.h:
+        (JSC::ResolveOp::ResolveOp):
+        * runtime/SymbolTable.h:
+        (JSC::SymbolTableEntry::watchpointSet):
+
</ins><span class="cx"> 2013-11-18  Mark Hahnenberg  &lt;mhahnenberg@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         APIEntryShims need some love
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (159461 => 159462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp        2013-11-18 23:16:16 UTC (rev 159461)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp        2013-11-18 23:19:53 UTC (rev 159462)
</span><span class="lines">@@ -1882,7 +1882,10 @@
</span><span class="cx">             ResolveOp op = JSScope::abstractResolve(m_globalObject-&gt;globalExec(), scope, ident, Put, modeAndType.type());
</span><span class="cx"> 
</span><span class="cx">             instructions[i + 4].u.operand = ResolveModeAndType(modeAndType.mode(), op.type).operand();
</span><del>-            if (op.structure)
</del><ins>+            if (op.type == GlobalVar || op.type == GlobalVarWithVarInjectionChecks) {
+                ASSERT(!op.structure);
+                instructions[i + 5].u.watchpointSet = op.watchpointSet;
+            } else if (op.structure)
</ins><span class="cx">                 instructions[i + 5].u.structure.set(*vm(), ownerExecutable, op.structure);
</span><span class="cx">             instructions[i + 6].u.pointer = reinterpret_cast&lt;void*&gt;(op.operand);
</span><span class="cx">             break;
</span><span class="lines">@@ -2274,6 +2277,10 @@
</span><span class="cx">                 break;
</span><span class="cx">             case op_get_from_scope:
</span><span class="cx">             case op_put_to_scope: {
</span><ins>+                ResolveModeAndType modeAndType =
+                    ResolveModeAndType(curInstruction[4].u.operand);
+                if (modeAndType.type() == GlobalVar || modeAndType.type() == GlobalVarWithVarInjectionChecks)
+                    continue;
</ins><span class="cx">                 WriteBarrierBase&lt;Structure&gt;&amp; structure = curInstruction[5].u.structure;
</span><span class="cx">                 if (!structure || Heap::isMarked(structure.get()))
</span><span class="cx">                     break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeInstructionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/Instruction.h (159461 => 159462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/Instruction.h        2013-11-18 23:16:16 UTC (rev 159461)
+++ trunk/Source/JavaScriptCore/bytecode/Instruction.h        2013-11-18 23:19:53 UTC (rev 159462)
</span><span class="lines">@@ -115,6 +115,7 @@
</span><span class="cx">         ArrayProfile* arrayProfile;
</span><span class="cx">         ArrayAllocationProfile* arrayAllocationProfile;
</span><span class="cx">         ObjectAllocationProfile* objectAllocationProfile;
</span><ins>+        WatchpointSet* watchpointSet;
</ins><span class="cx">         void* pointer;
</span><span class="cx">         bool* predicatePointer;
</span><span class="cx">     } u;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (159461 => 159462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp        2013-11-18 23:16:16 UTC (rev 159461)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp        2013-11-18 23:19:53 UTC (rev 159462)
</span><span class="lines">@@ -3127,7 +3127,10 @@
</span><span class="cx">             uintptr_t operand;
</span><span class="cx">             {
</span><span class="cx">                 ConcurrentJITLocker locker(m_inlineStackTop-&gt;m_profiledBlock-&gt;m_lock);
</span><del>-                structure = currentInstruction[5].u.structure.get();
</del><ins>+                if (resolveType == GlobalVar || resolveType == GlobalVarWithVarInjectionChecks)
+                    structure = 0;
+                else
+                    structure = currentInstruction[5].u.structure.get();
</ins><span class="cx">                 operand = reinterpret_cast&lt;uintptr_t&gt;(currentInstruction[6].u.pointer);
</span><span class="cx">             }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSScope.cpp (159461 => 159462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSScope.cpp        2013-11-18 23:16:16 UTC (rev 159461)
+++ trunk/Source/JavaScriptCore/runtime/JSScope.cpp        2013-11-18 23:19:53 UTC (rev 159462)
</span><span class="lines">@@ -53,19 +53,19 @@
</span><span class="cx">     if (JSActivation* activation = jsDynamicCast&lt;JSActivation*&gt;(scope)) {
</span><span class="cx">         if (ident == exec-&gt;propertyNames().arguments) {
</span><span class="cx">             // We know the property will be at this activation scope, but we don't know how to cache it.
</span><del>-            op = ResolveOp(Dynamic, 0, 0, 0);
</del><ins>+            op = ResolveOp(Dynamic, 0, 0, 0, 0);
</ins><span class="cx">             return true;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         SymbolTableEntry entry = activation-&gt;symbolTable()-&gt;get(ident.impl());
</span><span class="cx">         if (entry.isReadOnly() &amp;&amp; getOrPut == Put) {
</span><span class="cx">             // We know the property will be at this activation scope, but we don't know how to cache it.
</span><del>-            op = ResolveOp(Dynamic, 0, 0, 0);
</del><ins>+            op = ResolveOp(Dynamic, 0, 0, 0, 0);
</ins><span class="cx">             return true;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if (!entry.isNull()) {
</span><del>-            op = ResolveOp(makeType(ClosureVar, needsVarInjectionChecks), depth, activation-&gt;structure(), entry.getIndex());
</del><ins>+            op = ResolveOp(makeType(ClosureVar, needsVarInjectionChecks), depth, activation-&gt;structure(), 0, entry.getIndex());
</ins><span class="cx">             return true;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">             if (getOrPut == Put) {
</span><span class="cx">                 if (entry.isReadOnly()) {
</span><span class="cx">                     // We know the property will be at global scope, but we don't know how to cache it.
</span><del>-                    op = ResolveOp(Dynamic, 0, 0, 0);
</del><ins>+                    op = ResolveOp(Dynamic, 0, 0, 0, 0);
</ins><span class="cx">                     return true;
</span><span class="cx">                 }
</span><span class="cx"> 
</span><span class="lines">@@ -88,7 +88,8 @@
</span><span class="cx">                 entry.notifyWrite();
</span><span class="cx">             }
</span><span class="cx"> 
</span><del>-            op = ResolveOp(makeType(GlobalVar, needsVarInjectionChecks), depth, globalObject-&gt;structure(), 
</del><ins>+            op = ResolveOp(
+                makeType(GlobalVar, needsVarInjectionChecks), depth, 0, entry.watchpointSet(),
</ins><span class="cx">                 reinterpret_cast&lt;uintptr_t&gt;(globalObject-&gt;registerAt(entry.getIndex()).slot()));
</span><span class="cx">             return true;
</span><span class="cx">         }
</span><span class="lines">@@ -100,15 +101,15 @@
</span><span class="cx">             || (globalObject-&gt;structure()-&gt;hasReadOnlyOrGetterSetterPropertiesExcludingProto() &amp;&amp; getOrPut == Put)) {
</span><span class="cx">             // We know the property will be at global scope, but we don't know how to cache it.
</span><span class="cx">             ASSERT(!scope-&gt;next());
</span><del>-            op = ResolveOp(makeType(GlobalProperty, needsVarInjectionChecks), depth, 0, 0);
</del><ins>+            op = ResolveOp(makeType(GlobalProperty, needsVarInjectionChecks), depth, 0, 0, 0);
</ins><span class="cx">             return true;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        op = ResolveOp(makeType(GlobalProperty, needsVarInjectionChecks), depth, globalObject-&gt;structure(), slot.cachedOffset());
</del><ins>+        op = ResolveOp(makeType(GlobalProperty, needsVarInjectionChecks), depth, globalObject-&gt;structure(), 0, slot.cachedOffset());
</ins><span class="cx">         return true;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    op = ResolveOp(Dynamic, 0, 0, 0);
</del><ins>+    op = ResolveOp(Dynamic, 0, 0, 0, 0);
</ins><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -146,7 +147,7 @@
</span><span class="cx"> 
</span><span class="cx"> ResolveOp JSScope::abstractResolve(ExecState* exec, JSScope* scope, const Identifier&amp; ident, GetOrPut getOrPut, ResolveType unlinkedType)
</span><span class="cx"> {
</span><del>-    ResolveOp op(Dynamic, 0, 0, 0);
</del><ins>+    ResolveOp op(Dynamic, 0, 0, 0, 0);
</ins><span class="cx">     if (unlinkedType == Dynamic)
</span><span class="cx">         return op;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSScope.h (159461 => 159462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSScope.h        2013-11-18 23:16:16 UTC (rev 159461)
+++ trunk/Source/JavaScriptCore/runtime/JSScope.h        2013-11-18 23:19:53 UTC (rev 159462)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> namespace JSC {
</span><span class="cx"> 
</span><span class="cx"> class ScopeChainIterator;
</span><ins>+class WatchpointSet;
</ins><span class="cx"> 
</span><span class="cx"> enum ResolveMode {
</span><span class="cx">     ThrowIfNotFound,
</span><span class="lines">@@ -95,10 +96,11 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> struct ResolveOp {
</span><del>-    ResolveOp(ResolveType type, size_t depth, Structure* structure, uintptr_t operand)
</del><ins>+    ResolveOp(ResolveType type, size_t depth, Structure* structure, WatchpointSet* watchpointSet, uintptr_t operand)
</ins><span class="cx">         : type(type)
</span><span class="cx">         , depth(depth)
</span><span class="cx">         , structure(structure)
</span><ins>+        , watchpointSet(watchpointSet)
</ins><span class="cx">         , operand(operand)
</span><span class="cx">     {
</span><span class="cx">     }
</span><span class="lines">@@ -106,6 +108,7 @@
</span><span class="cx">     ResolveType type;
</span><span class="cx">     size_t depth;
</span><span class="cx">     Structure* structure;
</span><ins>+    WatchpointSet* watchpointSet;
</ins><span class="cx">     uintptr_t operand;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeSymbolTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/SymbolTable.h (159461 => 159462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/SymbolTable.h        2013-11-18 23:16:16 UTC (rev 159461)
+++ trunk/Source/JavaScriptCore/runtime/SymbolTable.h        2013-11-18 23:19:53 UTC (rev 159462)
</span><span class="lines">@@ -234,6 +234,8 @@
</span><span class="cx">     
</span><span class="cx">     WatchpointSet* watchpointSet()
</span><span class="cx">     {
</span><ins>+        if (!isFat())
+            return 0;
</ins><span class="cx">         return fatEntry()-&gt;m_watchpoints.get();
</span><span class="cx">     }
</span><span class="cx">     
</span></span></pre>
</div>
</div>

</body>
</html>