# HG changeset patch # User Lukas Stadler # Date 1403708101 -7200 # Node ID 4182366b8eed03e67be33b0f397dac2a2656e630 # Parent 24c30ecf930f2dff388f3f24b2dec96000bea7db rename getInput() to getValue() in LogicNegationNode diff -r 24c30ecf930f -r 4182366b8eed graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractFixedGuardNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractFixedGuardNode.java Wed Jun 25 16:55:01 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractFixedGuardNode.java Wed Jun 25 16:55:01 2014 +0200 @@ -78,7 +78,7 @@ public void simplify(SimplifierTool tool) { while (condition instanceof LogicNegationNode) { LogicNegationNode negation = (LogicNegationNode) condition; - setCondition(negation.getInput()); + setCondition(negation.getValue()); negated = !negated; } } diff -r 24c30ecf930f -r 4182366b8eed graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConditionAnchorNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConditionAnchorNode.java Wed Jun 25 16:55:01 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConditionAnchorNode.java Wed Jun 25 16:55:01 2014 +0200 @@ -70,7 +70,7 @@ public Node canonical(CanonicalizerTool tool) { if (condition instanceof LogicNegationNode) { LogicNegationNode negation = (LogicNegationNode) condition; - setCondition(negation.getInput()); + setCondition(negation.getValue()); negated = !negated; } diff -r 24c30ecf930f -r 4182366b8eed graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java Wed Jun 25 16:55:01 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java Wed Jun 25 16:55:01 2014 +0200 @@ -103,7 +103,7 @@ public Node canonical(CanonicalizerTool tool) { if (condition() instanceof LogicNegationNode) { LogicNegationNode negation = (LogicNegationNode) condition(); - return graph().unique(new GuardNode(negation.getInput(), getAnchor(), reason, action, !negated, speculation)); + return graph().unique(new GuardNode(negation.getValue(), getAnchor(), reason, action, !negated, speculation)); } else if (condition() instanceof LogicConstantNode) { LogicConstantNode c = (LogicConstantNode) condition(); if (c.getValue() != negated) { diff -r 24c30ecf930f -r 4182366b8eed graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Wed Jun 25 16:55:01 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Wed Jun 25 16:55:01 2014 +0200 @@ -147,7 +147,7 @@ setTrueSuccessor(null); setFalseSuccessor(null); LogicNegationNode negation = (LogicNegationNode) condition(); - IfNode newIfNode = graph().add(new IfNode(negation.getInput(), falseSucc, trueSucc, 1 - trueSuccessorProbability)); + IfNode newIfNode = graph().add(new IfNode(negation.getValue(), falseSucc, trueSucc, 1 - trueSuccessorProbability)); predecessor().replaceFirstSuccessor(this, newIfNode); GraphUtil.killWithUnusedFloatingInputs(this); return; diff -r 24c30ecf930f -r 4182366b8eed graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicNegationNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicNegationNode.java Wed Jun 25 16:55:01 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicNegationNode.java Wed Jun 25 16:55:01 2014 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,20 +30,20 @@ */ public class LogicNegationNode extends LogicNode implements Canonicalizable { - @Input(InputType.Condition) private LogicNode input; + @Input(InputType.Condition) private LogicNode value; - public LogicNegationNode(LogicNode input) { - this.input = input; + public LogicNegationNode(LogicNode value) { + this.value = value; } - public LogicNode getInput() { - return input; + public LogicNode getValue() { + return value; } @Override public Node canonical(CanonicalizerTool tool) { - if (input instanceof LogicNegationNode) { - return ((LogicNegationNode) input).getInput(); + if (value instanceof LogicNegationNode) { + return ((LogicNegationNode) value).getValue(); } else { return this; } diff -r 24c30ecf930f -r 4182366b8eed graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ShortCircuitOrNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ShortCircuitOrNode.java Wed Jun 25 16:55:01 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ShortCircuitOrNode.java Wed Jun 25 16:55:01 2014 +0200 @@ -69,14 +69,14 @@ LogicNode xCond = x; boolean xNeg = xNegated; while (xCond instanceof LogicNegationNode) { - xCond = ((LogicNegationNode) xCond).getInput(); + xCond = ((LogicNegationNode) xCond).getValue(); xNeg = !xNeg; } LogicNode yCond = y; boolean yNeg = yNegated; while (yCond instanceof LogicNegationNode) { - yCond = ((LogicNegationNode) yCond).getInput(); + yCond = ((LogicNegationNode) yCond).getValue(); yNeg = !yNeg; } diff -r 24c30ecf930f -r 4182366b8eed graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java Wed Jun 25 16:55:01 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java Wed Jun 25 16:55:01 2014 +0200 @@ -76,7 +76,7 @@ public ValueNode canonical(CanonicalizerTool tool) { if (condition instanceof LogicNegationNode) { LogicNegationNode negated = (LogicNegationNode) condition; - return graph().unique(new ConditionalNode(negated.getInput(), falseValue(), trueValue())); + return graph().unique(new ConditionalNode(negated.getValue(), falseValue(), trueValue())); } // this optimizes the case where a value that can only be 0 or 1 is materialized to 0 or 1 diff -r 24c30ecf930f -r 4182366b8eed graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/State.java --- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/State.java Wed Jun 25 16:55:01 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/State.java Wed Jun 25 16:55:01 2014 +0200 @@ -647,7 +647,7 @@ } if (condition instanceof LogicNegationNode) { - addFact(!isTrue, ((LogicNegationNode) condition).getInput(), anchor); + addFact(!isTrue, ((LogicNegationNode) condition).getValue(), anchor); } else if (condition instanceof ShortCircuitOrNode) { /* * We can register the conditions being or-ed as long as the anchor is a fixed node,