Revision: 13075
Author: [email protected]
Date: Wed Nov 28 04:10:01 2012
Log: Merged r13072 into trunk branch.
Allow incremental marking when expose_gc is turned on.
[email protected]
Review URL: https://codereview.chromium.org/11419201
http://code.google.com/p/v8/source/detail?r=13075
Modified:
/trunk/src/extensions/gc-extension.cc
/trunk/src/heap.cc
/trunk/src/incremental-marking.cc
/trunk/src/version.cc
=======================================
--- /trunk/src/extensions/gc-extension.cc Wed Oct 31 03:02:10 2012
+++ /trunk/src/extensions/gc-extension.cc Wed Nov 28 04:10:01 2012
@@ -43,7 +43,7 @@
if (args[0]->BooleanValue()) {
HEAP->CollectGarbage(NEW_SPACE, "gc extension");
} else {
- HEAP->CollectAllGarbage(Heap::kNoGCFlags, "gc extension");
+ HEAP->CollectAllGarbage(Heap::kAbortIncrementalMarkingMask, "gc
extension");
}
return v8::Undefined();
}
=======================================
--- /trunk/src/heap.cc Mon Nov 26 06:53:56 2012
+++ /trunk/src/heap.cc Wed Nov 28 04:10:01 2012
@@ -5318,8 +5318,7 @@
AgeInlineCaches();
}
int mark_sweep_time = Min(TimeMarkSweepWouldTakeInMs(), 1000);
- if (hint >= mark_sweep_time && !FLAG_expose_gc &&
- incremental_marking()->IsStopped()) {
+ if (hint >= mark_sweep_time && incremental_marking()->IsStopped()) {
HistogramTimerScope scope(isolate_->counters()->gc_context());
CollectAllGarbage(kReduceMemoryFootprintMask,
"idle notification: contexts disposed");
@@ -5338,7 +5337,7 @@
return false;
}
- if (!FLAG_incremental_marking || FLAG_expose_gc ||
Serializer::enabled()) {
+ if (!FLAG_incremental_marking || Serializer::enabled()) {
return IdleGlobalGC();
}
=======================================
--- /trunk/src/incremental-marking.cc Fri Nov 23 06:36:46 2012
+++ /trunk/src/incremental-marking.cc Wed Nov 28 04:10:01 2012
@@ -493,8 +493,7 @@
static const intptr_t kActivationThreshold = 0;
#endif
- return !FLAG_expose_gc &&
- FLAG_incremental_marking &&
+ return FLAG_incremental_marking &&
!Serializer::enabled() &&
heap_->PromotedSpaceSizeOfObjects() > kActivationThreshold;
}
=======================================
--- /trunk/src/version.cc Mon Nov 26 06:53:56 2012
+++ /trunk/src/version.cc Wed Nov 28 04:10:01 2012
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 15
#define BUILD_NUMBER 6
-#define PATCH_LEVEL 0
+#define PATCH_LEVEL 1
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
