Merge bleeding_edge revision (5922, 5934] to isolates branch....

src/runtime-profiler.h

 // 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 96 matching lines @@
   Isolate* isolate_;
 
   int sampler_threshold_;
   int sampler_threshold_size_factor_;
 
   // The JSFunctions in the sampler window are not GC safe. Old-space
   // pointers are not cleared during mark-sweep collection and therefore
   // the window might contain stale pointers. The window is updated on
   // scavenges and (parts of it) cleared on mark-sweep and
   // mark-sweep-compact.
-  JSFunction* sampler_window_[kSamplerWindowSize];
+  Object* sampler_window_[kSamplerWindowSize];
   int sampler_window_position_;
   int sampler_window_weight_[kSamplerWindowSize];
 
   // Support for pending 'optimize soon' requests.
   PendingListNode* optimize_soon_list_;
 
   // Possible state values:
   //   -1            => the profiler thread is waiting on the semaphore
   //   0 or positive => the number of isolates running JavaScript code.
   static Atomic32 state_;
@@ skipping 37 matching lines @@
 
 void RuntimeProfiler::IsolateExitedJS(Isolate* isolate) {
   Atomic32 new_state = NoBarrier_AtomicIncrement(&state_, -1);
   ASSERT(new_state >= 0);
   USE(new_state);
 }
 
 } }  // namespace v8::internal
 
 #endif  // V8_RUNTIME_PROFILER_H_