# HG changeset patch # User Lukas Stadler # Date 1402676251 -7200 # Node ID 4af6f1fe425cb606e18a1209be70a1707b6def71 # Parent 5059c188c1e5459f6104fcf2a06df1d5c9b4f799 reduce unnecessary clearing of inputs diff -r 5059c188c1e5 -r 4af6f1fe425c graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java --- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java Fri Jun 13 17:00:12 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java Fri Jun 13 18:17:31 2014 +0200 @@ -289,7 +289,6 @@ stateAtExceptionEdge = obj.stateAfter(); UnwindNode unwindDuplicate = (UnwindNode) duplicates.get(unwindNode); obj.replaceAtUsages(unwindDuplicate.exception()); - unwindDuplicate.clearInputs(); Node n = obj.next(); obj.setNext(null); unwindDuplicate.replaceAndDelete(n); @@ -332,7 +331,6 @@ ReturnNode returnNode = (ReturnNode) duplicates.get(returnNodes.get(0)); Node returnValue = returnNode.result(); invokeNode.replaceAtUsages(returnValue); - returnNode.clearInputs(); returnNode.replaceAndDelete(n); } else { ArrayList returnDuplicates = new ArrayList<>(returnNodes.size()); @@ -454,7 +452,6 @@ } returnValuePhi.addInput(returnNode.result()); } - returnNode.clearInputs(); returnNode.replaceAndDelete(endNode); } diff -r 5059c188c1e5 -r 4af6f1fe425c graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/InstanceOfSnippetsTemplates.java --- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/InstanceOfSnippetsTemplates.java Fri Jun 13 17:00:12 2014 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/InstanceOfSnippetsTemplates.java Fri Jun 13 18:17:31 2014 +0200 @@ -234,7 +234,6 @@ public void replaceUsingInstantiation() { ValueNode newValue = instantiation.asMaterialization(usage.graph(), trueValue, falseValue); usage.replaceAtUsages(newValue); - usage.clearInputs(); assert usage.usages().isEmpty(); GraphUtil.killWithUnusedFloatingInputs(usage); } @@ -246,7 +245,6 @@ newNode.inferStamp(); instantiation.initialize(newNode, trueValue, falseValue); usage.replaceAtUsages(newNode); - usage.clearInputs(); assert usage.usages().isEmpty(); GraphUtil.killWithUnusedFloatingInputs(usage); } diff -r 5059c188c1e5 -r 4af6f1fe425c graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java --- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java Fri Jun 13 17:00:12 2014 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java Fri Jun 13 18:17:31 2014 +0200 @@ -1147,14 +1147,11 @@ next = fwn.next(); fwn.setNext(null); } - returnDuplicate.clearInputs(); returnDuplicate.replaceAndDelete(next); } } // Remove the replacee from its graph - replacee.clearInputs(); - replacee.replaceAtUsages(null); GraphUtil.killCFG(replacee); Debug.dump(replaceeGraph, "After lowering %s with %s", replacee, this); @@ -1241,7 +1238,6 @@ replacer.replace(replacee, returnValue, new DuplicateMapper(duplicates, replaceeGraph.start())); if (returnDuplicate.isAlive()) { - returnDuplicate.clearInputs(); returnDuplicate.replaceAndDelete(next); }