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

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 208 matching lines @@
       sampler_window_[i] = NULL;
       sampler_window_weight_[i] = 0;
     }
   }
 }
 
 
 int RuntimeProfiler::LookupSample(JSFunction* function) {
   int weight = 0;
   for (int i = 0; i < kSamplerWindowSize; i++) {
-    JSFunction* sample = sampler_window_[i];
+    Object* sample = sampler_window_[i];
     if (sample != NULL) {
       if (function == sample) {
         weight += sampler_window_weight_[i];
       }
     }
   }
   return weight;
 }
 
 
@@ skipping 106 matching lines @@
   sampler_threshold_size_factor_ = kSamplerThresholdSizeFactorInit;
 }
 
 
 void RuntimeProfiler::TearDown() {
   // Nothing to do.
 }
 
 
 Object** RuntimeProfiler::SamplerWindowAddress() {
-  return reinterpret_cast<Object**>(sampler_window_);
+  return sampler_window_;
 }
 
 
 int RuntimeProfiler::SamplerWindowSize() {
   return kSamplerWindowSize;
 }
 
 
 void RuntimeProfiler::HandleWakeUp(Isolate* isolate) {
   // The profiler thread must still be waiting.
@@ skipping 36 matching lines @@
       ++non_js_ticks_;
     } else {
       return RuntimeProfiler::WaitForSomeIsolateToEnterJS();
     }
   }
   return false;
 }
 
 
 } }  // namespace v8::internal