<!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>[174762] 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/174762">174762</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-16 06:29:55 -0700 (Thu, 16 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use isnan from std namespace in ProfileGenerator.cpp
https://bugs.webkit.org/show_bug.cgi?id=137653
Patch by Adrien Destugues <pulkomandy@gmail.com> on 2014-10-16
Reviewed by Darin Adler.
The C++ isnan() function is in the std namespace. The unprefixed isnan
may be available because of C99 headers leakage in C++, but should not
be used.
No new tests: no functional change, build fix on platforms which don't
export C99 functions in C++.
* profiler/ProfileGenerator.cpp:
(JSC::ProfileGenerator::beginCallEntry):
(JSC::ProfileGenerator::endCallEntry):
(JSC::ProfileGenerator::didPause):
(JSC::ProfileGenerator::didContinue):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreprofilerProfileGeneratorcpp">trunk/Source/JavaScriptCore/profiler/ProfileGenerator.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (174761 => 174762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-10-16 06:50:30 UTC (rev 174761)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-10-16 13:29:55 UTC (rev 174762)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-10-16 Adrien Destugues <pulkomandy@gmail.com>
+
+ Use isnan from std namespace in ProfileGenerator.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=137653
+
+ Reviewed by Darin Adler.
+
+ The C++ isnan() function is in the std namespace. The unprefixed isnan
+ may be available because of C99 headers leakage in C++, but should not
+ be used.
+
+ No new tests: no functional change, build fix on platforms which don't
+ export C99 functions in C++.
+
+ * profiler/ProfileGenerator.cpp:
+ (JSC::ProfileGenerator::beginCallEntry):
+ (JSC::ProfileGenerator::endCallEntry):
+ (JSC::ProfileGenerator::didPause):
+ (JSC::ProfileGenerator::didContinue):
+
</ins><span class="cx"> 2014-10-15 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r174025): remote inspector crashes frequently when executing inspector frontend's JavaScript
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreprofilerProfileGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/profiler/ProfileGenerator.cpp (174761 => 174762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/profiler/ProfileGenerator.cpp 2014-10-16 06:50:30 UTC (rev 174761)
+++ trunk/Source/JavaScriptCore/profiler/ProfileGenerator.cpp 2014-10-16 13:29:55 UTC (rev 174762)
</span><span class="lines">@@ -117,12 +117,12 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT_ARG(node, node);
</span><span class="cx">
</span><del>- if (isnan(startTime))
</del><ins>+ if (std::isnan(startTime))
</ins><span class="cx"> startTime = currentTime();
</span><span class="cx">
</span><span class="cx"> // If the debugger is paused when beginning, then don't set the start time. It
</span><span class="cx"> // will be fixed up when the debugger unpauses or the call entry ends.
</span><del>- if (!isnan(m_debuggerPausedTimestamp))
</del><ins>+ if (!std::isnan(m_debuggerPausedTimestamp))
</ins><span class="cx"> startTime = NAN;
</span><span class="cx">
</span><span class="cx"> node->appendCall(ProfileNode::Call(startTime));
</span><span class="lines">@@ -135,19 +135,19 @@
</span><span class="cx"> ProfileNode::Call& last = node->lastCall();
</span><span class="cx">
</span><span class="cx"> // If the debugger is paused, ignore the interval that ends now.
</span><del>- if (!isnan(m_debuggerPausedTimestamp) && !isnan(last.elapsedTime()))
</del><ins>+ if (!std::isnan(m_debuggerPausedTimestamp) && !std::isnan(last.elapsedTime()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // If paused and no time was accrued then the debugger was never unpaused. The call will
</span><span class="cx"> // have no time accrued and appear to have started when the debugger was paused.
</span><del>- if (!isnan(m_debuggerPausedTimestamp)) {
</del><ins>+ if (!std::isnan(m_debuggerPausedTimestamp)) {
</ins><span class="cx"> last.setStartTime(m_debuggerPausedTimestamp);
</span><span class="cx"> last.setElapsedTime(0.0);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Otherwise, add the interval ending now to elapsed time.
</span><del>- double previousElapsedTime = isnan(last.elapsedTime()) ? 0.0 : last.elapsedTime();
</del><ins>+ double previousElapsedTime = std::isnan(last.elapsedTime()) ? 0.0 : last.elapsedTime();
</ins><span class="cx"> double newlyElapsedTime = currentTime() - last.startTime();
</span><span class="cx"> last.setElapsedTime(previousElapsedTime + newlyElapsedTime);
</span><span class="cx"> }
</span><span class="lines">@@ -225,15 +225,15 @@
</span><span class="cx">
</span><span class="cx"> void ProfileGenerator::didPause(PassRefPtr<DebuggerCallFrame>, const CallIdentifier&)
</span><span class="cx"> {
</span><del>- ASSERT(isnan(m_debuggerPausedTimestamp));
</del><ins>+ ASSERT(std::isnan(m_debuggerPausedTimestamp));
</ins><span class="cx">
</span><span class="cx"> m_debuggerPausedTimestamp = currentTime();
</span><span class="cx">
</span><span class="cx"> for (ProfileNode* node = m_currentNode.get(); node != m_profile->rootNode(); node = node->parent()) {
</span><span class="cx"> ProfileNode::Call& last = node->lastCall();
</span><del>- ASSERT(!isnan(last.startTime()));
</del><ins>+ ASSERT(!std::isnan(last.startTime()));
</ins><span class="cx">
</span><del>- double previousElapsedTime = isnan(last.elapsedTime()) ? 0.0 : last.elapsedTime();
</del><ins>+ double previousElapsedTime = std::isnan(last.elapsedTime()) ? 0.0 : last.elapsedTime();
</ins><span class="cx"> double additionalElapsedTime = m_debuggerPausedTimestamp - last.startTime();
</span><span class="cx"> last.setStartTime(NAN);
</span><span class="cx"> last.setElapsedTime(previousElapsedTime + additionalElapsedTime);
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx">
</span><span class="cx"> void ProfileGenerator::didContinue(PassRefPtr<DebuggerCallFrame>, const CallIdentifier&)
</span><span class="cx"> {
</span><del>- ASSERT(!isnan(m_debuggerPausedTimestamp));
</del><ins>+ ASSERT(!std::isnan(m_debuggerPausedTimestamp));
</ins><span class="cx">
</span><span class="cx"> for (ProfileNode* node = m_currentNode.get(); node != m_profile->rootNode(); node = node->parent())
</span><span class="cx"> node->lastCall().setStartTime(m_debuggerPausedTimestamp);
</span></span></pre>
</div>
</div>
</body>
</html>