Chromium Code Reviews| Index: src/mark-compact.cc |
| diff --git a/src/mark-compact.cc b/src/mark-compact.cc |
| index a62196e3806df1a16cee82a702333f0ea8dcc5ae..39efd2529959d7f4bf1bac5e236488788d9ab5b6 100644 |
| --- a/src/mark-compact.cc |
| +++ b/src/mark-compact.cc |
| @@ -27,11 +27,11 @@ |
| #include "v8.h" |
| +#include "code-events.h" |
| #include "code-stubs.h" |
| #include "compilation-cache.h" |
| #include "deoptimizer.h" |
| #include "execution.h" |
| -#include "gdb-jit.h" |
| #include "global-handles.h" |
| #include "heap-profiler.h" |
| #include "ic-inl.h" |
| @@ -689,7 +689,8 @@ void MarkCompactCollector::Prepare(GCTracer* tracer) { |
| #ifdef ENABLE_GDB_JIT_INTERFACE |
| if (FLAG_gdbjit) { |
| // If GDBJIT interface is active disable compaction. |
| - compacting_collection_ = false; |
| + // DO NOT SUBMIT. |
|
danno
2012/07/25 13:50:42
Is this left-over debug code?
Sigurður Ásgeirsson
2012/07/25 14:38:35
This and the other crud was my initial attempt at
|
| + FLAG_never_compact = true; |
| } |
| #endif |
| @@ -2822,6 +2823,7 @@ void MarkCompactCollector::MigrateObject(Address dst, |
| } |
| } else if (dest == CODE_SPACE) { |
| PROFILE(heap()->isolate(), CodeMoveEvent(src, dst)); |
| + JIT_CODE_EVENT(MoveCode(src, dst)); |
| heap()->MoveBlock(dst, src, size); |
| SlotsBuffer::AddTo(&slots_buffer_allocator_, |
| &migration_slots_buffer_, |
| @@ -4129,13 +4131,9 @@ void MarkCompactCollector::EnableCodeFlushing(bool enable) { |
| // code objects. We should either reenable it or change our tools. |
| void MarkCompactCollector::ReportDeleteIfNeeded(HeapObject* obj, |
| Isolate* isolate) { |
| -#ifdef ENABLE_GDB_JIT_INTERFACE |
| - if (obj->IsCode()) { |
| - GDBJITInterface::RemoveCode(reinterpret_cast<Code*>(obj)); |
| - } |
| -#endif |
| if (obj->IsCode()) { |
| PROFILE(isolate, CodeDeleteEvent(obj->address())); |
| + JIT_CODE_EVENT(RemoveCode(reinterpret_cast<Code*>(obj))); |
| } |
| } |