AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[logging] Specify CodeEvent when logging CodeLinePosInfo

Browse Source 
In gdbbjit's event handler, we return early if code_type is not
JIT_CODE. Unfortunately, in all CodeLinePosInfo event, we memset the
struct, so code_type is always BYTE_CODE, so no line information was
getting saved.

Drive-by clean up to aggregate initialize JitCodeEvent. Since the
initializer list is empty, all members are value-initialized, and in
this case, zero-initialized.

Bug: v8:12035
Change-Id: I67df2688f13fafbb0806546568eb2574ac8d5e2e
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3071909
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Ross McIlroy <rmcilroy@chromium.org>
Commit-Queue: Zhi An Ng <zhin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#76179}
This commit is contained in:
Ng Zhi An 2021-08-04 16:58:39 -07:00 committed by V8 LUCI CQ
parent 16d9a1eb38
commit 688b3b2163
7 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/backend/code-generator.cc
View File

@ -601,9 +601,9 @@ MaybeHandle<Code> CodeGenerator::FinalizeCode() {
isolate()->counters()->total_compiled_code_size()->Increment(
code->raw_body_size());
LOG_CODE_EVENT(isolate(),
CodeLinePosInfoRecordEvent(code->raw_instruction_start(),
*source_positions));
LOG_CODE_EVENT(isolate(), CodeLinePosInfoRecordEvent(
code->raw_instruction_start(),
*source_positions, JitCodeEvent::JIT_CODE));
return code;
}

3
src/debug/liveedit.cc
View File

@ -950,7 +950,8 @@ void TranslateSourcePositionTable(Isolate* isolate, Handle<BytecodeArray> code,
code->set_source_position_table(*new_source_position_table, kReleaseStore);
LOG_CODE_EVENT(isolate,
CodeLinePosInfoRecordEvent(code->GetFirstBytecodeAddress(),
*new_source_position_table));
*new_source_position_table,
JitCodeEvent::BYTE_CODE));
}
void UpdatePositions(Isolate* isolate, Handle<SharedFunctionInfo> sfi,

2
src/interpreter/bytecode-generator.cc
View File

@ -1246,7 +1246,7 @@ Handle<ByteArray> BytecodeGenerator::FinalizeSourcePositionTable(
LOG_CODE_EVENT(isolate,
CodeLinePosInfoRecordEvent(
info_->bytecode_array()->GetFirstBytecodeAddress(),
*source_position_table));
*source_position_table, JitCodeEvent::BYTE_CODE));
return source_position_table;
}

6
src/logging/local-logger.cc
View File

@ -24,8 +24,10 @@ void LocalLogger::ScriptEvent(Logger::ScriptEventType type, int script_id) {
logger_->ScriptEvent(type, script_id);
}
void LocalLogger::CodeLinePosInfoRecordEvent(Address code_start,
ByteArray source_position_table) {
logger_->CodeLinePosInfoRecordEvent(code_start, source_position_table);
ByteArray source_position_table,
JitCodeEvent::CodeType code_type) {
logger_->CodeLinePosInfoRecordEvent(code_start, source_position_table,
code_type);
}
void LocalLogger::MapCreate(Map map) { logger_->MapCreate(map); }

3
src/logging/local-logger.h
View File

@ -23,7 +23,8 @@ class LocalLogger {
void ScriptDetails(Script script);
void ScriptEvent(Logger::ScriptEventType type, int script_id);
void CodeLinePosInfoRecordEvent(Address code_start,
ByteArray source_position_table);
ByteArray source_position_table,
JitCodeEvent::CodeType code_type);
void MapCreate(Map map);
void MapDetails(Map map);

53
src/logging/log.cc
View File

