--- a/hotspot/src/share/vm/gc/g1/ptrQueue.cpp	Wed Jul 05 11:03:19 2017 -0700
+++ b/hotspot/src/share/vm/gc/g1/ptrQueue.cpp	Thu Jul 06 01:50:26 2017 +0200
@@ -238,8 +238,9 @@
 bool PtrQueueSet::process_or_enqueue_complete_buffer(BufferNode* node) {
   if (Thread::current()->is_Java_thread()) {
     // We don't lock. It is fine to be epsilon-precise here.
-    if (_max_completed_queue == 0 || _max_completed_queue > 0 &&
-        _n_completed_buffers >= _max_completed_queue + _completed_queue_padding) {
+    if (_max_completed_queue == 0 ||
+        (_max_completed_queue > 0 &&
+          _n_completed_buffers >= _max_completed_queue + _completed_queue_padding)) {
       bool b = mut_process_buffer(node);
       if (b) {
         // True here means that the buffer hasn't been deallocated and the caller may reuse it.