Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(755)

Unified Diff: src/mark-compact.cc

Issue 10829368: fix gdbjit (Closed)
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« src/gdb-jit.cc ('K') | « src/gdb-jit.cc ('k') | tools/gyp/v8.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/mark-compact.cc
diff --git a/src/mark-compact.cc b/src/mark-compact.cc
index b3a0bf7df1efc88a031db73a1c40fb7cfe830751..5dac99c7b7f5cc44d7ecaf736e4d146687bd0962 100644
--- a/src/mark-compact.cc
+++ b/src/mark-compact.cc
@@ -777,13 +777,6 @@ void MarkCompactCollector::Prepare(GCTracer* tracer) {
ASSERT(!FLAG_never_compact || !FLAG_always_compact);
-#ifdef ENABLE_GDB_JIT_INTERFACE
- if (FLAG_gdbjit) {
- // If GDBJIT interface is active disable compaction.
- compacting_collection_ = false;
- }
-#endif
-
// Clear marking bits if incremental marking is aborted.
if (was_marked_incrementally_ && abort_incremental_marking_) {
heap()->incremental_marking()->Abort();
@@ -792,9 +785,15 @@ void MarkCompactCollector::Prepare(GCTracer* tracer) {
was_marked_incrementally_ = false;
}
+ bool never_compact = FLAG_never_compact;
+
+#ifdef ENABLE_GDB_JIT_INTERFACE
+ never_compact = never_compact || FLAG_gdbjit;
+#endif
+
// Don't start compaction if we are in the middle of incremental
// marking cycle. We did not collect any slots.
- if (!FLAG_never_compact && !was_marked_incrementally_) {
+ if (!never_compact && !was_marked_incrementally_) {
StartCompaction(NON_INCREMENTAL_COMPACTION);
}
« src/gdb-jit.cc ('K') | « src/gdb-jit.cc ('k') | tools/gyp/v8.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698