Mercurial > hg > truffle
changeset 18969:14496953435e
Use Node#getUsageCount wherever possible.
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Tue Jan 27 13:09:17 2015 +0100 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Tue Jan 27 13:17:53 2015 +0100 @@ -319,7 +319,7 @@ canonicalId.set(node, id); } String name = node instanceof ConstantNode && checkConstants ? node.toString(Verbosity.Name) : node.getClass().getSimpleName(); - result.append(" " + id + "|" + name + (excludeVirtual ? "\n" : " (" + node.usages().count() + ")\n")); + result.append(" " + id + "|" + name + (excludeVirtual ? "\n" : " (" + node.getUsageCount() + ")\n")); } } }
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/TypeSystemTest.java Tue Jan 27 13:09:17 2015 +0100 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/TypeSystemTest.java Tue Jan 27 13:17:53 2015 +0100 @@ -217,7 +217,7 @@ } private static void outputNode(Node node) { - TTY.print(" " + node + " (usage count: " + node.usages().count() + ") (inputs:"); + TTY.print(" " + node + " (usage count: " + node.getUsageCount() + ") (inputs:"); for (Node input : node.inputs()) { TTY.print(" " + input.toString(Verbosity.Id)); }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRBuilder.java Tue Jan 27 13:09:17 2015 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRBuilder.java Tue Jan 27 13:17:53 2015 +0100 @@ -158,7 +158,7 @@ */ public void setMatchResult(ValueNode x, Value operand) { assert operand.equals(ComplexMatchValue.INTERIOR_MATCH) || operand instanceof ComplexMatchValue; - assert operand instanceof ComplexMatchValue || x.usages().count() == 1 : "interior matches must be single user"; + assert operand instanceof ComplexMatchValue || x.getUsageCount() == 1 : "interior matches must be single user"; assert nodeOperands != null && nodeOperands.get(x) == null : "operand cannot be set twice"; assert !(x instanceof VirtualObjectNode); nodeOperands.set(x, operand); @@ -256,7 +256,7 @@ if (LogVerbose.getValue()) { int i = 0; for (ValueNode node : nodes) { - Debug.log("%d: (%s) %1S", i++, node.usages().count(), node); + Debug.log("%d: (%s) %1S", i++, node.getUsageCount(), node); } }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchContext.java Tue Jan 27 13:09:17 2015 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchContext.java Tue Jan 27 13:17:53 2015 +0100 @@ -109,7 +109,7 @@ Debug.log("unexpected node %s", node); for (int j = startIndex; j <= endIndex; j++) { ValueNode theNode = nodes.get(j); - Debug.log("%s(%s) %1s", (consumed != null && consumed.contains(theNode) || theNode == root) ? "*" : " ", theNode.usages().count(), theNode); + Debug.log("%s(%s) %1s", (consumed != null && consumed.contains(theNode) || theNode == root) ? "*" : " ", theNode.getUsageCount(), theNode); } } return Result.notSafe(node, rule.getPattern()); @@ -147,7 +147,7 @@ * @return Result.OK if the node can be safely consumed. */ public Result consume(ValueNode node) { - assert node.usages().count() <= 1 : "should have already been checked"; + assert node.getUsageCount() <= 1 : "should have already been checked"; // Check NOT_IN_BLOCK first since that usually implies ALREADY_USED int index = nodes.indexOf(node);
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchPattern.java Tue Jan 27 13:09:17 2015 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchPattern.java Tue Jan 27 13:17:53 2015 +0100 @@ -251,7 +251,7 @@ } if (singleUser && !atRoot) { - if (node.usages().count() > 1) { + if (node.getUsageCount() > 1) { return Result.tooManyUsers(node, statement.getPattern()); } }
--- a/graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/NodeUsagesTests.java Tue Jan 27 13:09:17 2015 +0100 +++ b/graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/NodeUsagesTests.java Tue Jan 27 13:17:53 2015 +0100 @@ -62,7 +62,7 @@ Use use1 = graph.add(new Use(null, def0, null)); Use use2 = graph.add(new Use(null, null, def0)); - assertEquals(3, def0.usages().count()); + assertEquals(3, def0.getUsageCount()); assertThat(def0.usages(), contains(use0)); assertThat(def0.usages(), contains(use1)); assertThat(def0.usages(), contains(use2)); @@ -74,7 +74,7 @@ assertThat(def0.usages(), isEmpty()); - assertEquals(3, def1.usages().count()); + assertEquals(3, def1.getUsageCount()); assertThat(def1.usages(), contains(use0)); assertThat(def1.usages(), contains(use1)); assertThat(def1.usages(), contains(use2)); @@ -91,7 +91,7 @@ Use use1 = graph.add(new Use(null, def0, null)); Use use2 = graph.add(new Use(null, null, def0)); - assertEquals(3, def0.usages().count()); + assertEquals(3, def0.getUsageCount()); assertThat(def0.usages(), contains(use0)); assertThat(def0.usages(), contains(use1)); assertThat(def0.usages(), contains(use2)); @@ -103,7 +103,7 @@ assertThat(def0.usages(), isEmpty()); - assertEquals(3, def1.usages().count()); + assertEquals(3, def1.getUsageCount()); assertThat(def1.usages(), contains(use0)); assertThat(def1.usages(), contains(use1)); assertThat(def1.usages(), contains(use2)); @@ -120,7 +120,7 @@ Use use1 = graph.add(new Use(null, def0, null)); Use use2 = graph.add(new Use(null, null, def0)); - assertEquals(3, def0.usages().count()); + assertEquals(3, def0.getUsageCount()); assertThat(def0.usages(), contains(use0)); assertThat(def0.usages(), contains(use1)); assertThat(def0.usages(), contains(use2)); @@ -132,7 +132,7 @@ assertThat(def1.usages(), isEmpty()); - assertEquals(3, def0.usages().count()); + assertEquals(3, def0.getUsageCount()); assertThat(def0.usages(), contains(use0)); assertThat(def0.usages(), contains(use1)); assertThat(def0.usages(), contains(use2)); @@ -149,7 +149,7 @@ Use use1 = graph.add(new Use(null, def0, null)); Use use2 = graph.add(new Use(null, null, def0)); - assertEquals(3, def0.usages().count()); + assertEquals(3, def0.getUsageCount()); assertThat(def0.usages(), contains(use0)); assertThat(def0.usages(), contains(use1)); assertThat(def0.usages(), contains(use2)); @@ -159,12 +159,12 @@ def0.replaceAtMatchingUsages(def1, u -> u == use1); - assertEquals(1, def1.usages().count()); + assertEquals(1, def1.getUsageCount()); assertThat(def1.usages(), contains(use1)); assertThat(def1.usages(), isNotEmpty()); - assertEquals(2, def0.usages().count()); + assertEquals(2, def0.getUsageCount()); assertThat(def0.usages(), contains(use0)); assertThat(def0.usages(), contains(use2)); @@ -180,7 +180,7 @@ Use use1 = graph.add(new Use(null, def0, null)); Use use2 = graph.add(new Use(null, null, def0)); - assertEquals(3, def0.usages().count()); + assertEquals(3, def0.getUsageCount()); assertThat(def0.usages(), contains(use0)); assertThat(def0.usages(), contains(use1)); assertThat(def0.usages(), contains(use2)); @@ -190,12 +190,12 @@ def0.replaceAtMatchingUsages(def1, u -> u == use2); - assertEquals(1, def1.usages().count()); + assertEquals(1, def1.getUsageCount()); assertThat(def1.usages(), contains(use2)); assertThat(def1.usages(), isNotEmpty()); - assertEquals(2, def0.usages().count()); + assertEquals(2, def0.getUsageCount()); assertThat(def0.usages(), contains(use0)); assertThat(def0.usages(), contains(use1)); @@ -211,7 +211,7 @@ Use use1 = graph.add(new Use(null, def0, null)); Use use2 = graph.add(new Use(null, null, def0)); - assertEquals(3, def0.usages().count()); + assertEquals(3, def0.getUsageCount()); assertThat(def0.usages(), contains(use0)); assertThat(def0.usages(), contains(use1)); assertThat(def0.usages(), contains(use2)); @@ -221,12 +221,12 @@ def0.replaceAtMatchingUsages(def1, u -> u == use0); - assertEquals(1, def1.usages().count()); + assertEquals(1, def1.getUsageCount()); assertThat(def1.usages(), contains(use0)); assertThat(def1.usages(), isNotEmpty()); - assertEquals(2, def0.usages().count()); + assertEquals(2, def0.getUsageCount()); assertThat(def0.usages(), contains(use1)); assertThat(def0.usages(), contains(use2)); @@ -242,7 +242,7 @@ Use use1 = graph.add(new Use(null, def0, null)); Use use2 = graph.add(new Use(null, null, def0)); - assertEquals(3, def0.usages().count()); + assertEquals(3, def0.getUsageCount()); assertThat(def0.usages(), contains(use0)); assertThat(def0.usages(), contains(use1)); assertThat(def0.usages(), contains(use2)); @@ -252,12 +252,12 @@ def0.replaceAtMatchingUsages(def1, u -> u != use1); - assertEquals(1, def0.usages().count()); + assertEquals(1, def0.getUsageCount()); assertThat(def0.usages(), contains(use1)); assertThat(def0.usages(), isNotEmpty()); - assertEquals(2, def1.usages().count()); + assertEquals(2, def1.getUsageCount()); assertThat(def1.usages(), contains(use0)); assertThat(def1.usages(), contains(use2)); @@ -274,7 +274,7 @@ Use use2 = graph.add(new Use(null, null, def0)); Use use3 = graph.add(new Use(null, null, def0)); - assertEquals(4, def0.usages().count()); + assertEquals(4, def0.getUsageCount()); assertThat(def0.usages(), contains(use0)); assertThat(def0.usages(), contains(use1)); assertThat(def0.usages(), contains(use2)); @@ -285,12 +285,12 @@ def0.replaceAtMatchingUsages(def1, u -> u != use1); - assertEquals(1, def0.usages().count()); + assertEquals(1, def0.getUsageCount()); assertThat(def0.usages(), contains(use1)); assertThat(def0.usages(), isNotEmpty()); - assertEquals(3, def1.usages().count()); + assertEquals(3, def1.getUsageCount()); assertThat(def1.usages(), contains(use0)); assertThat(def1.usages(), contains(use2)); assertThat(def1.usages(), contains(use3)); @@ -308,7 +308,7 @@ Use use2 = graph.add(new Use(null, null, def0)); Use use3 = graph.add(new Use(null, null, def0)); - assertEquals(4, def0.usages().count()); + assertEquals(4, def0.getUsageCount()); assertThat(def0.usages(), contains(use0)); assertThat(def0.usages(), contains(use1)); assertThat(def0.usages(), contains(use2)); @@ -319,12 +319,12 @@ def0.replaceAtMatchingUsages(def1, u -> u != use2); - assertEquals(1, def0.usages().count()); + assertEquals(1, def0.getUsageCount()); assertThat(def0.usages(), contains(use2)); assertThat(def0.usages(), isNotEmpty()); - assertEquals(3, def1.usages().count()); + assertEquals(3, def1.getUsageCount()); assertThat(def1.usages(), contains(use0)); assertThat(def1.usages(), contains(use1)); assertThat(def1.usages(), contains(use3)); @@ -342,7 +342,7 @@ Use use2 = graph.add(new Use(null, null, def0)); Use use3 = graph.add(new Use(null, null, def0)); - assertEquals(4, def0.usages().count()); + assertEquals(4, def0.getUsageCount()); assertThat(def0.usages(), contains(use0)); assertThat(def0.usages(), contains(use1)); assertThat(def0.usages(), contains(use2)); @@ -353,12 +353,12 @@ def0.replaceAtMatchingUsages(def1, u -> u == use2); - assertEquals(1, def1.usages().count()); + assertEquals(1, def1.getUsageCount()); assertThat(def1.usages(), contains(use2)); assertThat(def1.usages(), isNotEmpty()); - assertEquals(3, def0.usages().count()); + assertEquals(3, def0.getUsageCount()); assertThat(def0.usages(), contains(use0)); assertThat(def0.usages(), contains(use1)); assertThat(def0.usages(), contains(use3)); @@ -375,7 +375,7 @@ Use use1 = graph.add(new Use(null, def0, null)); Use use2 = graph.add(new Use(null, null, def0)); - assertEquals(3, def0.usages().count()); + assertEquals(3, def0.getUsageCount()); assertThat(def0.usages(), contains(use0)); assertThat(def0.usages(), contains(use1)); assertThat(def0.usages(), contains(use2)); @@ -385,12 +385,12 @@ def0.replaceAtMatchingUsages(def1, u -> u != use2); - assertEquals(1, def0.usages().count()); + assertEquals(1, def0.getUsageCount()); assertThat(def0.usages(), contains(use2)); assertThat(def0.usages(), isNotEmpty()); - assertEquals(2, def1.usages().count()); + assertEquals(2, def1.getUsageCount()); assertThat(def1.usages(), contains(use0)); assertThat(def1.usages(), contains(use1)); @@ -406,7 +406,7 @@ Use use1 = graph.add(new Use(null, def0, null)); Use use2 = graph.add(new Use(null, null, def0)); - assertEquals(3, def0.usages().count()); + assertEquals(3, def0.getUsageCount()); assertThat(def0.usages(), contains(use0)); assertThat(def0.usages(), contains(use1)); assertThat(def0.usages(), contains(use2)); @@ -416,12 +416,12 @@ def0.replaceAtMatchingUsages(def1, u -> u != use0); - assertEquals(1, def0.usages().count()); + assertEquals(1, def0.getUsageCount()); assertThat(def0.usages(), contains(use0)); assertThat(def0.usages(), isNotEmpty()); - assertEquals(2, def1.usages().count()); + assertEquals(2, def1.getUsageCount()); assertThat(def1.usages(), contains(use1)); assertThat(def1.usages(), contains(use2));
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractEndNode.java Tue Jan 27 13:09:17 2015 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractEndNode.java Tue Jan 27 13:17:53 2015 +0100 @@ -47,7 +47,7 @@ @Override public boolean verify() { - assertTrue(usages().count() <= 1, "at most one usage"); + assertTrue(getUsageCount() <= 1, "at most one usage"); return super.verify(); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Tue Jan 27 13:09:17 2015 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Tue Jan 27 13:17:53 2015 +0100 @@ -657,7 +657,7 @@ } CompareNode compare = (CompareNode) condition(); - if (compare.usages().count() != 1) { + if (compare.getUsageCount() != 1) { return false; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/WeakCounterNode.java Tue Jan 27 13:09:17 2015 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/WeakCounterNode.java Tue Jan 27 13:17:53 2015 +0100 @@ -45,7 +45,7 @@ @Override public void simplify(SimplifierTool tool) { - if (checkedValue instanceof FloatingNode && checkedValue.usages().count() == 1) { + if (checkedValue instanceof FloatingNode && checkedValue.getUsageCount() == 1) { tool.addToWorkList(checkedValue); graph().removeFixed(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BranchProbabilityNode.java Tue Jan 27 13:09:17 2015 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BranchProbabilityNode.java Tue Jan 27 13:17:53 2015 +0100 @@ -113,7 +113,7 @@ } private boolean isSubstitutionGraph() { - return usages().count() == 1 && usages().first() instanceof ReturnNode; + return getUsageCount() == 1 && usages().first() instanceof ReturnNode; } /**
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java Tue Jan 27 13:09:17 2015 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java Tue Jan 27 13:17:53 2015 +0100 @@ -69,7 +69,7 @@ @Override public boolean verify() { - assert usages().count() <= 1 : "call target may only be used by a single invoke"; + assert getUsageCount() <= 1 : "call target may only be used by a single invoke"; for (Node n : usages()) { assertTrue(n instanceof Invoke, "call target can only be used from an invoke (%s)", n); }
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/OptimizeGuardAnchorsPhase.java Tue Jan 27 13:09:17 2015 +0100 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/OptimizeGuardAnchorsPhase.java Tue Jan 27 13:17:53 2015 +0100 @@ -96,7 +96,7 @@ int successorCount = controlSplit.successors().count(); List<GuardNode> otherGuards = new ArrayList<>(successorCount - 1); for (GuardNode guard : successor.guards().snapshot()) { - if (guard.isDeleted() || guard.condition().usages().count() < successorCount) { + if (guard.isDeleted() || guard.condition().getUsageCount() < successorCount) { continue; } for (GuardNode conditonGuard : guard.condition().usages().filter(GuardNode.class)) { @@ -129,10 +129,10 @@ private static BeginNode findMinimumUsagesSuccessor(ControlSplitNode controlSplit) { NodePosIterator successors = controlSplit.successors().iterator(); BeginNode min = (BeginNode) successors.next(); - int minUsages = min.usages().count(); + int minUsages = min.getUsageCount(); while (successors.hasNext()) { BeginNode successor = (BeginNode) successors.next(); - int count = successor.usages().count(); + int count = successor.getUsageCount(); if (count < minUsages) { minUsages = count; min = successor;
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java Tue Jan 27 13:09:17 2015 +0100 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java Tue Jan 27 13:17:53 2015 +0100 @@ -460,7 +460,7 @@ throw new GraalInternalError("unknown scheduling strategy"); } if (!dominates(earliestBlock, block)) { - throw new SchedulingError("%s: Graph cannot be scheduled : inconsistent for %s, %d usages, (%s needs to dominate %s)", node.graph(), node, node.usages().count(), earliestBlock, block); + throw new SchedulingError("%s: Graph cannot be scheduled : inconsistent for %s, %d usages, (%s needs to dominate %s)", node.graph(), node, node.getUsageCount(), earliestBlock, block); } cfg.getNodeToBlock().set(node, block); blockToNodesMap.get(block).add(node);
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPhase.java Tue Jan 27 13:09:17 2015 +0100 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPhase.java Tue Jan 27 13:17:53 2015 +0100 @@ -407,7 +407,7 @@ Debug.log("%s: Checkcast used in a return with forNodeIntrinsic stamp", Debug.contextSnapshot(JavaMethod.class)); } else if (usage instanceof IsNullNode) { if (!usage.hasNoUsages()) { - assert usage.usages().count() == 1 && usage.usages().first().predecessor() == input : usage + " " + input; + assert usage.getUsageCount() == 1 && usage.usages().first().predecessor() == input : usage + " " + input; graph.replaceFloating((FloatingNode) usage, LogicConstantNode.contradiction(graph)); Debug.log("%s: Replaced IsNull with false", Debug.contextSnapshot(JavaMethod.class)); } else {
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeBlockState.java Tue Jan 27 13:09:17 2015 +0100 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeBlockState.java Tue Jan 27 13:17:53 2015 +0100 @@ -102,7 +102,7 @@ commit.addLocks(monitorIds); } - assert commit.usages().filter(AllocatedObjectNode.class).count() == commit.usages().count(); + assert commit.usages().filter(AllocatedObjectNode.class).count() == commit.getUsageCount(); List<AllocatedObjectNode> materializedValues = commit.usages().filter(AllocatedObjectNode.class).snapshot(); for (int i = 0; i < commit.getValues().size(); i++) { if (materializedValues.contains(commit.getValues().get(i))) {
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java Tue Jan 27 13:09:17 2015 +0100 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java Tue Jan 27 13:17:53 2015 +0100 @@ -125,7 +125,7 @@ private void processNodeWithState(NodeWithState nodeWithState, final BlockT state, final GraphEffectList effects) { for (FrameState fs : nodeWithState.states()) { FrameState frameState = fs; - if (frameState.usages().count() > 1) { + if (frameState.getUsageCount() > 1) { FrameState copy = (FrameState) frameState.copyWithInputs(); nodeWithState.asNode().replaceFirstInput(frameState, copy); frameState = copy;
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/WordCastNode.java Tue Jan 27 13:09:17 2015 +0100 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/WordCastNode.java Tue Jan 27 13:17:53 2015 +0100 @@ -61,7 +61,7 @@ @Override public Node canonical(CanonicalizerTool tool) { - if (usages().count() == 0) { + if (getUsageCount() == 0) { /* If the cast is unused, it can be eliminated. */ return input; }