From 29abaf4aad7bc736f9f8fb6225b86748efccfcf4 Mon Sep 17 00:00:00 2001
From: "loislo@chromium.org"
 <loislo@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Wed, 12 Jun 2013 08:27:24 +0000
Subject: [PATCH] DevTools: CPUProfiler: provide url for scripts that have
 sourceURL property.

BUG=none
TEST=SourceURLSupportForNewFunctions, LogExistingFunctionSourceURLCheck
R=jkummerow@chromium.org, yurys@chromium.org

Review URL: https://codereview.chromium.org/16035027

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@15074 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---
 src/compiler.cc                  | 11 ++++-
 src/handles.cc                   |  3 ++
 src/log.cc                       | 12 ++++-
 test/cctest/test-cpu-profiler.cc | 76 ++++++++++++++++++++++++++++++++
 4 files changed, 99 insertions(+), 3 deletions(-)

diff --git a/src/compiler.cc b/src/compiler.cc
index 5fc107f943..b1f823466c 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -1141,7 +1141,16 @@ void Compiler::RecordFunctionCompilation(Logger::LogEventsAndTags tag,
     Handle<Code> code = info->code();
     if (*code == info->isolate()->builtins()->builtin(Builtins::kLazyCompile))
       return;
+    Handle<String> script_name;
     if (script->name()->IsString()) {
+      script_name = Handle<String>(String::cast(script->name()));
+    } else {
+      Handle<Object> name = GetScriptNameOrSourceURL(script);
+      if (!name.is_null() && name->IsString()) {
+        script_name = Handle<String>::cast(name);
+      }
+    }
+    if (!script_name.is_null()) {
       int line_num = GetScriptLineNumber(script, shared->start_position()) + 1;
       USE(line_num);
       PROFILE(info->isolate(),
@@ -1149,7 +1158,7 @@ void Compiler::RecordFunctionCompilation(Logger::LogEventsAndTags tag,
                               *code,
                               *shared,
                               info,
-                              String::cast(script->name()),
+                              String::cast(*script_name),
                               line_num));
     } else {
       PROFILE(info->isolate(),
diff --git a/src/handles.cc b/src/handles.cc
index 81828d98cc..658bb2a2a2 100644
--- a/src/handles.cc
+++ b/src/handles.cc
@@ -599,6 +599,9 @@ v8::Handle<v8::Array> GetKeysForIndexedInterceptor(Handle<JSReceiver> receiver,
 
 Handle<Object> GetScriptNameOrSourceURL(Handle<Script> script) {
   Isolate* isolate = script->GetIsolate();
+  if (!isolate->IsInitialized()) {
+    return isolate->factory()->undefined_value();
+  }
   Handle<String> name_or_source_url_key =
       isolate->factory()->InternalizeOneByteString(
           STATIC_ASCII_VECTOR("nameOrSourceURL"));
diff --git a/src/log.cc b/src/log.cc
index 610a63b37a..c653c14976 100644
--- a/src/log.cc
+++ b/src/log.cc
@@ -1728,10 +1728,18 @@ void Logger::LogExistingFunction(Handle<SharedFunctionInfo> shared,
   Handle<String> func_name(shared->DebugName());
   if (shared->script()->IsScript()) {
     Handle<Script> script(Script::cast(shared->script()));
+    Handle<String> script_name;
     if (script->name()->IsString()) {
-      Handle<String> script_name(String::cast(script->name()));
+      script_name = Handle<String>(String::cast(script->name()));
+    } else {
+      Handle<Object> name = GetScriptNameOrSourceURL(script);
+      if (!name.is_null() && name->IsString()) {
+        script_name = Handle<String>::cast(name);
+      }
+    }
+    if (!script_name.is_null()) {
       int line_num = GetScriptLineNumber(script, shared->start_position());
-      if (line_num > 0) {
+      if (line_num > -1) {
         PROFILE(isolate_,
                 CodeCreateEvent(
                     Logger::ToNativeByScript(Logger::LAZY_COMPILE_TAG, *script),
diff --git a/test/cctest/test-cpu-profiler.cc b/test/cctest/test-cpu-profiler.cc
index a615fe954e..e351407495 100644
--- a/test/cctest/test-cpu-profiler.cc
+++ b/test/cctest/test-cpu-profiler.cc
@@ -917,3 +917,79 @@ TEST(NativeMethodMonomorphicIC) {
 
   cpu_profiler->DeleteAllCpuProfiles();
 }
+
+
+static const char* cpu_profiler_sourceURL_source =
+"function start(timeout) {\n"
+"  var start = Date.now();\n"
+"  var duration = 0;\n"
+"  do {\n"
+"    try {\n"
+"      duration = Date.now() - start;\n"
+"    } catch(e) { }\n"
+"  } while (duration < timeout);\n"
+"  return duration;\n"
+"}\n"
+"//# sourceURL=cpu_profiler_sourceURL_source.js";
+
+
+TEST(SourceURLSupportForNewFunctions) {
+  LocalContext env;
+  v8::HandleScope scope(env->GetIsolate());
+
+  v8::Script::Compile(v8::String::New(cpu_profiler_sourceURL_source))->Run();
+  v8::Local<v8::Function> function = v8::Local<v8::Function>::Cast(
+      env->Global()->Get(v8::String::New("start")));
+  v8::CpuProfiler* cpu_profiler = env->GetIsolate()->GetCpuProfiler();
+  int32_t profiling_interval_ms = 100;
+
+  // Cold run.
+  v8::Local<v8::String> profile_name = v8::String::New("my_profile");
+  cpu_profiler->StartCpuProfiling(profile_name);
+  v8::Handle<v8::Value> args[] = { v8::Integer::New(profiling_interval_ms) };
+  function->Call(env->Global(), ARRAY_SIZE(args), args);
+  const v8::CpuProfile* profile = cpu_profiler->StopCpuProfiling(profile_name);
+  CHECK_NE(NULL, profile);
+
+  // Dump collected profile to have a better diagnostic in case of failure.
+  reinterpret_cast<i::CpuProfile*>(
+      const_cast<v8::CpuProfile*>(profile))->Print();
+  const v8::CpuProfileNode* root = profile->GetTopDownRoot();
+  const v8::CpuProfileNode* startNode = GetChild(root, "start");
+
+  CHECK_EQ(v8::String::New("cpu_profiler_sourceURL_source.js"),
+           startNode->GetScriptResourceName());
+
+  cpu_profiler->DeleteAllCpuProfiles();
+}
+
+TEST(LogExistingFunctionSourceURLCheck) {
+  LocalContext env;
+  v8::HandleScope scope(env->GetIsolate());
+
+  v8::Script::Compile(v8::String::New(cpu_profiler_sourceURL_source))->Run();
+  v8::Local<v8::Function> function = v8::Local<v8::Function>::Cast(
+      env->Global()->Get(v8::String::New("start")));
+  v8::CpuProfiler* cpu_profiler = env->GetIsolate()->GetCpuProfiler();
+  int32_t profiling_interval_ms = 100;
+
+  // Warm up.
+  v8::Handle<v8::Value> args[] = { v8::Integer::New(profiling_interval_ms) };
+  function->Call(env->Global(), ARRAY_SIZE(args), args);
+
+  v8::Local<v8::String> profile_name = v8::String::New("my_profile");
+  cpu_profiler->StartCpuProfiling(profile_name);
+  function->Call(env->Global(), ARRAY_SIZE(args), args);
+  const v8::CpuProfile* profile = cpu_profiler->StopCpuProfiling(profile_name);
+  CHECK_NE(NULL, profile);
+
+  // Dump collected profile to have a better diagnostic in case of failure.
+  reinterpret_cast<i::CpuProfile*>(
+      const_cast<v8::CpuProfile*>(profile))->Print();
+  const v8::CpuProfileNode* root = profile->GetTopDownRoot();
+  const v8::CpuProfileNode* startNode = GetChild(root, "start");
+  CHECK_EQ(v8::String::New("cpu_profiler_sourceURL_source.js"),
+           startNode->GetScriptResourceName());
+
+  cpu_profiler->DeleteAllCpuProfiles();
+}