changeset 15855:1a8a29431872

[inlining] readability in CallsiteHolder constructor, part 2
author Miguel Garcia <miguel.m.garcia@oracle.com>
date Wed, 21 May 2014 20:04:33 +0200
parents 3ce7f1c32353
children 3f735cec823e
files graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolder.java
diffstat 1 files changed, 10 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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();
+            }
         }
     }