@ -681,10 +681,12 @@ class JitLogger : public CodeEventLogger {
Handle<SharedFunctionInfo> shared) override {}
void AddCodeLinePosInfoEvent(void* jit_handler_data, int pc_offset,
int position,
JitCodeEvent::PositionType position_type);
JitCodeEvent::PositionType position_type,
JitCodeEvent::CodeType code_type);
void* StartCodePosInfoEvent();
void EndCodePosInfoEvent(Address start_address, void* jit_handler_data);
void* StartCodePosInfoEvent(JitCodeEvent::CodeType code_type);
void EndCodePosInfoEvent(Address start_address, void* jit_handler_data,
JitCodeEvent::CodeType code_type);
private:
void LogRecordedBuffer(Handle<AbstractCode> code,
@ -705,8 +707,7 @@ JitLogger::JitLogger(Isolate* isolate, JitCodeEventHandler code_event_handler)
void JitLogger::LogRecordedBuffer(Handle<AbstractCode> code,
MaybeHandle<SharedFunctionInfo> maybe_shared,
const char* name, int length) {
JitCodeEvent event;
memset(static_cast<void*>(&event), 0, sizeof(event));
JitCodeEvent event = {};
event.type = JitCodeEvent::CODE_ADDED;
event.code_start = reinterpret_cast<void*>(code->InstructionStart());
event.code_type =
@ -727,8 +728,7 @@ void JitLogger::LogRecordedBuffer(Handle<AbstractCode> code,
#if V8_ENABLE_WEBASSEMBLY
void JitLogger::LogRecordedBuffer(const wasm::WasmCode* code, const char* name,
int length) {
JitCodeEvent event;
memset(static_cast<void*>(&event), 0, sizeof(event));
JitCodeEvent event = {};
event.type = JitCodeEvent::CODE_ADDED;
event.code_type = JitCodeEvent::JIT_CODE;
event.code_start = code->instructions().begin();
@ -793,10 +793,11 @@ void JitLogger::CodeMoveEvent(AbstractCode from, AbstractCode to) {
void JitLogger::AddCodeLinePosInfoEvent(
void* jit_handler_data, int pc_offset, int position,
JitCodeEvent::PositionType position_type) {
JitCodeEvent event;
memset(static_cast<void*>(&event), 0, sizeof(event));
JitCodeEvent::PositionType position_type,
JitCodeEvent::CodeType code_type) {
JitCodeEvent event = {};
event.type = JitCodeEvent::CODE_ADD_LINE_POS_INFO;
event.code_type = code_type;
event.user_data = jit_handler_data;
event.line_info.offset = pc_offset;
event.line_info.pos = position;
@ -806,10 +807,10 @@ void JitLogger::AddCodeLinePosInfoEvent(
code_event_handler_(&event);
}
void* JitLogger::StartCodePosInfoEvent() {
JitCodeEvent event;
memset(static_cast<void*>(&event), 0, sizeof(event));
void* JitLogger::StartCodePosInfoEvent(JitCodeEvent::CodeType code_type) {
JitCodeEvent event = {};
event.type = JitCodeEvent::CODE_START_LINE_INFO_RECORDING;
event.code_type = code_type;
event.isolate = reinterpret_cast<v8::Isolate*>(isolate_);
code_event_handler_(&event);
@ -817,10 +818,11 @@ void* JitLogger::StartCodePosInfoEvent() {
}
void JitLogger::EndCodePosInfoEvent(Address start_address,
void* jit_handler_data) {
JitCodeEvent event;
memset(static_cast<void*>(&event), 0, sizeof(event));
void* jit_handler_data,
JitCodeEvent::CodeType code_type) {
JitCodeEvent event = {};
event.type = JitCodeEvent::CODE_END_LINE_INFO_RECORDING;
event.code_type = code_type;
event.code_start = reinterpret_cast<void*>(start_address);
event.user_data = jit_handler_data;
event.isolate = reinterpret_cast<v8::Isolate*>(isolate_);
@ -1529,35 +1531,38 @@ void Logger::CodeDependencyChangeEvent(Handle<Code> code,
namespace {
void CodeLinePosEvent(JitLogger& jit_logger, Address code_start,
SourcePositionTableIterator& iter) {
void* jit_handler_data = jit_logger.StartCodePosInfoEvent();
SourcePositionTableIterator& iter,
JitCodeEvent::CodeType code_type) {
void* jit_handler_data = jit_logger.StartCodePosInfoEvent(code_type);
for (; !iter.done(); iter.Advance()) {
if (iter.is_statement()) {
jit_logger.AddCodeLinePosInfoEvent(jit_handler_data, iter.code_offset(),
iter.source_position().ScriptOffset(),
JitCodeEvent::STATEMENT_POSITION);
JitCodeEvent::STATEMENT_POSITION,
code_type);
}
jit_logger.AddCodeLinePosInfoEvent(jit_handler_data, iter.code_offset(),
iter.source_position().ScriptOffset(),
JitCodeEvent::POSITION);
JitCodeEvent::POSITION, code_type);
}
jit_logger.EndCodePosInfoEvent(code_start, jit_handler_data);
jit_logger.EndCodePosInfoEvent(code_start, jit_handler_data, code_type);
}
} // namespace
void Logger::CodeLinePosInfoRecordEvent(Address code_start,
ByteArray source_position_table) {
ByteArray source_position_table,
JitCodeEvent::CodeType code_type) {
if (!jit_logger_) return;
SourcePositionTableIterator iter(source_position_table);
CodeLinePosEvent(*jit_logger_, code_start, iter);
CodeLinePosEvent(*jit_logger_, code_start, iter, code_type);
}
void Logger::CodeLinePosInfoRecordEvent(
Address code_start, base::Vector<const byte> source_position_table) {
if (!jit_logger_) return;
SourcePositionTableIterator iter(source_position_table);
CodeLinePosEvent(*jit_logger_, code_start, iter);
CodeLinePosEvent(*jit_logger_, code_start, iter, JitCodeEvent::JIT_CODE);
}
void Logger::CodeNameEvent(Address addr, int pos, const char* code_name) {

3
src/logging/log.h
View File

@ -240,7 +240,8 @@ class Logger : public CodeEventListener {
// Emits a code line info record event.
void CodeLinePosInfoRecordEvent(Address code_start,
ByteArray source_position_table);
ByteArray source_position_table,
JitCodeEvent::CodeType code_type);
void CodeLinePosInfoRecordEvent(
Address code_start, base::Vector<const byte> source_position_table);