Mercurial > hg > truffle

diff src/share/vm/runtime/deoptimization.cpp @ 4840:0a10d80352d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author brutisso
date Fri, 27 Jan 2012 09:04:57 +0100
parents e9a5e0a812c8
children aa3d708d67c4
line wrap: on
line diff
--- a/src/share/vm/runtime/deoptimization.cpp	Thu Jan 26 14:14:55 2012 -0800
+++ b/src/share/vm/runtime/deoptimization.cpp	Fri Jan 27 09:04:57 2012 +0100
@@ -211,7 +211,7 @@
 #ifdef COMPILER2
   // Reallocate the non-escaping objects and restore their fields. Then
   // relock objects if synchronization on them was eliminated.
-  if (DoEscapeAnalysis) {
+  if (DoEscapeAnalysis || EliminateNestedLocks) {
     if (EliminateAllocations) {
       assert (chunk->at(0)->scope() != NULL,"expect only compiled java frames");
       GrowableArray<ScopeValue*>* objects = chunk->at(0)->scope()->objects();