diff graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java @ 9705:de7319e48e48

Temporary fixes for the merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Mon, 13 May 2013 17:43:42 +0200
parents f9a65a0e626b
children f44d7e24cebd
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java	Mon May 13 17:11:31 2013 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java	Mon May 13 17:43:42 2013 +0200
@@ -90,20 +90,29 @@
     }
 
     public static void storeHighLevelStatistics(StructuredGraph graph) {
-        CompiledMethodInfo info = compiledMethodInfo(graph.method());
-        double summedUpProbabilityOfRemainingInvokes = sumUpInvokeProbabilities(graph);
-        info.setSummedUpProbabilityOfRemainingInvokes(summedUpProbabilityOfRemainingInvokes);
-        info.setHighLevelNodeCount(graph.getNodeCount());
+        ResolvedJavaMethod method = graph.method();
+        if (method != null) {
+            CompiledMethodInfo info = compiledMethodInfo(method);
+            double summedUpProbabilityOfRemainingInvokes = sumUpInvokeProbabilities(graph);
+            info.setSummedUpProbabilityOfRemainingInvokes(summedUpProbabilityOfRemainingInvokes);
+            info.setHighLevelNodeCount(graph.getNodeCount());
+        }
     }
 
     public static void storeMidLevelStatistics(StructuredGraph graph) {
-        CompiledMethodInfo info = compiledMethodInfo(graph.method());
-        info.setMidLevelNodeCount(graph.getNodeCount());
+        ResolvedJavaMethod method = graph.method();
+        if (method != null) {
+            CompiledMethodInfo info = compiledMethodInfo(graph.method());
+            info.setMidLevelNodeCount(graph.getNodeCount());
+        }
     }
 
     public static void storeLowLevelStatistics(StructuredGraph graph) {
-        CompiledMethodInfo info = compiledMethodInfo(graph.method());
-        info.setLowLevelNodeCount(graph.getNodeCount());
+        ResolvedJavaMethod method = graph.method();
+        if (method != null) {
+            CompiledMethodInfo info = compiledMethodInfo(graph.method());
+            info.setLowLevelNodeCount(graph.getNodeCount());
+        }
     }
 
     @Override