[VM/concurrency] - Temporary workaround for issue #40836

a-siva · commit-bot@chromium.org · commit 09bbd3cca5d4 · 2020-02-29T02:16:10.000Z
Change-Id: I4369c717122ef7b84c5931b8fb3edf18fb433375 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/137880 Reviewed-by: Jason Simmons <jsimmons@google.com> Commit-Queue: Siva Annamalai <asiva@google.com>
diff --git a/runtime/vm/heap/heap.cc b/runtime/vm/heap/heap.cc
@@ -460,7 +460,8 @@ void Heap::EvacuateNewSpace(Thread* thread, GCReason reason) {
 }
 
 void Heap::CollectNewSpaceGarbage(Thread* thread, GCReason reason) {
-  NoActiveIsolateScope no_active_isolate_scope;
+  // TODO(40836) : Uncomment this line once the issue is fixed.
+  // NoActiveIsolateScope no_active_isolate_scope;
   ASSERT((reason != kOldSpace) && (reason != kPromotion));
   if (thread->isolate_group() == Dart::vm_isolate()->group()) {
     // The vm isolate cannot safely collect garbage due to unvisited read-only
@@ -494,7 +495,8 @@ void Heap::CollectNewSpaceGarbage(Thread* thread, GCReason reason) {
 void Heap::CollectOldSpaceGarbage(Thread* thread,
                                   GCType type,
                                   GCReason reason) {
-  NoActiveIsolateScope no_active_isolate_scope;
+  // TODO(40836) : Uncomment this line once the issue is fixed.
+  // NoActiveIsolateScope no_active_isolate_scope;
 
   ASSERT(reason != kNewSpace);
   ASSERT(type != kScavenge);
