# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1330600241 -3600
# Node ID 71bcf0a9e875c3ea76a9cef4eccad5b5449c79a6
# Parent  985fbd8adf650b0bdb9d79c6895e4efd263f5db1# Parent  0c9196f571722f21453e36ebd1be2b7614c01fec
Merge

diff -r 985fbd8adf65 -r 71bcf0a9e875 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalOptions.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalOptions.java	Thu Mar 01 12:04:37 2012 +0100
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalOptions.java	Thu Mar 01 12:10:41 2012 +0100
@@ -78,9 +78,9 @@
     public static int     LoopFrequencyPropagationPolicy     = -1;
 
     // profiling information
-    public static int     MatureExecutionsBranch             = 50;
-    public static int     MatureExecutionsPerSwitchCase      = 15;
-    public static int     MatureExecutionsTypeProfile        = 100;
+    public static int     MatureExecutionsBranch             = 1;
+    public static int     MatureExecutionsPerSwitchCase      = 1;
+    public static int     MatureExecutionsTypeProfile        = 1;
 
     //rematerialize settings
     public static float   MinimumUsageProbability            = 0.95f;
diff -r 985fbd8adf65 -r 71bcf0a9e875 graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/GraphBuilderPhase.java
--- a/graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/GraphBuilderPhase.java	Thu Mar 01 12:04:37 2012 +0100
+++ b/graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/GraphBuilderPhase.java	Thu Mar 01 12:10:41 2012 +0100
@@ -610,6 +610,7 @@
         assert !x.isDeleted() && !y.isDeleted();
         double probability = profilingInfo.getBranchTakenProbability(bci());
         if (probability < 0) {
+            assert probability == -1 : "invalid probability";
             Debug.log("missing probability in %s at bci %d", method, bci());
             probability = 0.5;
         }