commit 14a4fdc6d7d0dc8ead3d2e9d7dd0514a27117c7e
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 31 19:59:39 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 31 19:59:39 2016 +0000
tree fcdfa224b62f482dcd72e464fae42b4df2523339
parent 43ac11487e34eb78fca230f9bad40d42a5b1c6c4
parent a01d06618b08688472d2609220c3ba9c9d6de6f4

Merge "Fix a check failure in the CC background transition."

runtime/gc/heap.cc

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index 0cda63e..600aff1 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -2125,11 +2125,11 @@
 }
 
 void Heap::TransitionCollector(CollectorType collector_type) {
-  // Collector transition must not happen with CC
-  CHECK(!kUseReadBarrier);
   if (collector_type == collector_type_) {
     return;
   }
+  // Collector transition must not happen with CC
+  CHECK(!kUseReadBarrier);
   VLOG(heap) << "TransitionCollector: " << static_cast<int>(collector_type_)
              << " -> " << static_cast<int>(collector_type);
   uint64_t start_time = NanoTime();