commit ba0d6388d4b6ad9b1417bc5be036d394237186e7
author Hiroshi Yamauchi <yamauchi@google.com> Tue Sep 06 12:20:26 2016 -0700
committer Hiroshi Yamauchi <yamauchi@google.com> Tue Sep 06 12:23:27 2016 -0700
tree a3e80e8166ad61b5b60f1907b38bf1ac09082369
parent f9aafcd269e56ebb4413c6733ea3458d7adc3030

Revert "Disable the from-space memory protection under debug/gcstress."

Bug: 31172841
This reverts commit 7a2d267b907000c56f401ab3c51f155cee9752a9.

Change-Id: I8ef4639f255118aba278f8051adf356271116507

runtime/gc/collector/semi_space.cc

diff --git a/runtime/gc/collector/semi_space.cc b/runtime/gc/collector/semi_space.cc
index fc04f30..0146150 100644
--- a/runtime/gc/collector/semi_space.cc
+++ b/runtime/gc/collector/semi_space.cc
@@ -265,20 +265,16 @@
   RecordFree(ObjectBytePair(from_objects - to_objects, from_bytes - to_bytes));
   // Clear and protect the from space.
   from_space_->Clear();
-  // b/31172841. Temporarily disable the from-space protection under gcstress mode with debug build
-  // due to some protection issue in the build server.
-  if (kProtectFromSpace && !(kIsDebugBuild && heap_->gc_stress_mode_)) {
-    if (!from_space_->IsRosAllocSpace()) {
-      // Protect with PROT_NONE.
-      VLOG(heap) << "Protecting from_space_ : " << *from_space_;
-      from_space_->GetMemMap()->Protect(PROT_NONE);
-    } else {
-      // If RosAllocSpace, we'll leave it as PROT_READ here so the
-      // rosaloc verification can read the metadata magic number and
-      // protect it with PROT_NONE later in FinishPhase().
-      VLOG(heap) << "Protecting from_space_ with PROT_READ : " << *from_space_;
-      from_space_->GetMemMap()->Protect(PROT_READ);
-    }
+  if (kProtectFromSpace && !from_space_->IsRosAllocSpace()) {
+    // Protect with PROT_NONE.
+    VLOG(heap) << "Protecting from_space_ : " << *from_space_;
+    from_space_->GetMemMap()->Protect(PROT_NONE);
+  } else {
+    // If RosAllocSpace, we'll leave it as PROT_READ here so the
+    // rosaloc verification can read the metadata magic number and
+    // protect it with PROT_NONE later in FinishPhase().
+    VLOG(heap) << "Protecting from_space_ with PROT_READ : " << *from_space_;
+    from_space_->GetMemMap()->Protect(PROT_READ);
   }
   heap_->PreSweepingGcVerification(this);
   if (swap_semi_spaces_) {
@@ -794,13 +790,9 @@
 
 void SemiSpace::FinishPhase() {
   TimingLogger::ScopedTiming t(__FUNCTION__, GetTimings());
-  // b/31172841. Temporarily disable the from-space protection under gcstress mode with debug build
-  // due to some protection issue in the build server.
-  if (kProtectFromSpace && !(kIsDebugBuild && heap_->gc_stress_mode_)) {
-    if (from_space_->IsRosAllocSpace()) {
-      VLOG(heap) << "Protecting from_space_ with PROT_NONE : " << *from_space_;
-      from_space_->GetMemMap()->Protect(PROT_NONE);
-    }
+  if (kProtectFromSpace && from_space_->IsRosAllocSpace()) {
+    VLOG(heap) << "Protecting from_space_ with PROT_NONE : " << *from_space_;
+    from_space_->GetMemMap()->Protect(PROT_NONE);
   }
   // Null the "to" and "from" spaces since compacting from one to the other isn't valid until
   // further action is done by the heap.