Index: src/profiler/profiler-listener.cc |
diff --git a/src/profiler/profiler-listener.cc b/src/profiler/profiler-listener.cc |
index 640f967e3d39595357194d762d72c00870a2e48d..ea85acfea9ebca6850353b190744d925d5596154 100644 |
--- a/src/profiler/profiler-listener.cc |
+++ b/src/profiler/profiler-listener.cc |
@@ -90,13 +90,18 @@ |
line_table = new JITLineInfoTable(); |
int offset = abstract_code->IsCode() ? Code::kHeaderSize |
: BytecodeArray::kHeaderSize; |
+ int start_position = shared->start_position(); |
+ int end_position = shared->end_position(); |
for (SourcePositionTableIterator it(abstract_code->source_position_table()); |
!it.done(); it.Advance()) { |
- // TODO(alph,tebbi) Skipping inlined positions for now, because they might |
- // refer to a different script. |
- if (it.source_position().InliningId() != SourcePosition::kNotInlined) |
- continue; |
int position = it.source_position().ScriptOffset(); |
+ // 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 line_number = script->GetLineNumber(position) + 1; |
int pc_offset = it.code_offset() + offset; |
line_table->SetPosition(pc_offset, line_number); |
@@ -151,6 +156,7 @@ |
Deoptimizer::DeoptInfo info = Deoptimizer::GetDeoptInfo(code, pc); |
rec->start = code->address(); |
rec->deopt_reason = DeoptimizeReasonToString(info.deopt_reason); |
+ rec->position = info.position; |
rec->deopt_id = info.deopt_id; |
rec->pc = reinterpret_cast<void*>(pc); |
rec->fp_to_sp_delta = fp_to_sp_delta; |
@@ -239,7 +245,8 @@ |
inline_stack.push_back(inline_entry); |
} |
if (!inline_stack.empty()) { |
- entry->AddInlineStack(pc_offset, std::move(inline_stack)); |
+ entry->AddInlineStack(pc_offset, inline_stack); |
+ DCHECK(inline_stack.empty()); |
} |
} |
} |
@@ -247,36 +254,55 @@ |
void ProfilerListener::RecordDeoptInlinedFrames(CodeEntry* entry, |
AbstractCode* abstract_code) { |
if (abstract_code->kind() != AbstractCode::OPTIMIZED_FUNCTION) return; |
- Handle<Code> code(abstract_code->GetCode()); |
- |
- SourcePosition last_position = SourcePosition::Unknown(); |
- int mask = RelocInfo::ModeMask(RelocInfo::DEOPT_ID) | |
- RelocInfo::ModeMask(RelocInfo::DEOPT_SCRIPT_OFFSET) | |
- RelocInfo::ModeMask(RelocInfo::DEOPT_INLINING_ID); |
- for (RelocIterator it(*code, mask); !it.done(); it.next()) { |
- RelocInfo* info = it.rinfo(); |
- if (info->rmode() == RelocInfo::DEOPT_SCRIPT_OFFSET) { |
- int script_offset = static_cast<int>(info->data()); |
- it.next(); |
- DCHECK(it.rinfo()->rmode() == RelocInfo::DEOPT_INLINING_ID); |
- int inlining_id = static_cast<int>(it.rinfo()->data()); |
- last_position = SourcePosition(script_offset, inlining_id); |
- continue; |
- } |
- if (info->rmode() == RelocInfo::DEOPT_ID) { |
- int deopt_id = static_cast<int>(info->data()); |
- DCHECK(last_position.IsKnown()); |
- std::vector<CpuProfileDeoptFrame> inlined_frames; |
- for (SourcePositionInfo& pos_info : last_position.InliningStack(code)) { |
- DCHECK(pos_info.position.ScriptOffset() != kNoSourcePosition); |
- size_t offset = static_cast<size_t>(pos_info.position.ScriptOffset()); |
- int script_id = Script::cast(pos_info.function->script())->id(); |
- inlined_frames.push_back(CpuProfileDeoptFrame({script_id, offset})); |
+ Code* code = abstract_code->GetCode(); |
+ DeoptimizationInputData* deopt_input_data = |
+ DeoptimizationInputData::cast(code->deoptimization_data()); |
+ int const mask = RelocInfo::ModeMask(RelocInfo::DEOPT_ID); |
+ for (RelocIterator rit(code, mask); !rit.done(); rit.next()) { |
+ RelocInfo* reloc_info = rit.rinfo(); |
+ DCHECK(RelocInfo::IsDeoptId(reloc_info->rmode())); |
+ int deopt_id = static_cast<int>(reloc_info->data()); |
+ int translation_index = |
+ deopt_input_data->TranslationIndex(deopt_id)->value(); |
+ TranslationIterator it(deopt_input_data->TranslationByteArray(), |
+ translation_index); |
+ Translation::Opcode opcode = static_cast<Translation::Opcode>(it.Next()); |
+ DCHECK_EQ(Translation::BEGIN, opcode); |
+ it.Skip(Translation::NumberOfOperandsFor(opcode)); |
+ std::vector<CodeEntry::DeoptInlinedFrame> inlined_frames; |
+ while (it.HasNext() && |
+ Translation::BEGIN != |
+ (opcode = static_cast<Translation::Opcode>(it.Next()))) { |
+ if (opcode != Translation::JS_FRAME && |
+ opcode != Translation::INTERPRETED_FRAME) { |
+ it.Skip(Translation::NumberOfOperandsFor(opcode)); |
+ continue; |
} |
- if (!inlined_frames.empty() && |
- !entry->HasDeoptInlinedFramesFor(deopt_id)) { |
- entry->AddDeoptInlinedFrames(deopt_id, std::move(inlined_frames)); |
+ BailoutId ast_id = BailoutId(it.Next()); |
+ int shared_info_id = it.Next(); |
+ it.Next(); // Skip height |
+ SharedFunctionInfo* shared = SharedFunctionInfo::cast( |
+ deopt_input_data->LiteralArray()->get(shared_info_id)); |
+ int source_position; |
+ if (opcode == Translation::INTERPRETED_FRAME) { |
+ source_position = |
+ Deoptimizer::ComputeSourcePositionFromBytecodeArray(shared, ast_id); |
+ } else { |
+ DCHECK(opcode == Translation::JS_FRAME); |
+ source_position = |
+ Deoptimizer::ComputeSourcePositionFromBaselineCode(shared, ast_id); |
} |
+ int script_id = v8::UnboundScript::kNoScriptId; |
+ if (shared->script()->IsScript()) { |
+ Script* script = Script::cast(shared->script()); |
+ script_id = script->id(); |
+ } |
+ CodeEntry::DeoptInlinedFrame frame = {source_position, script_id}; |
+ inlined_frames.push_back(frame); |
+ } |
+ if (!inlined_frames.empty() && !entry->HasDeoptInlinedFramesFor(deopt_id)) { |
+ entry->AddDeoptInlinedFrames(deopt_id, inlined_frames); |
+ DCHECK(inlined_frames.empty()); |
} |
} |
} |