Fix unexpected stack traces in test-cpu-profiler/JsNativeJsSample

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 393 matching lines @@
   v8::Local<v8::String> profile_name = v8::String::New("test");
   cpu_profiler->StartCpuProfiling(profile_name);
   const v8::CpuProfile* profile = cpu_profiler->StopCpuProfiling(profile_name);
   CHECK(profile->GetStartTime() <= profile->GetEndTime());
 }
 
 
 static const v8::CpuProfile* RunProfiler(
     LocalContext& env, v8::Handle<v8::Function> function,
     v8::Handle<v8::Value> argv[], int argc,
-    unsigned min_js_samples, bool script_will_start_profiler = false) {
+    unsigned min_js_samples) {
   v8::CpuProfiler* cpu_profiler = env->GetIsolate()->GetCpuProfiler();
   v8::Local<v8::String> profile_name = v8::String::New("my_profile");
 
-  if (!script_will_start_profiler) {
-    cpu_profiler->StartCpuProfiling(profile_name);
-  }
+  cpu_profiler->StartCpuProfiling(profile_name);
 
   i::Sampler* sampler =
       reinterpret_cast<i::Isolate*>(env->GetIsolate())->logger()->sampler();
   sampler->StartCountingSamples();
   do {
     function->Call(env->Global(), argc, argv);
   } while (sampler->js_and_external_sample_count() < min_js_samples);
 
   const v8::CpuProfile* profile = cpu_profiler->StopCpuProfiling(profile_name);
 
@@ skipping 706 matching lines @@
   func->SetName(v8::String::New("CallJsFunction"));
   env->Global()->Set(v8::String::New("CallJsFunction"), func);
 
   v8::Script::Compile(v8::String::New(js_native_js_test_source))->Run();
   v8::Local<v8::Function> function = v8::Local<v8::Function>::Cast(
       env->Global()->Get(v8::String::New("start")));
 
   int32_t duration_ms = 20;
   v8::Handle<v8::Value> args[] = { v8::Integer::New(duration_ms) };
   const v8::CpuProfile* profile =
-      RunProfiler(env, function, args, ARRAY_SIZE(args), 10, true);
+      RunProfiler(env, function, args, ARRAY_SIZE(args), 10);
 
   const v8::CpuProfileNode* root = profile->GetTopDownRoot();
   {
     ScopedVector<v8::Handle<v8::String> > names(3);
     names[0] = v8::String::New(ProfileGenerator::kGarbageCollectorEntryName);
     names[1] = v8::String::New(ProfileGenerator::kProgramEntryName);
     names[2] = v8::String::New("start");
     CheckChildrenNames(root, names);
   }
 
@@ skipping 58 matching lines @@
   env->Global()->Set(v8::String::New("CallJsFunction"), func);
 
   v8::Script::Compile(v8::String::New(js_native_js_runtime_js_test_source))->
       Run();
   v8::Local<v8::Function> function = v8::Local<v8::Function>::Cast(
       env->Global()->Get(v8::String::New("start")));
 
   int32_t duration_ms = 20;
   v8::Handle<v8::Value> args[] = { v8::Integer::New(duration_ms) };
   const v8::CpuProfile* profile =
-      RunProfiler(env, function, args, ARRAY_SIZE(args), 10, true);
+      RunProfiler(env, function, args, ARRAY_SIZE(args), 10);
 
   const v8::CpuProfileNode* root = profile->GetTopDownRoot();
   ScopedVector<v8::Handle<v8::String> > names(3);
   names[0] = v8::String::New(ProfileGenerator::kGarbageCollectorEntryName);
   names[1] = v8::String::New(ProfileGenerator::kProgramEntryName);
   names[2] = v8::String::New("start");
   CheckChildrenNames(root, names);
 
   const v8::CpuProfileNode* startNode = GetChild(root, "start");
   CHECK_EQ(1, startNode->GetChildrenCount());
@@ skipping 66 matching lines @@
   env->Global()->Set(v8::String::New("CallJsFunction2"), func2);
 
   v8::Script::Compile(v8::String::New(js_native1_js_native2_js_test_source))->
       Run();
   v8::Local<v8::Function> function = v8::Local<v8::Function>::Cast(
       env->Global()->Get(v8::String::New("start")));
 
   int32_t duration_ms = 20;
   v8::Handle<v8::Value> args[] = { v8::Integer::New(duration_ms) };
   const v8::CpuProfile* profile =
-      RunProfiler(env, function, args, ARRAY_SIZE(args), 10, true);
+      RunProfiler(env, function, args, ARRAY_SIZE(args), 10);
 
   const v8::CpuProfileNode* root = profile->GetTopDownRoot();
   ScopedVector<v8::Handle<v8::String> > names(3);
   names[0] = v8::String::New(ProfileGenerator::kGarbageCollectorEntryName);
   names[1] = v8::String::New(ProfileGenerator::kProgramEntryName);
   names[2] = v8::String::New("start");
   CheckChildrenNames(root, names);
 
   const v8::CpuProfileNode* startNode = GetChild(root, "start");
   CHECK_EQ(1, startNode->GetChildrenCount());
@@ skipping 111 matching lines @@
       ProfileGenerator::kAnonymousFunctionName);
   CheckFunctionDetails(script, ProfileGenerator::kAnonymousFunctionName,
       "script_b", script_b->GetId(), 1, 1);
   const v8::CpuProfileNode* baz = GetChild(script, "baz");
   CheckFunctionDetails(baz, "baz", "script_b", script_b->GetId(), 3, 16);
   const v8::CpuProfileNode* foo = GetChild(baz, "foo");
   CheckFunctionDetails(foo, "foo", "script_a", script_a->GetId(), 2, 1);
   const v8::CpuProfileNode* bar = GetChild(foo, "bar");
   CheckFunctionDetails(bar, "bar", "script_a", script_a->GetId(), 3, 14);
 }