Mercurial > hg > icedtea8-forest > hotspot

changeset 8922:dbf85d44da89 icedtea-3.0.0pre09

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR2853: Fix build for aarch64/zero
author enevill
date Thu, 16 Apr 2015 15:06:31 +0100
parents dce21600aa23
children 342de330109a
files src/share/vm/interpreter/interpreterRuntime.cpp
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/interpreter/interpreterRuntime.cpp	Sat Feb 20 01:39:04 2016 +0000
+++ b/src/share/vm/interpreter/interpreterRuntime.cpp	Thu Apr 16 15:06:31 2015 +0100
@@ -401,6 +401,7 @@
   int                handler_bci;
   int                current_bci = bci(thread);
 
+#ifndef CC_INTERP
   if (thread->frames_to_pop_failed_realloc() > 0) {
     // Allocation of scalar replaced object used in this frame
     // failed. Unconditionally pop the frame.
@@ -416,6 +417,7 @@
     return Interpreter::remove_activation_entry();
 #endif
   }
+#endif
 
   // Need to do this check first since when _do_not_unlock_if_synchronized
   // is set, we don't want to trigger any classloading which may make calls