Mercurial > hg > graal-compiler

changeset 10055:9469034773b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed an issue concerning statistics for OSR compilations.
author Christian Haeubl <haeubl@ssw.jku.at>
date Fri, 14 Jun 2013 15:52:59 +0200
parents 91b9c3f0100a
children a323a9e20f9d
files graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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);
         }
 
--- 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;
     }