# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1352300300 -3600
# Node ID 4f28522d9cfdd5dee02af176aed2f7cdc0457ab5
# Parent  e75c3dd32c5ba584d986a53c00e0f872735917be
fix merge error

diff -r e75c3dd32c5b -r 4f28522d9cfd graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java	Wed Nov 07 15:10:30 2012 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java	Wed Nov 07 15:58:20 2012 +0100
@@ -126,7 +126,7 @@
                     @Override
                     public CompilationResult call() throws Exception {
                         graalRuntime.evictDeoptedGraphs();
-                        StructuredGraph graph = new StructuredGraph(method, -1);
+                        StructuredGraph graph = new StructuredGraph(method, entryBCI);
                         return graalRuntime.getCompiler().compileMethod(method, graph, graalRuntime.getCache(), plan, optimisticOpts);
                     }
                 });