# HG changeset patch
# User Gilles Duboscq <gilles.duboscq@oracle.com>
# Date 1307454800 -7200
# Node ID a0c066ff81adf08e4cd62ef6df2b93243b8e8b31
# Parent  0635ba16afe4a41e43964e43825a5ccf7d74a200# Parent  9b8c194c1b1f3798cc1358f56b9c0c04a1b92551
Merge

diff -r 0635ba16afe4 -r a0c066ff81ad graal/GraalCompiler/src/com/sun/c1x/ir/ComputeLinearScanOrder.java
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/ComputeLinearScanOrder.java	Tue Jun 07 15:52:55 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/ComputeLinearScanOrder.java	Tue Jun 07 15:53:20 2011 +0200
@@ -159,7 +159,6 @@
             assert parent != null : "must have parent";
 
             cur.setLinearScanLoopHeader();
-            cur.setBackwardBranchTarget(true);
             parent.setLinearScanLoopEnd();
 
             loopEndBlocks.add(parent);
diff -r 0635ba16afe4 -r a0c066ff81ad graal/GraalCompiler/src/com/sun/c1x/lir/LIRBlock.java
--- a/graal/GraalCompiler/src/com/sun/c1x/lir/LIRBlock.java	Tue Jun 07 15:52:55 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/lir/LIRBlock.java	Tue Jun 07 15:53:20 2011 +0200
@@ -185,15 +185,6 @@
     private int linearScanNumber = -1;
     private boolean linearScanLoopEnd;
     private boolean linearScanLoopHeader;
-    private boolean backwardBranchTarget;
-
-    public void setBackwardBranchTarget(boolean b) {
-        this.backwardBranchTarget = b;
-    }
-
-    public boolean backwardBranchTarget() {
-        return backwardBranchTarget;
-    }
 
     public void setLinearScanNumber(int v) {
         linearScanNumber = v;
diff -r 0635ba16afe4 -r a0c066ff81ad runtests.sh
--- a/runtests.sh	Tue Jun 07 15:52:55 2011 +0200
+++ b/runtests.sh	Tue Jun 07 15:53:20 2011 +0200
@@ -12,4 +12,4 @@
   exit 1;
 fi
 TESTDIR=${MAXINE}/com.oracle.max.vm/test
-${JDK7}/bin/java -client -d64 -graal -ea -esa -Xcomp -C1X:PrintIdealGraphLevel=4 -C1X:PrintFilter=anewarray -C1X:-PrintCFGToFile -C1X:-PrintAssembly -XX:-TraceSignals -XX:-TraceDeoptimization -XX:-TraceExceptions -XX:+PrintCompilation -XX:CompileOnly=jtt -Xbootclasspath/p:"${MAXINE}/com.oracle.max.vm/bin" -Xbootclasspath/p:"${MAXINE}/com.oracle.max.base/bin" $1 test.com.sun.max.vm.compiler.JavaTester -verbose=1 -gen-run-scheme=false -run-scheme-package=all ${TESTDIR}/jtt/bytecode ${TESTDIR}/jtt/except ${TESTDIR}/jtt/hotpath ${TESTDIR}/jtt/jdk ${TESTDIR}/jtt/lang ${TESTDIR}/jtt/loop ${TESTDIR}/jtt/micro ${TESTDIR}/jtt/optimize ${TESTDIR}/jtt/reflect ${TESTDIR}/jtt/threads
+${JDK7}/bin/java -client -d64 -graal -ea -esa -Xcomp -C1X:PrintIdealGraphLevel=0 -C1X:PrintFilter=anewarray -C1X:-PrintCFGToFile -C1X:-PrintAssembly -XX:-TraceSignals -XX:-TraceDeoptimization -XX:-TraceExceptions -XX:+PrintCompilation -XX:CompileOnly=jtt -Xbootclasspath/p:"${MAXINE}/com.oracle.max.vm/bin" -Xbootclasspath/p:"${MAXINE}/com.oracle.max.base/bin" $1 test.com.sun.max.vm.compiler.JavaTester -verbose=1 -gen-run-scheme=false -run-scheme-package=all ${TESTDIR}/jtt/bytecode ${TESTDIR}/jtt/except ${TESTDIR}/jtt/hotpath ${TESTDIR}/jtt/jdk ${TESTDIR}/jtt/lang ${TESTDIR}/jtt/loop ${TESTDIR}/jtt/micro ${TESTDIR}/jtt/optimize ${TESTDIR}/jtt/reflect ${TESTDIR}/jtt/threads