Mercurial > hg > truffle

changeset 16275:7af7db0bbfe9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
handle unwinding exception through recursive call properly
author Doug Simon <doug.simon@oracle.com>
date Fri, 27 Jun 2014 23:00:27 +0200
parents 60c3f610183e
children 5cdcb94a7cf7
files src/share/vm/graal/graalRuntime.cpp
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/graal/graalRuntime.cpp	Fri Jun 27 22:58:54 2014 +0200
+++ b/src/share/vm/graal/graalRuntime.cpp	Fri Jun 27 23:00:27 2014 +0200
@@ -778,9 +778,8 @@
   if (!recognized) {
     bool throw_err = hotSpotOptionsClass.is_null();
     if (!hotSpotOptionsClass.is_null()) {
-      instanceKlassHandle ikh(hotSpotOptionsClass());
-      if (!ikh->is_reentrant_initialization(THREAD)) {
-        set_option_helper(hotSpotOptionsClass, name, name_len, Handle(), ' ', Handle(), 0L);
+      set_option_helper(hotSpotOptionsClass, name, name_len, Handle(), ' ', Handle(), 0L);
+      if (!HAS_PENDING_EXCEPTION) {
         throw_err = true;
       }
     }