# HG changeset patch
# User brutisso
# Date 1421397613 -3600
# Node ID 713dfbf84b10d3f7db87a279cb3424e7616b2e51
# Parent  0643c076b6c354a091d97691b07c6f8de8648e57
8061259: ParNew promotion failed is serialized on a lock
Reviewed-by: kbarrett, brutisso
Contributed-by: jwha@google.com

diff -r 0643c076b6c3 -r 713dfbf84b10 src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
--- a/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp	Tue Apr 14 19:45:47 2015 +0000
+++ b/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp	Fri Jan 16 09:40:13 2015 +0100
@@ -1197,8 +1197,10 @@
         return real_forwardee(old);
     }
 
-    new_obj = _next_gen->par_promote(par_scan_state->thread_num(),
-                                       old, m, sz);
+    if (!_promotion_failed) {
+      new_obj = _next_gen->par_promote(par_scan_state->thread_num(),
+                                        old, m, sz);
+    }
 
     if (new_obj == NULL) {
       // promotion failed, forward to self