Fix bug that disabled optimization when profiling.

src/runtime-profiler.cc

 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 406 matching lines @@
   ASSERT(IsPowerOf2(kStateWindowSize));
   state_window_position = (state_window_position + 1) &
       (kStateWindowSize - 1);
   NoBarrier_Store(&js_ratio, state_counts[IN_JS_STATE] * 100 /
                   kStateWindowSize);
 }
 
 
 bool RuntimeProfilerRateLimiter::SuspendIfNecessary() {
   static const int kNonJSTicksThreshold = 100;
+  bool top_is_in_js_state = Top::IsInJSState();
+  // Record state sample.
+  if (top_is_in_js_state) {

[Florian Schneider, 2010/12/10 14:02:55]

Do you need to check for RuntimeProfiler::IsEnabled() here too?

[Karl Klose, 2010/12/10 14:08:48]

Done.

+    AddStateSample(IN_JS_STATE);
+  } else {
+    AddStateSample(IN_NON_JS_STATE);
+  }
   // We suspend the runtime profiler thread when not running
   // JavaScript. If the CPU profiler is active we must not do this
   // because it samples both JavaScript and C++ code.
   if (RuntimeProfiler::IsEnabled() &&
       !CpuProfiler::is_profiling() &&
       !(FLAG_prof && FLAG_prof_auto)) {
-    if (Top::IsInJSState()) {
-      AddStateSample(IN_JS_STATE);
+    if (top_is_in_js_state) {
       non_js_ticks_ = 0;
     } else {
-      AddStateSample(IN_NON_JS_STATE);
       if (non_js_ticks_ < kNonJSTicksThreshold) {
         ++non_js_ticks_;
       } else {
         if (Top::WaitForJSState()) return true;
       }
     }
   }
   return false;
 }
 
 
 } }  // namespace v8::internal