Mercurial > hg > truffle

changeset 6679:4f28522d9cfd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix merge error
author Lukas Stadler <lukas.stadler@jku.at>
date Wed, 07 Nov 2012 15:58:20 +0100
parents e75c3dd32c5b
children 10a3d06d58dc
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);
                     }
                 });