[webkit-changes] [174762] trunk/Source/JavaScriptCore

[commit-queue]

Title: [174762] trunk/Source/_javascript_Core

Revision

174762

Author

commit-qu...@webkit.org

Date

2014-10-16 06:29:55 -0700 (Thu, 16 Oct 2014)

Log Message

Use isnan from std namespace in ProfileGenerator.cpp
https://bugs.webkit.org/show_bug.cgi?id=137653

Patch by Adrien Destugues <pulkoma...@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):

Modified Paths

• trunk/Source/_javascript_Core/ChangeLog
• trunk/Source/_javascript_Core/profiler/ProfileGenerator.cpp

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (174761 => 174762)

--- trunk/Source/_javascript_Core/ChangeLog	2014-10-16 06:50:30 UTC (rev 174761)
+++ trunk/Source/_javascript_Core/ChangeLog	2014-10-16 13:29:55 UTC (rev 174762)
@@ -1,3 +1,23 @@
+2014-10-16  Adrien Destugues  <pulkoma...@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):
+
 2014-10-15  Michael Saboff  <msab...@apple.com>
 
         REGRESSION(r174025): remote inspector crashes frequently when executing inspector frontend's _javascript_

Modified: trunk/Source/_javascript_Core/profiler/ProfileGenerator.cpp (174761 => 174762)

--- trunk/Source/_javascript_Core/profiler/ProfileGenerator.cpp	2014-10-16 06:50:30 UTC (rev 174761)
+++ trunk/Source/_javascript_Core/profiler/ProfileGenerator.cpp	2014-10-16 13:29:55 UTC (rev 174762)
@@ -117,12 +117,12 @@
 {
     ASSERT_ARG(node, node);
 
-    if (isnan(startTime))
+    if (std::isnan(startTime))
         startTime = currentTime();
 
     // If the debugger is paused when beginning, then don't set the start time. It
     // will be fixed up when the debugger unpauses or the call entry ends.
-    if (!isnan(m_debuggerPausedTimestamp))
+    if (!std::isnan(m_debuggerPausedTimestamp))
         startTime = NAN;
 
     node->appendCall(ProfileNode::Call(startTime));
@@ -135,19 +135,19 @@
     ProfileNode::Call& last = node->lastCall();
 
     // If the debugger is paused, ignore the interval that ends now.
-    if (!isnan(m_debuggerPausedTimestamp) && !isnan(last.elapsedTime()))
+    if (!std::isnan(m_debuggerPausedTimestamp) && !std::isnan(last.elapsedTime()))
         return;
 
     // If paused and no time was accrued then the debugger was never unpaused. The call will
     // have no time accrued and appear to have started when the debugger was paused.
-    if (!isnan(m_debuggerPausedTimestamp)) {
+    if (!std::isnan(m_debuggerPausedTimestamp)) {
         last.setStartTime(m_debuggerPausedTimestamp);
         last.setElapsedTime(0.0);
         return;
     }
 
     // Otherwise, add the interval ending now to elapsed time.
-    double previousElapsedTime = isnan(last.elapsedTime()) ? 0.0 : last.elapsedTime();
+    double previousElapsedTime = std::isnan(last.elapsedTime()) ? 0.0 : last.elapsedTime();
     double newlyElapsedTime = currentTime() - last.startTime();
     last.setElapsedTime(previousElapsedTime + newlyElapsedTime);
 }
@@ -225,15 +225,15 @@
 
 void ProfileGenerator::didPause(PassRefPtr<DebuggerCallFrame>, const CallIdentifier&)
 {
-    ASSERT(isnan(m_debuggerPausedTimestamp));
+    ASSERT(std::isnan(m_debuggerPausedTimestamp));
 
     m_debuggerPausedTimestamp = currentTime();
 
     for (ProfileNode* node = m_currentNode.get(); node != m_profile->rootNode(); node = node->parent()) {
         ProfileNode::Call& last = node->lastCall();
-        ASSERT(!isnan(last.startTime()));
+        ASSERT(!std::isnan(last.startTime()));
 
-        double previousElapsedTime = isnan(last.elapsedTime()) ? 0.0 : last.elapsedTime();
+        double previousElapsedTime = std::isnan(last.elapsedTime()) ? 0.0 : last.elapsedTime();
         double additionalElapsedTime = m_debuggerPausedTimestamp - last.startTime();
         last.setStartTime(NAN);
         last.setElapsedTime(previousElapsedTime + additionalElapsedTime);
@@ -242,7 +242,7 @@
 
 void ProfileGenerator::didContinue(PassRefPtr<DebuggerCallFrame>, const CallIdentifier&)
 {
-    ASSERT(!isnan(m_debuggerPausedTimestamp));
+    ASSERT(!std::isnan(m_debuggerPausedTimestamp));
 
     for (ProfileNode* node = m_currentNode.get(); node != m_profile->rootNode(); node = node->parent())
         node->lastCall().setStartTime(m_debuggerPausedTimestamp);

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes