# HG changeset patch
# User Christian Haeubl <christian.haeubl@oracle.com>
# Date 1331143432 28800
# Node ID 879ac08596b8b9a01ca2e2f085eeaceba1e38528
# Parent  d0d0dfbebd03d125a630ff8bb4372a9e8fecb206
fix after merge

diff -r d0d0dfbebd03 -r 879ac08596b8 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	Wed Mar 07 10:02:33 2012 -0800
+++ b/graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/GraphBuilderPhase.java	Wed Mar 07 10:03:52 2012 -0800
@@ -557,7 +557,7 @@
         if (probability < 0) {
             assert probability == -1 : "invalid probability";
             Debug.log("missing probability in %s at bci %d", method, bci());
-            takenProbability = 0.5;
+            probability = 0.5;
         }
 
         CompareNode condition = currentGraph.unique(new CompareNode(x, cond, y));