# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1326476926 -3600
# Node ID 279a43776f421e163c2808f046b7ed716b70816e
# Parent  685cbfb8e08e2a69ed6db1cee163d1f4d057243e
Fixed merge issues.

diff -r 685cbfb8e08e -r 279a43776f42 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalCompiler.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalCompiler.java	Fri Jan 13 18:46:56 2012 +0100
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalCompiler.java	Fri Jan 13 18:48:46 2012 +0100
@@ -82,12 +82,12 @@
         return compileMethod(method, new StructuredGraph(method), osrBCI, plan);
     }
 
-    public CiTargetMethod compileMethod(RiResolvedMethod method, StructuredGraph graph, int osrBCI, PhasePlan plan) {
+    public CiTargetMethod compileMethod(final RiResolvedMethod method, final StructuredGraph graph, int osrBCI, final PhasePlan plan) {
         if (osrBCI != -1) {
             throw new CiBailout("No OSR supported");
         }
         final CiTargetMethod[] result = new CiTargetMethod[1];
-        Debug.scope("CompileMethod", new Runnable() { 
+        Debug.scope("CompileMethod", new Runnable() {
                 public void run() {
                         TTY.Filter filter = new TTY.Filter(GraalOptions.PrintFilter, method);
                         CiAssumptions assumptions = GraalOptions.OptAssumptions ? new CiAssumptions() : null;
@@ -95,7 +95,7 @@
                         FrameMap frameMap = emitLIR(lir, graph, method);
                         result[0] = emitCode(assumptions, method, lir, frameMap);
                 }
-        }}, method);
+        }, method);
         return result[0];
     }
 
diff -r 685cbfb8e08e -r 279a43776f42 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/lir/LIR.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/lir/LIR.java	Fri Jan 13 18:46:56 2012 +0100
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/lir/LIR.java	Fri Jan 13 18:48:46 2012 +0100
@@ -81,7 +81,6 @@
         this.startBlock = startBlock;
         this.valueToBlock = valueToBlock;
         this.numLoops = numLoops;
-        this.loopCount = loopCount;
 
         slowPaths = new ArrayList<>();
         deoptimizationStubs = new ArrayList<>();
@@ -107,10 +106,6 @@
         return valueToBlock;
     }
 
-    public int loopCount() {
-        return loopCount;
-    }
-
     public int numVariables() {
         return numVariables;
     }