# HG changeset patch # User Christian Haeubl # Date 1371217979 -7200 # Node ID 9469034773b2d87776dd507bdb4e23595886b629 # Parent 91b9c3f0100a39a9142f2107bb3f469b1ed6eba4 Fixed an issue concerning statistics for OSR compilations. diff -r 91b9c3f0100a -r 9469034773b2 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java --- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Fri Jun 14 09:29:10 2013 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Fri Jun 14 15:52:59 2013 +0200 @@ -38,7 +38,6 @@ import com.oracle.graal.lir.asm.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.cfg.*; -import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.util.*; import com.oracle.graal.options.*; @@ -173,8 +172,7 @@ suites.getLowTier().apply(graph, lowTierContext); // we do not want to store statistics about OSR compilations because it may prevent inlining - boolean isOSRCompilation = graph.start() instanceof OSRStartNode; - if (!isOSRCompilation) { + if (!graph.isOSR()) { InliningPhase.storeStatisticsAfterLowTier(graph); } diff -r 91b9c3f0100a -r 9469034773b2 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java Fri Jun 14 09:29:10 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java Fri Jun 14 15:52:59 2013 +0200 @@ -119,6 +119,10 @@ return entryBCI; } + public boolean isOSR() { + return entryBCI != INVOCATION_ENTRY_BCI; + } + public long graphId() { return graphId; }