Mercurial > hg > graal-jvmci-8

diff src/share/vm/runtime/thread.cpp @ 21519:cecb4e39521c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use files in lib/graal/options to define Graal options (-G:...) instead of generating code for them
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Wed, 27 May 2015 17:40:26 +0200
parents 7848fc12602b
children 47bebae7454f
line wrap: on
line diff
--- a/src/share/vm/runtime/thread.cpp	Mon May 18 18:30:43 2015 +0200
+++ b/src/share/vm/runtime/thread.cpp	Wed May 27 17:40:26 2015 +0200
@@ -3395,6 +3395,13 @@
   jint parse_result = Arguments::parse(args);
   if (parse_result != JNI_OK) return parse_result;
 
+#ifdef GRAAL
+  OptionsValueTable* options = GraalRuntime::parse_arguments();
+  if (options == NULL) {
+    return JNI_ERR;
+  }
+#endif
+
   os::init_before_ergo();
 
   jint ergo_result = Arguments::apply_ergo();
@@ -3703,11 +3710,7 @@
   }
 
 #ifdef GRAAL
-  status = GraalRuntime::check_arguments(main_thread);
-  if (status != JNI_OK) {
-    *canTryAgain = false; // don't let caller call JNI_CreateJavaVM again
-    return status;
-  }
+  GraalRuntime::set_options(options, main_thread);
 #endif
 
   // initialize compiler(s)