JavaScriptCore-1218.34.tar.gz

[apple/javascriptcore.git] / tools / CodeProfile.cpp

diff --git a/tools/CodeProfile.cpp b/tools/CodeProfile.cpp
index beed4b2d5a4f31c9156fb6657cc116481f99d0a0..de86e52efb6eeb3ec2dbf3551e1f4c4213789fd7 100644 (file)
--- a/tools/CodeProfile.cpp
+++ b/tools/CodeProfile.cpp
@@ -107,7 +107,7 @@ void CodeProfile::sample(void* pc, void** framePointer)
             CodeBlock* codeBlock = static_cast<CodeBlock*>(ownerUID);
             if (codeBlock->getJITType() == JITCode::DFGJIT)
                 type = DFGJIT;
             CodeBlock* codeBlock = static_cast<CodeBlock*>(ownerUID);
             if (codeBlock->getJITType() == JITCode::DFGJIT)
                 type = DFGJIT;

-            else if (codeBlock->canCompileWithDFGState() == CodeBlock::CompileWithDFGFalse)
+            else if (codeBlock->canCompileWithDFGState() != DFG::CanCompile)

                 type = BaselineOnly;
             else if (codeBlock->replacement())
                 type = BaselineOSR;
                 type = BaselineOnly;
             else if (codeBlock->replacement())
                 type = BaselineOSR;


@@ -133,7 +133,7 @@ void CodeProfile::sample(void* pc, void** framePointer)
         framePointer = 0;
 #else
         // This platform is not yet supported!
         framePointer = 0;
 #else
         // This platform is not yet supported!

-        ASSERT_NOT_REACHED();
+        RELEASE_ASSERT_NOT_REACHED();

 #endif
     }
 
 #endif
     }
 


@@ -143,7 +143,7 @@ void CodeProfile::sample(void* pc, void** framePointer)
 
 void CodeProfile::report()
 {
 
 void CodeProfile::report()
 {

-    dataLog("<CodeProfiling %s:%d>\n", m_file.data(), m_lineNo);
+    dataLogF("<CodeProfiling %s:%d>\n", m_file.data(), m_lineNo);

 
     // How many frames of C-code to print - 0, if not verbose, 1 if verbose, up to 1024 if very verbose.
     unsigned recursionLimit = CodeProfiling::beVeryVerbose() ? 1024 : CodeProfiling::beVerbose();
 
     // How many frames of C-code to print - 0, if not verbose, 1 if verbose, up to 1024 if very verbose.
     unsigned recursionLimit = CodeProfiling::beVeryVerbose() ? 1024 : CodeProfiling::beVerbose();


@@ -180,13 +180,13 @@ void CodeProfile::report()
     }
 
     // Output the profile tree.
     }
 
     // Output the profile tree.

-    dataLog("Total samples: %lld\n", static_cast<long long>(profile.childCount()));
+    dataLogF("Total samples: %lld\n", static_cast<long long>(profile.childCount()));

     profile.dump();
     
     for (size_t i = 0 ; i < m_children.size(); ++i)
         m_children[i]->report();
 
     profile.dump();
     
     for (size_t i = 0 ; i < m_children.size(); ++i)
         m_children[i]->report();
 

-    dataLog("</CodeProfiling %s:%d>\n", m_file.data(), m_lineNo);
+    dataLogF("</CodeProfiling %s:%d>\n", m_file.data(), m_lineNo);

 }
 
 }
 }
 
 }