Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/runtime/deoptimization.cpp	Thu Jan 26 14:14:55 2012 -0800
     1.2 +++ b/src/share/vm/runtime/deoptimization.cpp	Fri Jan 27 09:04:57 2012 +0100
     1.3 @@ -211,7 +211,7 @@
     1.4  #ifdef COMPILER2
     1.5    // Reallocate the non-escaping objects and restore their fields. Then
     1.6    // relock objects if synchronization on them was eliminated.
     1.7 -  if (DoEscapeAnalysis) {
     1.8 +  if (DoEscapeAnalysis || EliminateNestedLocks) {
     1.9      if (EliminateAllocations) {
    1.10        assert (chunk->at(0)->scope() != NULL,"expect only compiled java frames");
    1.11        GrowableArray<ScopeValue*>* objects = chunk->at(0)->scope()->objects();