Use source position table for unoptimized code.

src/profiler/profiler-listener.cc

 // Copyright 2016 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/profiler-listener.h"
 
 #include "src/deoptimizer.h"
-#include "src/interpreter/source-position-table.h"
 #include "src/profiler/cpu-profiler.h"
 #include "src/profiler/profile-generator-inl.h"
+#include "src/source-position-table.h"
 
 namespace v8 {
 namespace internal {
 
 ProfilerListener::ProfilerListener(Isolate* isolate)
     : function_and_resource_names_(isolate->heap()) {}
 
 ProfilerListener::~ProfilerListener() {
   for (auto code_entry : code_entries_) {
     delete code_entry;
@@ skipping 59 matching lines @@
                                        AbstractCode* abstract_code,
                                        SharedFunctionInfo* shared,
                                        Name* script_name, int line,
                                        int column) {
   CodeEventsContainer evt_rec(CodeEventRecord::CODE_CREATION);
   CodeCreateEventRecord* rec = &evt_rec.CodeCreateEventRecord_;
   rec->start = abstract_code->address();
   Script* script = Script::cast(shared->script());
   JITLineInfoTable* line_table = NULL;
   if (script) {
+    line_table = new JITLineInfoTable();
     if (abstract_code->IsCode()) {
       Code* code = abstract_code->GetCode();
       int start_position = shared->start_position();
       int end_position = shared->end_position();
-      line_table = new JITLineInfoTable();
-      for (RelocIterator it(code); !it.done(); it.next()) {
-        RelocInfo* reloc_info = it.rinfo();
-        if (!RelocInfo::IsPosition(reloc_info->rmode())) continue;
-        int position = static_cast<int>(reloc_info->data());
-        // TODO(alph): in case of inlining the position may correspond
-        // to an inlined function source code. Do not collect positions
-        // that fall beyond the function source code. There's however a
-        // chance the inlined function has similar positions but in another
-        // script. So the proper fix is to store script_id in some form
-        // along with the inlined function positions.
-        if (position < start_position || position >= end_position) continue;
-        int pc_offset = static_cast<int>(reloc_info->pc() - code->address());
-        int line_number = script->GetLineNumber(position) + 1;
-        line_table->SetPosition(pc_offset, line_number);
+      if (code->kind() == Code::FUNCTION) {
+        SourcePositionTableIterator it(code->source_position_table());
+        for (; !it.done(); it.Advance()) {
+          int line_number = script->GetLineNumber(it.source_position()) + 1;
+          int pc_offset = it.code_offset() + BytecodeArray::kHeaderSize;
+          line_table->SetPosition(pc_offset, line_number);
+        }
+      } else {
+        for (RelocIterator it(code); !it.done(); it.next()) {
+          RelocInfo* reloc_info = it.rinfo();
+          if (!RelocInfo::IsPosition(reloc_info->rmode())) continue;
+          int position = static_cast<int>(reloc_info->data());
+          // TODO(alph): in case of inlining the position may correspond to an
+          // inlined function source code. Do not collect positions that fall
+          // beyond the function source code. There's however a chance the
+          // inlined function has similar positions but in another script. So
+          // the proper fix is to store script_id in some form along with the
+          // inlined function positions.
+          if (position < start_position || position >= end_position) continue;
+          int pc_offset = static_cast<int>(reloc_info->pc() - code->address());
+          int line_number = script->GetLineNumber(position) + 1;
+          line_table->SetPosition(pc_offset, line_number);
+        }
       }
     } else {
       BytecodeArray* bytecode = abstract_code->GetBytecodeArray();
-      line_table = new JITLineInfoTable();
-      interpreter::SourcePositionTableIterator it(
-          bytecode->source_position_table());
+      SourcePositionTableIterator it(bytecode->source_position_table());
       for (; !it.done(); it.Advance()) {
         int line_number = script->GetLineNumber(it.source_position()) + 1;
-        int pc_offset = it.bytecode_offset() + BytecodeArray::kHeaderSize;
+        int pc_offset = it.code_offset() + BytecodeArray::kHeaderSize;
         line_table->SetPosition(pc_offset, line_number);
       }
     }
   }
   rec->entry = NewCodeEntry(
       tag, GetFunctionName(shared->DebugName()), CodeEntry::kEmptyNamePrefix,
       GetName(InferScriptName(script_name, shared)), line, column, line_table,
       abstract_code->instruction_start());
   RecordInliningInfo(rec->entry, abstract_code);
   RecordDeoptInlinedFrames(rec->entry, abstract_code);
@@ skipping 202 matching lines @@
 }
 
 void ProfilerListener::RemoveObserver(CodeEventObserver* observer) {
   auto it = std::find(observers_.begin(), observers_.end(), observer);
   if (it == observers_.end()) return;
   observers_.erase(it);
 }
 
 }  // namespace internal
 }  // namespace v8