# HG changeset patch
# User Miguel Garcia <miguel.m.garcia@oracle.com>
# Date 1400695473 -7200
# Node ID 1a8a294318728ec2ddc679614a096bbc2157b38c
# Parent  3ce7f1c32353779f20a8db373434b22c18208201
[inlining] readability in CallsiteHolder constructor, part 2

diff -r 3ce7f1c32353 -r 1a8a29431872 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolder.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolder.java	Wed May 21 19:49:48 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolder.java	Wed May 21 20:04:33 2014 +0200
@@ -55,18 +55,19 @@
         this.relevance = relevance;
         if (graph == null) {
             remainingInvokes = new LinkedList<>();
+            probabilities = null;
+            computeInliningRelevance = null;
         } else {
             remainingInvokes = new InliningIterator(graph).apply();
             assert remainingInvokes.size() == count(graph.getInvokes());
-        }
-
-        if (graph != null && !remainingInvokes.isEmpty()) {
-            probabilities = new FixedNodeProbabilityCache();
-            computeInliningRelevance = new ComputeInliningRelevance(graph, probabilities);
-            computeProbabilities();
-        } else {
-            probabilities = null;
-            computeInliningRelevance = null;
+            if (remainingInvokes.isEmpty()) {
+                probabilities = null;
+                computeInliningRelevance = null;
+            } else {
+                probabilities = new FixedNodeProbabilityCache();
+                computeInliningRelevance = new ComputeInliningRelevance(graph, probabilities);
+                computeProbabilities();
+            }
         }
     }