@@ -270,7 +270,7 @@ class PerfBasicLogger : public CodeEventLogger {
270270 PerfBasicLogger ();
271271 ~PerfBasicLogger () override ;
272272
273- void CodeMoveEvent (AbstractCode* from, Address to) override {}
273+ void CodeMoveEvent (AbstractCode* from, AbstractCode* to) override {}
274274 void CodeDisableOptEvent (AbstractCode* code,
275275 SharedFunctionInfo* shared) override {}
276276
@@ -492,7 +492,7 @@ class LowLevelLogger : public CodeEventLogger {
492492 explicit LowLevelLogger (const char * file_name);
493493 ~LowLevelLogger () override ;
494494
495- void CodeMoveEvent (AbstractCode* from, Address to) override ;
495+ void CodeMoveEvent (AbstractCode* from, AbstractCode* to) override ;
496496 void CodeDisableOptEvent (AbstractCode* code,
497497 SharedFunctionInfo* shared) override {}
498498 void SnapshotPositionEvent (HeapObject* obj, int pos);
@@ -610,11 +610,10 @@ void LowLevelLogger::LogRecordedBuffer(const wasm::WasmCode* code,
610610 code->instructions ().length ());
611611}
612612
613- void LowLevelLogger::CodeMoveEvent (AbstractCode* from, Address to) {
613+ void LowLevelLogger::CodeMoveEvent (AbstractCode* from, AbstractCode* to) {
614614 CodeMoveStruct event;
615615 event.from_address = from->InstructionStart ();
616- size_t header_size = from->InstructionStart () - from->address ();
617- event.to_address = to + header_size;
616+ event.to_address = to->InstructionStart ();
618617 LogWriteStruct (event);
619618}
620619
@@ -636,7 +635,7 @@ class JitLogger : public CodeEventLogger {
636635 public:
637636 explicit JitLogger (JitCodeEventHandler code_event_handler);
638637
639- void CodeMoveEvent (AbstractCode* from, Address to) override ;
638+ void CodeMoveEvent (AbstractCode* from, AbstractCode* to) override ;
640639 void CodeDisableOptEvent (AbstractCode* code,
641640 SharedFunctionInfo* shared) override {}
642641 void AddCodeLinePosInfoEvent (void * jit_handler_data, int pc_offset,
@@ -694,7 +693,7 @@ void JitLogger::LogRecordedBuffer(const wasm::WasmCode* code, const char* name,
694693 code_event_handler_ (&event);
695694}
696695
697- void JitLogger::CodeMoveEvent (AbstractCode* from, Address to) {
696+ void JitLogger::CodeMoveEvent (AbstractCode* from, AbstractCode* to) {
698697 base::LockGuard<base::Mutex> guard (&logger_mutex_);
699698
700699 JitCodeEvent event;
@@ -703,12 +702,7 @@ void JitLogger::CodeMoveEvent(AbstractCode* from, Address to) {
703702 from->IsCode () ? JitCodeEvent::JIT_CODE : JitCodeEvent::BYTE_CODE;
704703 event.code_start = reinterpret_cast <void *>(from->InstructionStart ());
705704 event.code_len = from->InstructionSize ();
706-
707- // Calculate the header size.
708- const size_t header_size = from->InstructionStart () - from->address ();
709-
710- // Calculate the new start address of the instructions.
711- event.new_code_start = reinterpret_cast <void *>(to + header_size);
705+ event.new_code_start = reinterpret_cast <void *>(to->InstructionStart ());
712706
713707 code_event_handler_ (&event);
714708}
@@ -1450,9 +1444,10 @@ void Logger::RegExpCodeCreateEvent(AbstractCode* code, String* source) {
14501444 msg.WriteToLogFile ();
14511445}
14521446
1453- void Logger::CodeMoveEvent (AbstractCode* from, Address to) {
1447+ void Logger::CodeMoveEvent (AbstractCode* from, AbstractCode* to) {
14541448 if (!is_listening_to_code_events ()) return ;
1455- MoveEventInternal (CodeEventListener::CODE_MOVE_EVENT, from->address (), to);
1449+ MoveEventInternal (CodeEventListener::CODE_MOVE_EVENT, from->address (),
1450+ to->address ());
14561451}
14571452
14581453namespace {
0 commit comments