Revision: 18695
Author:   [email protected]
Date:     Mon Jan 20 15:44:03 2014 UTC
Log:      Update Isolate::RequestGarbageCollection after r18691

BUG=none
[email protected]
LOG=n

Review URL: https://codereview.chromium.org/143403002
http://code.google.com/p/v8/source/detail?r=18695

Modified:
 /branches/bleeding_edge/src/api.cc
 /branches/bleeding_edge/src/extensions/gc-extension.cc
 /branches/bleeding_edge/test/cctest/test-api.cc
 /branches/bleeding_edge/test/cctest/test-compiler.cc

=======================================
--- /branches/bleeding_edge/src/api.cc  Mon Jan 20 09:52:54 2014 UTC
+++ /branches/bleeding_edge/src/api.cc  Mon Jan 20 15:44:03 2014 UTC
@@ -6444,8 +6444,8 @@
   } else {
     ASSERT_EQ(kFullGarbageCollection, type);
     reinterpret_cast<i::Isolate*>(this)->heap()->CollectAllGarbage(
-        i::Heap::kNoGCFlags, "Isolate::RequestGarbageCollection",
-        kGCCallbackFlagForced);
+        i::Heap::kAbortIncrementalMarkingMask,
+        "Isolate::RequestGarbageCollection", kGCCallbackFlagForced);
   }
 }

=======================================
--- /branches/bleeding_edge/src/extensions/gc-extension.cc Mon Jan 20 14:14:07 2014 UTC +++ /branches/bleeding_edge/src/extensions/gc-extension.cc Mon Jan 20 15:44:03 2014 UTC
@@ -40,14 +40,9 @@


 void GCExtension::GC(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  i::Isolate* isolate = reinterpret_cast<i::Isolate*>(args.GetIsolate());
-  if (args[0]->BooleanValue()) {
-    isolate->heap()->CollectGarbage(
-        NEW_SPACE, "gc extension", v8::kGCCallbackFlagForced);
-  } else {
-    isolate->heap()->CollectAllGarbage(Heap::kAbortIncrementalMarkingMask,
-        "gc extension", v8::kGCCallbackFlagForced);
-  }
+  args.GetIsolate()->RequestGarbageCollectionForTesting(
+      args[0]->BooleanValue() ? v8::Isolate::kMinorGarbageCollection
+                              : v8::Isolate::kFullGarbageCollection);
 }

 } }  // namespace v8::internal
=======================================
--- /branches/bleeding_edge/test/cctest/test-api.cc Mon Jan 20 09:52:54 2014 UTC +++ /branches/bleeding_edge/test/cctest/test-api.cc Mon Jan 20 15:44:03 2014 UTC
@@ -7121,6 +7121,7 @@


 THREADED_TEST(WeakReference) {
+  i::FLAG_expose_gc = true;
   v8::Isolate* isolate = CcTest::isolate();
   v8::HandleScope handle_scope(isolate);
   v8::Handle<v8::ObjectTemplate> templ= v8::ObjectTemplate::New(isolate);
@@ -13479,6 +13480,7 @@
 TEST(DontLeakGlobalObjects) {
   // Regression test for issues 1139850 and 1174891.

+  i::FLAG_expose_gc = true;
   v8::V8::Initialize();

   for (int i = 0; i < 5; i++) {
=======================================
--- /branches/bleeding_edge/test/cctest/test-compiler.cc Fri Jan 17 10:52:00 2014 UTC +++ /branches/bleeding_edge/test/cctest/test-compiler.cc Mon Jan 20 15:44:03 2014 UTC
@@ -232,6 +232,7 @@
 //   |      JS       |
 //   |   C-to-JS     |
 TEST(C2JSFrames) {
+  FLAG_expose_gc = true;
   v8::HandleScope scope(CcTest::isolate());
   v8::Local<v8::Context> context =
     CcTest::NewContext(PRINT_EXTENSION | GC_EXTENSION);

--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to