# HG changeset patch
# User Roland Schatz <roland.schatz@oracle.com>
# Date 1360233597 -3600
# Node ID 0bf1c1c658c2f13e0b2ad0b2e83795c29727655a
# Parent  6a78ed71be903e816d140c8f0979878f55f21327
merge defaults from setDefaultOptions() into GraalOptions

diff -r 6a78ed71be90 -r 0bf1c1c658c2 graal/com.oracle.graal.hotspot.server/src/com/oracle/graal/hotspot/server/CompilationServer.java
--- a/graal/com.oracle.graal.hotspot.server/src/com/oracle/graal/hotspot/server/CompilationServer.java	Thu Feb 07 09:56:09 2013 +0100
+++ b/graal/com.oracle.graal.hotspot.server/src/com/oracle/graal/hotspot/server/CompilationServer.java	Thu Feb 07 11:39:57 2013 +0100
@@ -62,7 +62,6 @@
      */
     public CompilationServer(boolean multiple) {
         this.multiple = multiple;
-        HotSpotOptions.setDefaultOptions();
     }
 
     public void addConnectionObserver(ConnectionObserver observer) {
diff -r 6a78ed71be90 -r 0bf1c1c658c2 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptions.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptions.java	Thu Feb 07 09:56:09 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptions.java	Thu Feb 07 11:39:57 2013 +0100
@@ -31,11 +31,6 @@
 
 public class HotSpotOptions {
 
-    public static void setDefaultOptions() {
-        GraalOptions.MethodEndBreakpointGuards = 2;
-        GraalOptions.ResolveClassBeforeStaticInvoke = false;
-    }
-
     // Called from VM code
     public static boolean setOption(String option) {
         if (option.length() == 0) {
diff -r 6a78ed71be90 -r 0bf1c1c658c2 graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java	Thu Feb 07 09:56:09 2013 +0100
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java	Thu Feb 07 11:39:57 2013 +0100
@@ -106,7 +106,7 @@
     public static int     LoopUnswitchUncertaintyBoost       = 5;
 
     // debugging settings
-    public static int     MethodEndBreakpointGuards          = 0;
+    public static int     MethodEndBreakpointGuards          = 2;
     public static boolean ZapStackOnMethodEntry              = ____;
     public static boolean DeoptALot                          = ____;
     public static boolean VerifyPhases                       = true;
@@ -165,7 +165,7 @@
     public static boolean AlwaysInlineVTableStubs            = ____;
     public static boolean GenAssertionCode                   = ____;
     public static boolean AlignCallsForPatching              = true;
-    public static boolean ResolveClassBeforeStaticInvoke     = true;
+    public static boolean ResolveClassBeforeStaticInvoke     = ____;
     public static boolean CanOmitFrame                       = true;
     public static int     SafepointPollOffset                = 256;
 
diff -r 6a78ed71be90 -r 0bf1c1c658c2 src/share/vm/classfile/vmSymbols.hpp
--- a/src/share/vm/classfile/vmSymbols.hpp	Thu Feb 07 09:56:09 2013 +0100
+++ b/src/share/vm/classfile/vmSymbols.hpp	Thu Feb 07 11:39:57 2013 +0100
@@ -339,7 +339,6 @@
   template(compileMethod_name,                    "compileMethod")                                                                    \
   template(compileMethod_signature,               "(JLcom/oracle/graal/hotspot/meta/HotSpotResolvedObjectType;IZI)Z")                 \
   template(setOption_name,                        "setOption")                                                                        \
-  template(setDefaultOptions_name,                "setDefaultOptions")                                                                \
   template(setOption_signature,                   "(Ljava/lang/String;)Z")                                                            \
   template(createUnresolvedJavaMethod_name,       "createUnresolvedJavaMethod")                                                       \
   template(createUnresolvedJavaMethod_signature,  "(Ljava/lang/String;Ljava/lang/String;Lcom/oracle/graal/api/meta/JavaType;)Lcom/oracle/graal/api/meta/JavaMethod;") \
diff -r 6a78ed71be90 -r 0bf1c1c658c2 src/share/vm/graal/graalCompiler.cpp
--- a/src/share/vm/graal/graalCompiler.cpp	Thu Feb 07 09:56:09 2013 +0100
+++ b/src/share/vm/graal/graalCompiler.cpp	Thu Feb 07 11:39:57 2013 +0100
@@ -79,7 +79,6 @@
   {
     GRAAL_VM_ENTRY_MARK;
     HandleMark hm;
-    VMToCompiler::setDefaultOptions();
     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 6a78ed71be90 -r 0bf1c1c658c2 src/share/vm/graal/graalVMToCompiler.cpp
--- a/src/share/vm/graal/graalVMToCompiler.cpp	Thu Feb 07 09:56:09 2013 +0100
+++ b/src/share/vm/graal/graalVMToCompiler.cpp	Thu Feb 07 11:39:57 2013 +0100
@@ -86,15 +86,6 @@
   return result.get_jboolean();
 }
 
-void VMToCompiler::setDefaultOptions() {
-  KlassHandle compilerKlass = loadClass(vmSymbols::com_oracle_graal_hotspot_HotSpotOptions());
-
-  Thread* THREAD = Thread::current();
-  JavaValue result(T_VOID);
-  JavaCalls::call_static(&result, compilerKlass, vmSymbols::setDefaultOptions_name(), vmSymbols::void_method_signature(), THREAD);
-  check_pending_exception("Error while calling setDefaultOptions");
-}
-
 jboolean VMToCompiler::compileMethod(Method* method, Handle holder, int entry_bci, jboolean blocking, int priority) {
   assert(method != NULL, "just checking");
   assert(!holder.is_null(), "just checking");
diff -r 6a78ed71be90 -r 0bf1c1c658c2 src/share/vm/graal/graalVMToCompiler.hpp
--- a/src/share/vm/graal/graalVMToCompiler.hpp	Thu Feb 07 09:56:09 2013 +0100
+++ b/src/share/vm/graal/graalVMToCompiler.hpp	Thu Feb 07 11:39:57 2013 +0100
@@ -53,9 +53,6 @@
   // public static boolean HotSpotOptions.setOption(String option);
   static jboolean setOption(Handle option);
 
-  // public static void HotSpotOptions.setDefaultOptions();
-  static void setDefaultOptions();
-
   // public abstract boolean compileMethod(long vmId, String name, int entry_bci, boolean blocking);
   static jboolean compileMethod(Method* method, Handle holder, int entry_bci, jboolean blocking, int priority);