<!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>[186705] 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/186705">186705</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-07-10 22:52:37 -0700 (Fri, 10 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Watchpoints should be allocated with FastMalloc
https://bugs.webkit.org/show_bug.cgi?id=146874
Reviewed by Dan Bernstein.
This is in preparation for adding new subclasses of Watchpoint. While starting to do this
I realized that the way Watchpoints allocated themselves was unusual.
* bytecode/CodeBlockJettisoningWatchpoint.h:
(JSC::CodeBlockJettisoningWatchpoint::CodeBlockJettisoningWatchpoint): No need for the default constructor.
* bytecode/Watchpoint.h:
(JSC::Watchpoint::Watchpoint): This should be noncopyable and fast-allocated.
* dfg/DFGCommonData.h: Use a Bag<> instead of SegmentedVector<>. Bag means "malloc things but allow me to free them all at once", which is what we are doing here.
* dfg/DFGDesiredWatchpoints.h:
(JSC::DFG::GenericDesiredWatchpoints::reallyAdd): Use the Bag<> API rather than the very awkward SegmentedVector<> API.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockJettisoningWatchpointh">trunk/Source/JavaScriptCore/bytecode/CodeBlockJettisoningWatchpoint.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeWatchpointh">trunk/Source/JavaScriptCore/bytecode/Watchpoint.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGCommonDatah">trunk/Source/JavaScriptCore/dfg/DFGCommonData.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGDesiredWatchpointsh">trunk/Source/JavaScriptCore/dfg/DFGDesiredWatchpoints.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (186704 => 186705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-07-11 03:45:19 UTC (rev 186704)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-07-11 05:52:37 UTC (rev 186705)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-07-10 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ Watchpoints should be allocated with FastMalloc
+ https://bugs.webkit.org/show_bug.cgi?id=146874
+
+ Reviewed by Dan Bernstein.
+
+ This is in preparation for adding new subclasses of Watchpoint. While starting to do this
+ I realized that the way Watchpoints allocated themselves was unusual.
+
+ * bytecode/CodeBlockJettisoningWatchpoint.h:
+ (JSC::CodeBlockJettisoningWatchpoint::CodeBlockJettisoningWatchpoint): No need for the default constructor.
+ * bytecode/Watchpoint.h:
+ (JSC::Watchpoint::Watchpoint): This should be noncopyable and fast-allocated.
+ * dfg/DFGCommonData.h: Use a Bag<> instead of SegmentedVector<>. Bag means "malloc things but allow me to free them all at once", which is what we are doing here.
+ * dfg/DFGDesiredWatchpoints.h:
+ (JSC::DFG::GenericDesiredWatchpoints::reallyAdd): Use the Bag<> API rather than the very awkward SegmentedVector<> API.
+
+2015-07-10 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> AI folding of IsObjectOrNull is broken for non-object types that may be null
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=146867
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockJettisoningWatchpointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlockJettisoningWatchpoint.h (186704 => 186705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlockJettisoningWatchpoint.h 2015-07-11 03:45:19 UTC (rev 186704)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlockJettisoningWatchpoint.h 2015-07-11 05:52:37 UTC (rev 186705)
</span><span class="lines">@@ -34,11 +34,6 @@
</span><span class="cx">
</span><span class="cx"> class CodeBlockJettisoningWatchpoint : public Watchpoint {
</span><span class="cx"> public:
</span><del>- CodeBlockJettisoningWatchpoint()
- : m_codeBlock(0)
- {
- }
-
</del><span class="cx"> CodeBlockJettisoningWatchpoint(CodeBlock* codeBlock)
</span><span class="cx"> : m_codeBlock(codeBlock)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeWatchpointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/Watchpoint.h (186704 => 186705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/Watchpoint.h 2015-07-11 03:45:19 UTC (rev 186704)
+++ trunk/Source/JavaScriptCore/bytecode/Watchpoint.h 2015-07-11 05:52:37 UTC (rev 186705)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx"> #define Watchpoint_h
</span><span class="cx">
</span><span class="cx"> #include <wtf/Atomics.h>
</span><ins>+#include <wtf/FastMalloc.h>
+#include <wtf/Noncopyable.h>
</ins><span class="cx"> #include <wtf/PrintStream.h>
</span><span class="cx"> #include <wtf/SentinelLinkedList.h>
</span><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="lines">@@ -62,6 +64,8 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class Watchpoint : public BasicRawSentinelNode<Watchpoint> {
</span><ins>+ WTF_MAKE_NONCOPYABLE(Watchpoint);
+ WTF_MAKE_FAST_ALLOCATED;
</ins><span class="cx"> public:
</span><span class="cx"> Watchpoint()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCommonDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCommonData.h (186704 => 186705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCommonData.h 2015-07-11 03:45:19 UTC (rev 186704)
+++ trunk/Source/JavaScriptCore/dfg/DFGCommonData.h 2015-07-11 05:52:37 UTC (rev 186705)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> Vector<WeakReferenceTransition> transitions;
</span><span class="cx"> Vector<WriteBarrier<JSCell>> weakReferences;
</span><span class="cx"> Vector<WriteBarrier<Structure>> weakStructureReferences;
</span><del>- SegmentedVector<CodeBlockJettisoningWatchpoint, 1> watchpoints;
</del><ins>+ Bag<CodeBlockJettisoningWatchpoint> watchpoints;
</ins><span class="cx"> Vector<JumpReplacement> jumpReplacements;
</span><span class="cx">
</span><span class="cx"> RefPtr<Profiler::Compilation> compilation;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGDesiredWatchpointsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGDesiredWatchpoints.h (186704 => 186705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGDesiredWatchpoints.h 2015-07-11 03:45:19 UTC (rev 186704)
+++ trunk/Source/JavaScriptCore/dfg/DFGDesiredWatchpoints.h 2015-07-11 05:52:37 UTC (rev 186705)
</span><span class="lines">@@ -91,10 +91,8 @@
</span><span class="cx">
</span><span class="cx"> typename HashSet<WatchpointSetType*>::iterator iter = m_sets.begin();
</span><span class="cx"> typename HashSet<WatchpointSetType*>::iterator end = m_sets.end();
</span><del>- for (; iter != end; ++iter) {
- common.watchpoints.append(CodeBlockJettisoningWatchpoint(codeBlock));
- Adaptor::add(codeBlock, *iter, &common.watchpoints.last());
- }
</del><ins>+ for (; iter != end; ++iter)
+ Adaptor::add(codeBlock, *iter, common.watchpoints.add(codeBlock));
</ins><span class="cx">
</span><span class="cx"> m_reallyAdded = true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>