<!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>[172098] 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/172098">172098</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-05 16:06:03 -0700 (Tue, 05 Aug 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/172009">r172009</a>.
https://bugs.webkit.org/show_bug.cgi?id=135627

&quot;Commit landed on trunk instead of ftlopt branch.&quot; (Requested
by saamyjoon on #webkit).

Reverted changeset:

&quot;Create a more generic way for VMEntryScope to notify those
interested that it will be destroyed&quot;
https://bugs.webkit.org/show_bug.cgi?id=135358
http://trac.webkit.org/changeset/172009</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggercpp">trunk/Source/JavaScriptCore/debugger/Debugger.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMEntryScopecpp">trunk/Source/JavaScriptCore/runtime/VMEntryScope.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMEntryScopeh">trunk/Source/JavaScriptCore/runtime/VMEntryScope.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (172097 => 172098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2014-08-05 23:00:57 UTC (rev 172097)
+++ trunk/Source/JavaScriptCore/ChangeLog        2014-08-05 23:06:03 UTC (rev 172098)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-08-05  Commit Queue  &lt;commit-queue@webkit.org&gt;
+
+        Unreviewed, rolling out r172009.
+        https://bugs.webkit.org/show_bug.cgi?id=135627
+
+        &quot;Commit landed on trunk instead of ftlopt branch.&quot; (Requested
+        by saamyjoon on #webkit).
+
+        Reverted changeset:
+
+        &quot;Create a more generic way for VMEntryScope to notify those
+        interested that it will be destroyed&quot;
+        https://bugs.webkit.org/show_bug.cgi?id=135358
+        http://trac.webkit.org/changeset/172009
+
</ins><span class="cx"> 2014-08-05  Alex Christensen  &lt;achristensen@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         More work on CMake.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.cpp (172097 => 172098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.cpp        2014-08-05 23:00:57 UTC (rev 172097)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.cpp        2014-08-05 23:06:03 UTC (rev 172098)
</span><span class="lines">@@ -335,14 +335,7 @@
</span><span class="cx">     // If JavaScript is running, it's not safe to recompile, since we'll end
</span><span class="cx">     // up throwing away code that is live on the stack.
</span><span class="cx">     if (vm-&gt;entryScope) {
</span><del>-        auto listener = [] (VM* vm, JSGlobalObject* globalObject) 
-        {
-            Debugger* debugger = globalObject-&gt;debugger();
-            if (debugger)
-                debugger-&gt;recompileAllJSFunctions(vm);
-        };
-
-        vm-&gt;entryScope-&gt;addEntryScopeDidPopListener(this, listener);
</del><ins>+        vm-&gt;entryScope-&gt;setRecompilationNeeded(true);
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMEntryScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VMEntryScope.cpp (172097 => 172098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VMEntryScope.cpp        2014-08-05 23:00:57 UTC (rev 172097)
+++ trunk/Source/JavaScriptCore/runtime/VMEntryScope.cpp        2014-08-05 23:06:03 UTC (rev 172098)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> VMEntryScope::VMEntryScope(VM&amp; vm, JSGlobalObject* globalObject)
</span><span class="cx">     : m_vm(vm)
</span><span class="cx">     , m_globalObject(globalObject)
</span><ins>+    , m_recompilationNeeded(false)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(wtfThreadData().stack().isGrowingDownward());
</span><span class="cx">     if (!vm.entryScope) {
</span><span class="lines">@@ -54,11 +55,6 @@
</span><span class="cx">     vm.clearExceptionStack();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void VMEntryScope::addEntryScopeDidPopListener(void* key, EntryScopeDidPopListener listener)
-{
-    m_allEntryScopeDidPopListeners.set(key, listener);
-}
-
</del><span class="cx"> VMEntryScope::~VMEntryScope()
</span><span class="cx"> {
</span><span class="cx">     if (m_vm.entryScope != this)
</span><span class="lines">@@ -66,11 +62,9 @@
</span><span class="cx"> 
</span><span class="cx">     m_vm.entryScope = nullptr;
</span><span class="cx"> 
</span><del>-    auto iter = m_allEntryScopeDidPopListeners.begin();
-    auto end = m_allEntryScopeDidPopListeners.end();
-    for ( ; iter != end; ++iter) {
-        EntryScopeDidPopListener listener = iter-&gt;value;
-        listener(&amp;m_vm, m_globalObject);
</del><ins>+    if (m_recompilationNeeded) {
+        if (Debugger* debugger = m_globalObject-&gt;debugger())
+            debugger-&gt;recompileAllJSFunctions(&amp;m_vm);
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMEntryScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VMEntryScope.h (172097 => 172098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VMEntryScope.h        2014-08-05 23:00:57 UTC (rev 172097)
+++ trunk/Source/JavaScriptCore/runtime/VMEntryScope.h        2014-08-05 23:06:03 UTC (rev 172098)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define VMEntryScope_h
</span><span class="cx"> 
</span><span class="cx"> #include &quot;Interpreter.h&quot;
</span><del>-#include &lt;wtf/HashMap.h&gt;
</del><span class="cx"> #include &lt;wtf/StackBounds.h&gt;
</span><span class="cx"> #include &lt;wtf/StackStats.h&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -43,13 +42,12 @@
</span><span class="cx"> 
</span><span class="cx">     JSGlobalObject* globalObject() const { return m_globalObject; }
</span><span class="cx"> 
</span><del>-    typedef std::function&lt;void (VM*, JSGlobalObject*)&gt; EntryScopeDidPopListener;
-    void addEntryScopeDidPopListener(void*, EntryScopeDidPopListener);
</del><ins>+    void setRecompilationNeeded(bool recompileNeeded) { m_recompilationNeeded = recompileNeeded; }
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     VM&amp; m_vm;
</span><span class="cx">     JSGlobalObject* m_globalObject;
</span><del>-    HashMap&lt;void*, EntryScopeDidPopListener&gt; m_allEntryScopeDidPopListeners;
</del><ins>+    bool m_recompilationNeeded;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace JSC
</span></span></pre>
</div>
</div>

</body>
</html>