Revert "Remove fields from Isolate in Product mode"

runtime/vm/pages.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 "vm/pages.h"
 
 #include "platform/address_sanitizer.h"
 #include "platform/assert.h"
 #include "vm/compiler_stats.h"
 #include "vm/gc_marker.h"
@@ skipping 525 matching lines @@
 
 void PageSpace::AbandonBumpAllocation() {
   if (bump_top_ < bump_end_) {
     freelist_[HeapPage::kData].Free(bump_top_, bump_end_ - bump_top_);
     bump_top_ = 0;
     bump_end_ = 0;
   }
 }
 
 void PageSpace::UpdateMaxCapacityLocked() {
-#if !defined(PRODUCT)
   if (heap_ == NULL) {
     // Some unit tests.
     return;
   }
   ASSERT(heap_ != NULL);
   ASSERT(heap_->isolate() != NULL);
   Isolate* isolate = heap_->isolate();
   isolate->GetHeapOldCapacityMaxMetric()->SetValue(
       static_cast<int64_t>(usage_.capacity_in_words) * kWordSize);
-#endif  // !defined(PRODUCT)
 }
 
 void PageSpace::UpdateMaxUsed() {
-#if !defined(PRODUCT)
   if (heap_ == NULL) {
     // Some unit tests.
     return;
   }
   ASSERT(heap_ != NULL);
   ASSERT(heap_->isolate() != NULL);
   Isolate* isolate = heap_->isolate();
   isolate->GetHeapOldUsedMaxMetric()->SetValue(UsedInWords() * kWordSize);
-#endif  // !defined(PRODUCT)
 }
 
 bool PageSpace::Contains(uword addr) const {
   for (ExclusivePageIterator it(this); !it.Done(); it.Advance()) {
     if (it.page()->Contains(addr)) {
       return true;
     }
   }
   return false;
 }
@@ skipping 281 matching lines @@
       OS::PrintErr(" done.\n");
     }
 
     // Make code pages writable.
     WriteProtectCode(false);
 
     // Save old value before GCMarker visits the weak persistent handles.
     SpaceUsage usage_before = GetCurrentUsage();
 
     // Mark all reachable old-gen objects.
-#if defined(PRODUCT)
-    bool collect_code = FLAG_collect_code && ShouldCollectCode();
-#else
     bool collect_code = FLAG_collect_code && ShouldCollectCode() &&
                         !isolate->HasAttemptedReload();
-#endif  // !defined(PRODUCT)
     GCMarker marker(heap_);
     marker.MarkObjects(isolate, this, invoke_api_callbacks, collect_code);
     usage_.used_in_words = marker.marked_words();
 
     int64_t mid1 = OS::GetCurrentMonotonicMicros();
 
     // Abandon the remainder of the bump allocation block.
     AbandonBumpAllocation();
     // Reset the freelists and setup sweeping.
     freelist_[HeapPage::kData].Reset();
@@ skipping 255 matching lines @@
   intptr_t capacity_increase_in_words =
       after.capacity_in_words - last_usage_.capacity_in_words;
   // The concurrent sweeper might have freed more capacity than was allocated.
   capacity_increase_in_words =
       Utils::Maximum<intptr_t>(0, capacity_increase_in_words);
   capacity_increase_in_words =
       Utils::RoundUp(capacity_increase_in_words, PageSpace::kPageSizeInWords);
   intptr_t capacity_increase_in_pages =
       capacity_increase_in_words / PageSpace::kPageSizeInWords;
   double multiplier = 1.0;
-#if !defined(PRODUCT)
   // To avoid waste, the first GC should be triggered before too long. After
   // kInitialTimeoutSeconds, gradually lower the capacity limit.
   static const double kInitialTimeoutSeconds = 1.00;
   if (history_.IsEmpty()) {
     double seconds_since_init =
         MicrosecondsToSeconds(heap_->isolate()->UptimeMicros());
     if (seconds_since_init > kInitialTimeoutSeconds) {
       multiplier *= seconds_since_init / kInitialTimeoutSeconds;
     }
   }
-#endif  // !defined(PRODUCT)
   bool needs_gc = capacity_increase_in_pages * multiplier > grow_heap_;
   if (FLAG_log_growth) {
     OS::PrintErr("%s: %" Pd " * %f %s %" Pd "\n",
                  needs_gc ? "NEEDS GC" : "grow", capacity_increase_in_pages,
                  multiplier, needs_gc ? ">" : "<=", grow_heap_);
   }
   return needs_gc;
 }
 
 void PageSpaceController::EvaluateGarbageCollection(SpaceUsage before,
@@ skipping 100 matching lines @@
     return 0;
   } else {
     ASSERT(total_time >= gc_time);
     int result = static_cast<int>(
         (static_cast<double>(gc_time) / static_cast<double>(total_time)) * 100);
     return result;
   }
 }
 
 }  // namespace dart