Remove fields from Isolate in Product mode

runtime/vm/heap_test.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"
 
 #include "platform/assert.h"
 #include "vm/become.h"
 #include "vm/dart_api_impl.h"
 #include "vm/globals.h"
 #include "vm/heap.h"
 #include "vm/unit_test.h"
 
 namespace dart {
 
 TEST_CASE(OldGC) {
   const char* kScriptChars =
       "main() {\n"
       "  return [1, 2, 3];\n"
       "}\n";
-  FLAG_verbose_gc = true;
+  NOT_IN_PRODUCT(FLAG_verbose_gc = true);
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   Dart_Handle result = Dart_Invoke(lib, NewString("main"), 0, NULL);
 
   EXPECT_VALID(result);
   EXPECT(!Dart_IsNull(result));
   EXPECT(Dart_IsList(result));
   TransitionNativeToVM transition(thread);
   Isolate* isolate = Isolate::Current();
   Heap* heap = isolate->heap();
   heap->CollectGarbage(Heap::kOld);
@@ skipping 11 matching lines @@
   Dart_Handle result = Dart_Invoke(lib, NewString("main"), 0, NULL);
 
   EXPECT_VALID(result);
   EXPECT(!Dart_IsNull(result));
   EXPECT(Dart_IsList(result));
   TransitionNativeToVM transition(thread);
   Isolate* isolate = Isolate::Current();
   Heap* heap = isolate->heap();
   heap->CollectGarbage(Heap::kOld);
 }
-#endif
+#endif  // !defined(PRODUCT)
 
 TEST_CASE(LargeSweep) {
   const char* kScriptChars =
       "main() {\n"
       "  return new List(8 * 1024 * 1024);\n"
       "}\n";
-  FLAG_verbose_gc = true;
+  NOT_IN_PRODUCT(FLAG_verbose_gc = true);
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   Dart_EnterScope();
   Dart_Handle result = Dart_Invoke(lib, NewString("main"), 0, NULL);
 
   EXPECT_VALID(result);
   EXPECT(!Dart_IsNull(result));
   EXPECT(Dart_IsList(result));
   TransitionNativeToVM transition(thread);
   Isolate* isolate = Isolate::Current();
   Heap* heap = isolate->heap();
@@ skipping 29 matching lines @@
   const char* kScriptChars =
       "class A {\n"
       "  var a;\n"
       "  var b;\n"
       "}\n"
       ""
       "main() {\n"
       "  var x = new A();\n"
       "  return new A();\n"
       "}\n";
+  bool saved_concurrent_sweep_mode = FLAG_concurrent_sweep;
+  FLAG_concurrent_sweep = false;
   Dart_Handle h_lib = TestCase::LoadTestScript(kScriptChars, NULL);
   Isolate* isolate = Isolate::Current();
   ClassTable* class_table = isolate->class_table();
   Heap* heap = isolate->heap();
   Dart_EnterScope();
   Dart_Handle result = Dart_Invoke(h_lib, NewString("main"), 0, NULL);
   EXPECT_VALID(result);
   EXPECT(!Dart_IsNull(result));
   TransitionNativeToVM transition(thread);
   Library& lib = Library::Handle();
@@ skipping 60 matching lines @@
   heap->CollectGarbage(Heap::kOld);
   // Verify postconditions:
   EXPECT_EQ(1, class_stats->pre_gc.old_count);
   EXPECT_EQ(0, class_stats->post_gc.old_count);
   EXPECT_EQ(0, class_stats->recent.old_count);
   // Perform GC.
   heap->CollectGarbage(Heap::kOld);
   EXPECT_EQ(0, class_stats->pre_gc.old_count);
   EXPECT_EQ(0, class_stats->post_gc.old_count);
   EXPECT_EQ(0, class_stats->recent.old_count);
+  FLAG_concurrent_sweep = saved_concurrent_sweep_mode;
 }
 
 TEST_CASE(ArrayHeapStats) {
   const char* kScriptChars =
       "List f(int len) {\n"
       "  return new List(len);\n"
       "}\n"
       ""
       "main() {\n"
       "  return f(1234);\n"
@@ skipping 342 matching lines @@
 
   heap->CollectAllGarbage();
 
   intptr_t size_after =
       heap->new_space()->UsedInWords() + heap->old_space()->UsedInWords();
 
   EXPECT(size_before < size_after);
 }
 
 }  // namespace dart