<!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>[184958] 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/184958">184958</a></dd>
<dt>Author</dt> <dd>basile_clement@apple.com</dd>
<dt>Date</dt> <dd>2015-05-28 12:14:30 -0700 (Thu, 28 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add debug mode assertions for accessors casting JSC::DFG::Node.m_opInfo
https://bugs.webkit.org/show_bug.cgi?id=145441
Reviewed by Filip Pizlo.
Most accessor functions casting m_opInfo in JSC::DFG::Node are
performing debug checks that they are only accessed for node types that
should have them. This patch adds similar checks for the accessors that
were missing them.
* dfg/DFGNode.h:
(JSC::DFG::Node::watchpointSet):
(JSC::DFG::Node::storagePointer):
(JSC::DFG::Node::multiGetByOffsetData):
(JSC::DFG::Node::multiPutByOffsetData):
(JSC::DFG::Node::hasTypeLocation):
(JSC::DFG::Node::typeLocation):
(JSC::DFG::Node::hasBasicBlockLocation):
(JSC::DFG::Node::basicBlockLocation):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGNodeh">trunk/Source/JavaScriptCore/dfg/DFGNode.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (184957 => 184958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-05-28 17:45:22 UTC (rev 184957)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-05-28 19:14:30 UTC (rev 184958)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-05-28 Basile Clement <basile_clement@apple.com>
+
+ Add debug mode assertions for accessors casting JSC::DFG::Node.m_opInfo
+ https://bugs.webkit.org/show_bug.cgi?id=145441
+
+ Reviewed by Filip Pizlo.
+
+ Most accessor functions casting m_opInfo in JSC::DFG::Node are
+ performing debug checks that they are only accessed for node types that
+ should have them. This patch adds similar checks for the accessors that
+ were missing them.
+
+ * dfg/DFGNode.h:
+ (JSC::DFG::Node::watchpointSet):
+ (JSC::DFG::Node::storagePointer):
+ (JSC::DFG::Node::multiGetByOffsetData):
+ (JSC::DFG::Node::multiPutByOffsetData):
+ (JSC::DFG::Node::hasTypeLocation):
+ (JSC::DFG::Node::typeLocation):
+ (JSC::DFG::Node::hasBasicBlockLocation):
+ (JSC::DFG::Node::basicBlockLocation):
+
</ins><span class="cx"> 2015-05-28 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add ENABLE_MEDIA_SESSION feature flag (which is off by default).
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGNode.h (184957 => 184958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGNode.h 2015-05-28 17:45:22 UTC (rev 184957)
+++ trunk/Source/JavaScriptCore/dfg/DFGNode.h 2015-05-28 19:14:30 UTC (rev 184958)
</span><span class="lines">@@ -1321,6 +1321,7 @@
</span><span class="cx">
</span><span class="cx"> WatchpointSet* watchpointSet()
</span><span class="cx"> {
</span><ins>+ ASSERT(hasWatchpointSet());
</ins><span class="cx"> return reinterpret_cast<WatchpointSet*>(m_opInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1331,6 +1332,7 @@
</span><span class="cx">
</span><span class="cx"> void* storagePointer()
</span><span class="cx"> {
</span><ins>+ ASSERT(hasStoragePointer());
</ins><span class="cx"> return reinterpret_cast<void*>(m_opInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1412,6 +1414,7 @@
</span><span class="cx">
</span><span class="cx"> MultiGetByOffsetData& multiGetByOffsetData()
</span><span class="cx"> {
</span><ins>+ ASSERT(hasMultiGetByOffsetData());
</ins><span class="cx"> return *reinterpret_cast<MultiGetByOffsetData*>(m_opInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1422,6 +1425,7 @@
</span><span class="cx">
</span><span class="cx"> MultiPutByOffsetData& multiPutByOffsetData()
</span><span class="cx"> {
</span><ins>+ ASSERT(hasMultiPutByOffsetData());
</ins><span class="cx"> return *reinterpret_cast<MultiPutByOffsetData*>(m_opInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1995,13 +1999,25 @@
</span><span class="cx"> return canSpeculateInt52(sourceFor(pass));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool hasTypeLocation()
+ {
+ return op() == ProfileType;
+ }
+
</ins><span class="cx"> TypeLocation* typeLocation()
</span><span class="cx"> {
</span><ins>+ ASSERT(hasTypeLocation());
</ins><span class="cx"> return reinterpret_cast<TypeLocation*>(m_opInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool hasBasicBlockLocation()
+ {
+ return op() == ProfileControlFlow;
+ }
+
</ins><span class="cx"> BasicBlockLocation* basicBlockLocation()
</span><span class="cx"> {
</span><ins>+ ASSERT(hasBasicBlockLocation());
</ins><span class="cx"> return reinterpret_cast<BasicBlockLocation*>(m_opInfo);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>