From 91c562ee034fd2b5eb967ab78dd1f301c60c3ed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Inf=C3=BChr?= <dinfuehr@chromium.org>
Date: Fri, 18 Sep 2020 16:05:41 +0200
Subject: [PATCH] [heap] Use ManualGCScope for test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ensures that there is no concurrent allocation happening.

Bug: v8:10315
Change-Id: Ief40cbde9d859e3a2eea66d6e4437d7f0e3840e8
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2418951
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Commit-Queue: Dominik Inführ <dinfuehr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#69998}
---
 test/cctest/heap/test-heap.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cctest/heap/test-heap.cc b/test/cctest/heap/test-heap.cc
index 67b043918d..823611eaef 100644
--- a/test/cctest/heap/test-heap.cc
+++ b/test/cctest/heap/test-heap.cc
@@ -6517,7 +6517,7 @@ TEST(RememberedSetRemoveRange) {
 
 HEAP_TEST(Regress670675) {
   if (!FLAG_incremental_marking) return;
-  FLAG_stress_incremental_marking = false;
+  ManualGCScope manual_gc_scope;
   CcTest::InitializeVM();
   v8::HandleScope scope(CcTest::isolate());
   Heap* heap = CcTest::heap();