Revert three commits due to cpu-profiler failures

src/profiler/cpu-profiler.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/profiler/cpu-profiler.h"
 
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/frames-inl.h"
 #include "src/locked-queue-inl.h"
 #include "src/log-inl.h"
 #include "src/profiler/cpu-profiler-inl.h"
 #include "src/vm-state-inl.h"
 
 namespace v8 {
 namespace internal {
 
 static const int kProfilerStackSize = 64 * KB;
 
 class CpuSampler : public sampler::Sampler {
  public:
   CpuSampler(Isolate* isolate, ProfilerEventsProcessor* processor)
       : sampler::Sampler(reinterpret_cast<v8::Isolate*>(isolate)),
         processor_(processor) {}
 
-  void SampleStack(const v8::RegisterState& regs) override {
+  void SampleStack(const v8::RegisterState& state) override {
+    v8::Isolate* v8_isolate = isolate();
+    Isolate* i_isolate = reinterpret_cast<Isolate*>(v8_isolate);
+#if defined(USE_SIMULATOR)
+    v8::RegisterState regs;
+    if (!SimulatorHelper::FillRegisters(i_isolate, &regs)) return;
+#else
+    const v8::RegisterState& regs = state;
+#endif
     TickSample* sample = processor_->StartTickSample();
-    if (sample == nullptr) return;
-    Isolate* isolate = reinterpret_cast<Isolate*>(this->isolate());
-    sample->Init(isolate, regs, TickSample::kIncludeCEntryFrame, true);
+    if (sample == NULL) return;
+    sample->Init(i_isolate, regs, TickSample::kIncludeCEntryFrame, true);
     if (is_counting_samples_ && !sample->timestamp.IsNull()) {
       if (sample->state == JS) ++js_sample_count_;
       if (sample->state == EXTERNAL) ++external_sample_count_;
     }
     processor_->FinishTickSample();
   }
 
  private:
   ProfilerEventsProcessor* processor_;
 };
@@ skipping 333 matching lines @@
     ReportBuiltinEventRecord* rec = &evt_rec.ReportBuiltinEventRecord_;
     Builtins::Name id = static_cast<Builtins::Name>(i);
     rec->start = builtins->builtin(id)->address();
     rec->builtin_id = id;
     processor_->Enqueue(evt_rec);
   }
 }
 
 }  // namespace internal
 }  // namespace v8