CPUProfiler: Improve line numbers support in profiler.

src/log.cc

 // Copyright 2011 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 1636 matching lines @@
     if (obj->IsCode()) LogCodeObject(obj);
   }
 }
 
 
 void Logger::LogExistingFunction(Handle<SharedFunctionInfo> shared,
                                  Handle<Code> code) {
   Handle<String> func_name(shared->DebugName());
   if (shared->script()->IsScript()) {
     Handle<Script> script(Script::cast(shared->script()));
+    int line_num = GetScriptLineNumber(script, shared->start_position());
     if (script->name()->IsString()) {
       Handle<String> script_name(String::cast(script->name()));
-      int line_num = GetScriptLineNumber(script, shared->start_position());
-      if (line_num > 0) {
+      if (line_num >= 0) {
         PROFILE(isolate_,
                 CodeCreateEvent(
                     Logger::ToNativeByScript(Logger::LAZY_COMPILE_TAG, *script),
                     *code, *shared, NULL,
                     *script_name, line_num + 1));
       } else {
-        // Can't distinguish eval and script here, so always use Script.

[yurys, 2013/07/05 13:10:00]

Revert this line?

[loislo, 2013/07/05 13:15:37]

Done.

         PROFILE(isolate_,
                 CodeCreateEvent(
                     Logger::ToNativeByScript(Logger::SCRIPT_TAG, *script),
                     *code, *shared, NULL, *script_name));
       }
     } else {
       PROFILE(isolate_,
               CodeCreateEvent(
                   Logger::ToNativeByScript(Logger::LAZY_COMPILE_TAG, *script),
-                  *code, *shared, NULL, *func_name));
+                  *code, *shared, NULL,
+                  isolate_->heap()->empty_string(), line_num + 1));

[yurys, 2013/07/05 13:10:00]

You can do line_num = line_num + 1 once outside if block.

[loislo, 2013/07/05 13:15:37]

Done.

     }
   } else if (shared->IsApiFunction()) {
     // API function.
     FunctionTemplateInfo* fun_data = shared->get_api_func_data();
     Object* raw_call_data = fun_data->call_code();
     if (!raw_call_data->IsUndefined()) {
       CallHandlerInfo* call_data = CallHandlerInfo::cast(raw_call_data);
       Object* callback_obj = call_data->callback();
       Address entry_point = v8::ToCData<Address>(callback_obj);
       PROFILE(isolate_, CallbackEvent(*func_name, entry_point));
@@ skipping 122 matching lines @@
     profiler_ = NULL;
   }
 
   delete ticker_;
   ticker_ = NULL;
 
   return log_->Close();
 }
 
 } }  // namespace v8::internal