--- old/src/share/vm/gc/g1/heapRegion.cpp	2017-06-28 15:43:55.000000000 -0700
+++ new/src/share/vm/gc/g1/heapRegion.cpp	2017-06-28 15:43:55.000000000 -0700
@@ -579,10 +579,10 @@
 
         bool is_bad = !(from->is_young()
           || to->rem_set()->contains_reference(p)
-          || !G1HRRSFlushLogBuffersOnVerify && // buffers were not flushed
-          (_containing_obj->is_objArray() ?
-          cv_field == dirty
-          : cv_obj == dirty || cv_field == dirty));
+          || (!G1HRRSFlushLogBuffersOnVerify && // buffers were not flushed
+              (_containing_obj->is_objArray()
+               ? cv_field == dirty
+               : cv_obj == dirty || cv_field == dirty)));
         if (is_bad) {
           MutexLockerEx x(ParGCRareEvent_lock,
             Mutex::_no_safepoint_check_flag);
@@ -894,4 +894,3 @@
   set_saved_mark_word(NULL);
   reset_bot();
 }
-