# HG changeset patch
# User Gilles Duboscq <gilles.duboscq@oracle.com>
# Date 1308218994 -7200
# Node ID 3671e31615c9afed81fad08d05b4b4094e72f563
# Parent  c6b89544fef574e309914fc61070a4ab68fb978e# Parent  499851efab4d9431bd4beaf9a17278be95599620
Merge

diff -r 499851efab4d -r 3671e31615c9 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/graph/IR.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/graph/IR.java	Thu Jun 16 10:59:27 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/graph/IR.java	Thu Jun 16 12:09:54 2011 +0200
@@ -94,7 +94,7 @@
         if (GraalOptions.OptCanonicalizer) {
             new CanonicalizerPhase().apply(graph);
             new DeadCodeEliminationPhase().apply(compilation.graph);
-            printGraph("After Canonicalization", graph);
+            //printGraph("After Canonicalization", graph);
         }
 
         new LoopPhase().apply(graph);
diff -r 499851efab4d -r 3671e31615c9 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/schedule/IdentifyBlocksPhase.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/schedule/IdentifyBlocksPhase.java	Thu Jun 16 10:59:27 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/schedule/IdentifyBlocksPhase.java	Thu Jun 16 12:09:54 2011 +0200
@@ -311,7 +311,7 @@
                 }
             } else if (usage instanceof LoopCounter) {
                 LoopCounter counter = (LoopCounter) usage;
-                if (n == counter.init()) {
+                if (n == counter.init() || n == counter.stride()) {
                     LoopBegin loopBegin = counter.loopBegin();
                     Block mergeBlock = nodeToBlock.get(loopBegin);
                     block = getCommonDominator(block, mergeBlock.dominator());