Revert of CpuProfiler: public API for deopt info in cpu profiler.

test/cctest/test-cpu-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 38 matching lines @@
 using i::SmartPointer;
 using i::Vector;
 
 
 // Helper methods
 static v8::Local<v8::Function> GetFunction(v8::Context* env, const char* name) {
   return v8::Local<v8::Function>::Cast(env->Global()->Get(v8_str(name)));
 }
 
 
-static size_t offset(const char* src, const char* substring) {
-  const char* it = strstr(src, substring);
-  CHECK(it);
-  return static_cast<size_t>(it - src);
+static int offset(const char* src, const char* substring) {
+  return static_cast<int>(strstr(src, substring) - src);
 }
 
 
 static const char* reason(const i::Deoptimizer::DeoptReason reason) {
   return i::Deoptimizer::GetDeoptReason(reason);
 }
 
 
 TEST(StartStop) {
   i::Isolate* isolate = CcTest::i_isolate();
@@ skipping 1820 matching lines @@
                 ;;; deopted at script_id: 29 position: 45 with reason 'not a
   heap number'.
                 ;;;     Inline point: script_id 30 position: 36.
       4        opt_function 29 #4
   */
   v8::CpuProfile* profile = reinterpret_cast<v8::CpuProfile*>(iprofile);
 
   const char* branch[] = {"", "test"};
   const ProfileNode* itest_node =
       GetSimpleBranch(profile, branch, arraysize(branch));
-  const std::vector<v8::CpuProfileDeoptInfo>& deopt_infos =
-      itest_node->deopt_infos();
+  const std::vector<i::DeoptInfo>& deopt_infos = itest_node->deopt_infos();
   CHECK_EQ(1, deopt_infos.size());
 
-  const v8::CpuProfileDeoptInfo& info = deopt_infos[0];
+  const i::DeoptInfo& info = deopt_infos[0];
   CHECK_EQ(reason(i::Deoptimizer::kNotAHeapNumber), info.deopt_reason);
   CHECK_EQ(2, info.stack.size());
   CHECK_EQ(inlined_script_id, info.stack[0].script_id);
   CHECK_EQ(offset(inlined_source, "left /"), info.stack[0].position);
   CHECK_EQ(script_id, info.stack[1].script_id);
   CHECK_EQ(offset(source, "opt_function(left,"), info.stack[1].position);
 
   iprofiler->DeleteProfile(iprofile);
 }
 
@@ skipping 48 matching lines @@
                 ;;;     Inline point: script_id 30 position: 103.
       1        test2 30 #4
       3          opt_function 29 #5
   */
 
   v8::CpuProfile* profile = reinterpret_cast<v8::CpuProfile*>(iprofile);
 
   const char* branch[] = {"", "test1"};
   const ProfileNode* itest_node =
       GetSimpleBranch(profile, branch, arraysize(branch));
-  const std::vector<v8::CpuProfileDeoptInfo>& deopt_infos =
-      itest_node->deopt_infos();
+  const std::vector<i::DeoptInfo>& deopt_infos = itest_node->deopt_infos();
   CHECK_EQ(1, deopt_infos.size());
 
-  const v8::CpuProfileDeoptInfo info = deopt_infos[0];
+  const i::DeoptInfo info = deopt_infos[0];
   CHECK_EQ(reason(i::Deoptimizer::kNotAHeapNumber), info.deopt_reason);
   CHECK_EQ(3, info.stack.size());
   CHECK_EQ(inlined_script_id, info.stack[0].script_id);
   CHECK_EQ(offset(inlined_source, "left /"), info.stack[0].position);
   CHECK_EQ(script_id, info.stack[1].script_id);
   CHECK_EQ(offset(source, "opt_function(left,"), info.stack[1].position);
   CHECK_EQ(offset(source, "test2(left, right);"), info.stack[2].position);
 
   iprofiler->DeleteProfile(iprofile);
 }
@@ skipping 37 matching lines @@
   iprofile->Print();
   v8::CpuProfile* profile = reinterpret_cast<v8::CpuProfile*>(iprofile);
 
   const char* branch[] = {"", "test"};
   const ProfileNode* itest_node =
       GetSimpleBranch(profile, branch, arraysize(branch));
   CHECK_EQ(0, itest_node->deopt_infos().size());
 
   iprofiler->DeleteProfile(iprofile);
 }