Mercurial > hg > graal-jvmci-8

changeset 22441:fd3d534aecca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
virtual object reallocation during deoptimization must always been done if INCLUDE_JVMCI is defined
author Doug Simon <doug.simon@oracle.com>
date Thu, 20 Aug 2015 21:56:50 +0200
parents 800a7b2335b0
children 7eda81bed2f3
files src/share/vm/runtime/deoptimization.cpp
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/runtime/deoptimization.cpp	Thu Aug 20 21:55:07 2015 +0200
+++ b/src/share/vm/runtime/deoptimization.cpp	Thu Aug 20 21:56:50 2015 +0200
@@ -228,10 +228,10 @@
 #if defined(COMPILER2) || INCLUDE_JVMCI
   // Reallocate the non-escaping objects and restore their fields. Then
   // relock objects if synchronization on them was eliminated.
-#ifdef COMPILER2
+#ifndef INCLUDE_JVMCI
   if (DoEscapeAnalysis || EliminateNestedLocks) {
     if (EliminateAllocations) {
-#endif // COMPILER2
+#endif // INCLUDE_JVMCI
       assert (chunk->at(0)->scope() != NULL,"expect only compiled java frames");
       GrowableArray<ScopeValue*>* objects = chunk->at(0)->scope()->objects();
 
@@ -274,10 +274,10 @@
         // Restore result.
         deoptee.set_saved_oop_result(&map, return_value());
       }
-#ifdef COMPILER2
+#ifndef INCLUDE_JVMCI
     }
     if (EliminateLocks) {
-#endif // COMPILER2
+#endif // INCLUDE_JVMCI
 #ifndef PRODUCT
       bool first = true;
 #endif
@@ -309,10 +309,10 @@
 #endif
         }
       }
-#ifdef COMPILER2
+#ifndef INCLUDE_JVMCI
     }
   }
-#endif // COMPILER2
+#endif // INCLUDE_JVMCI
 #endif // COMPILER2 || INCLUDE_JVMCI
 
   // Ensure that no safepoint is taken after pointers have been stored