# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1370532427 -7200
# Node ID 35f93560b1f0fe7f2152b957b2bf83886de05c9d
# Parent  fbad7372eccd68c21852393143aa9ee925e6a12b
ensure that <clinit> for HotSpotOptions is called irrespective of whether and -G: options are specified

diff -r fbad7372eccd -r 35f93560b1f0 src/share/vm/graal/graalCompiler.cpp
--- a/src/share/vm/graal/graalCompiler.cpp	Thu Jun 06 15:35:52 2013 +0200
+++ b/src/share/vm/graal/graalCompiler.cpp	Thu Jun 06 17:27:07 2013 +0200
@@ -85,6 +85,7 @@
   {
     GRAAL_VM_ENTRY_MARK;
     HandleMark hm;
+    VMToCompiler::initOptions();
     for (int i = 0; i < Arguments::num_graal_args(); ++i) {
       const char* arg = Arguments::graal_args_array()[i];
       Handle option = java_lang_String::create_from_str(arg, THREAD);
diff -r fbad7372eccd -r 35f93560b1f0 src/share/vm/graal/graalVMToCompiler.cpp
--- a/src/share/vm/graal/graalVMToCompiler.cpp	Thu Jun 06 15:35:52 2013 +0200
+++ b/src/share/vm/graal/graalVMToCompiler.cpp	Thu Jun 06 17:27:07 2013 +0200
@@ -75,6 +75,13 @@
   return Handle(JNIHandles::resolve_non_null(_vmToCompilerPermObject));
 }
 
+void VMToCompiler::initOptions() {
+  KlassHandle compilerKlass = loadClass(vmSymbols::com_oracle_graal_hotspot_HotSpotOptions());
+  Thread* THREAD = Thread::current();
+  compilerKlass->initialize(THREAD);
+  check_pending_exception("Error while calling initOptions");
+}
+
 jboolean VMToCompiler::setOption(Handle option) {
   assert(!option.is_null(), "");
   KlassHandle compilerKlass = loadClass(vmSymbols::com_oracle_graal_hotspot_HotSpotOptions());
diff -r fbad7372eccd -r 35f93560b1f0 src/share/vm/graal/graalVMToCompiler.hpp
--- a/src/share/vm/graal/graalVMToCompiler.hpp	Thu Jun 06 15:35:52 2013 +0200
+++ b/src/share/vm/graal/graalVMToCompiler.hpp	Thu Jun 06 17:27:07 2013 +0200
@@ -50,6 +50,9 @@
     return _graalRuntimePermObject;
   }
 
+  // public static boolean HotSpotOptions.<clinit>();
+  static void initOptions();
+
   // public static boolean HotSpotOptions.setOption(String option);
   static jboolean setOption(Handle option);