Merge 6006:6095 from bleeding_edge to experimental/gc branch.

src/log.cc

Index: src/log.cc
===================================================================
--- src/log.cc	(revision 6095)
+++ src/log.cc	(working copy)
@@ -709,6 +709,7 @@
 }
 
 
+#ifdef ENABLE_LOGGING_AND_PROFILING
 static const char* ComputeMarker(Code* code) {
   switch (code->kind()) {
     case Code::FUNCTION: return code->optimizable() ? "~" : "";
@@ -716,6 +717,7 @@
     default: return "";
   }
 }
+#endif
 
 
 void Logger::CodeCreateEvent(LogEventsAndTags tag,
@@ -1577,13 +1579,17 @@
 
 
 void Logger::EnsureTickerStarted() {
+#ifdef ENABLE_LOGGING_AND_PROFILING
   ASSERT(ticker_ != NULL);
   if (!ticker_->IsActive()) ticker_->Start();
+#endif
 }
 
 
 void Logger::EnsureTickerStopped() {
+#ifdef ENABLE_LOGGING_AND_PROFILING
   if (ticker_ != NULL && ticker_->IsActive()) ticker_->Stop();
+#endif
 }