--- a/hotspot/src/share/vm/gc/parallel/psPromotionManager.cpp	Wed Jul 05 11:03:19 2017 -0700
+++ b/hotspot/src/share/vm/gc/parallel/psPromotionManager.cpp	Thu Jul 06 01:50:26 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -315,7 +315,7 @@
         process_popped_location_depth(p);
       }
     }
-  } while (totally_drain && !tq->taskqueue_empty() || !tq->overflow_empty());
+  } while ((totally_drain && !tq->taskqueue_empty()) || !tq->overflow_empty());
 
   assert(!totally_drain || tq->taskqueue_empty(), "Sanity");
   assert(totally_drain || tq->size() <= _target_stack_size, "Sanity");