# HG changeset patch
# User rrich
# Date 1571238220 -7200
# Node ID 5b7a967da6468543870875a6347968ecd22e197a
# Parent  d2108d9fc4f50342980edc229cc31f50ff2e6d46
8232162: Object reallocation in Deoptimization::fetch_unroll_info_helper should not depend on EliminateNestedLocks
Reviewed-by: thartmann, neliasso

diff -r d2108d9fc4f5 -r 5b7a967da646 src/hotspot/share/runtime/deoptimization.cpp
--- a/src/hotspot/share/runtime/deoptimization.cpp	Thu Oct 17 13:34:06 2019 +0800
+++ b/src/hotspot/share/runtime/deoptimization.cpp	Wed Oct 16 17:03:40 2019 +0200
@@ -295,7 +295,7 @@
 
   // Reallocate the non-escaping objects and restore their fields. Then
   // relock objects if synchronization on them was eliminated.
-  if (jvmci_enabled || ((DoEscapeAnalysis || EliminateNestedLocks) && EliminateAllocations)) {
+  if (jvmci_enabled || (DoEscapeAnalysis && EliminateAllocations)) {
     realloc_failures = eliminate_allocations(thread, exec_mode, cm, deoptee, map, chunk);
   }
 #endif // COMPILER2_OR_JVMCI