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

src/runtime-profiler.cc

Index: src/runtime-profiler.cc
===================================================================
--- src/runtime-profiler.cc	(revision 6095)
+++ src/runtime-profiler.cc	(working copy)
@@ -350,6 +350,7 @@
 }
 
 
+#ifdef ENABLE_LOGGING_AND_PROFILING
 static void UpdateStateRatio(SamplerState current_state) {
   static const int kStateWindowSize = 128;
   static SamplerState state_window[kStateWindowSize];
@@ -366,15 +367,18 @@
   NoBarrier_Store(&js_ratio, state_counts[IN_JS_STATE] * 100 /
                   kStateWindowSize);
 }
+#endif
 
 
 void RuntimeProfiler::NotifyTick() {
+#ifdef ENABLE_LOGGING_AND_PROFILING
   // Record state sample.
   SamplerState state = Top::IsInJSState()
       ? IN_JS_STATE
       : IN_NON_JS_STATE;
   UpdateStateRatio(state);
   StackGuard::RequestRuntimeProfilerTick();
+#endif
 }
 
 
@@ -428,6 +432,7 @@
 
 
 bool RuntimeProfilerRateLimiter::SuspendIfNecessary() {
+#ifdef ENABLE_LOGGING_AND_PROFILING
   static const int kNonJSTicksThreshold = 100;
   // We suspend the runtime profiler thread when not running
   // JavaScript. If the CPU profiler is active we must not do this
@@ -445,6 +450,7 @@
       }
     }
   }
+#endif
   return false;
 }