# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1362663958 -3600
# Node ID 4ff30dbbc826e25bef5e675e64f6851ebf6f9978
# Parent  51d5999900e2b5e117f79bb2824267644f47bf2e
new PEAInliningHints option, turn new options off by default

diff -r 51d5999900e2 -r 4ff30dbbc826 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 Mar 07 13:47:09 2013 +0100
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java	Thu Mar 07 14:45:58 2013 +0100
@@ -49,7 +49,7 @@
     public static boolean LimitInlinedRelevance              = true;
     public static float   BoostInliningForEscapeAnalysis     = 2f;
     public static float   RelevanceCapForInlining            = 1f;
-    public static boolean IterativeInlining                  = true;
+    public static boolean IterativeInlining                  = ____;
 
     public static int     TrivialBytecodeSize                = 10;
     public static int     NormalBytecodeSize                 = 150;
@@ -68,7 +68,8 @@
     public static int     EscapeAnalysisIterations           = 2;
     public static String  EscapeAnalyzeOnly                  = null;
     public static int     MaximumEscapeAnalysisArrayLength   = 32;
-    public static boolean PEAReadCache                       = true;
+    public static boolean PEAReadCache                       = ____;
+    public static boolean PEAInliningHints                   = ____;
 
     public static double  TailDuplicationProbability         = 0.5;
     public static int     TailDuplicationTrivialSize         = 1;
diff -r 51d5999900e2 -r 4ff30dbbc826 graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/IterativeInliningPhase.java
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/IterativeInliningPhase.java	Thu Mar 07 13:47:09 2013 +0100
+++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/IterativeInliningPhase.java	Thu Mar 07 14:45:58 2013 +0100
@@ -104,7 +104,7 @@
                         }
                     }
 
-                    InliningPhase inlining = new InliningPhase(runtime, closure.getHints(), assumptions, cache, plan, optimisticOpts);
+                    InliningPhase inlining = new InliningPhase(runtime, GraalOptions.PEAInliningHints ? closure.getHints() : null, assumptions, cache, plan, optimisticOpts);
                     if (simple) {
                         inlining.setMaxMethodsPerInlining(1);
                     }