comparison graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MemoryPhiNode.java @ 18995:a2cb19764970

Rename MergeNode to AbstractMergeNode.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Wed, 28 Jan 2015 01:04:20 +0100
parents f57d86eb036f
children ec0733b5a90a
comparison
equal deleted inserted replaced
18994:8b4ef818169c 18995:a2cb19764970
35 public class MemoryPhiNode extends PhiNode implements MemoryNode { 35 public class MemoryPhiNode extends PhiNode implements MemoryNode {
36 36
37 @Input(InputType.Memory) NodeInputList<ValueNode> values; 37 @Input(InputType.Memory) NodeInputList<ValueNode> values;
38 protected final LocationIdentity locationIdentity; 38 protected final LocationIdentity locationIdentity;
39 39
40 public MemoryPhiNode(MergeNode merge, LocationIdentity locationIdentity) { 40 public MemoryPhiNode(AbstractMergeNode merge, LocationIdentity locationIdentity) {
41 super(StampFactory.forVoid(), merge); 41 super(StampFactory.forVoid(), merge);
42 this.locationIdentity = locationIdentity; 42 this.locationIdentity = locationIdentity;
43 this.values = new NodeInputList<>(this); 43 this.values = new NodeInputList<>(this);
44 } 44 }
45 45
46 public MemoryPhiNode(MergeNode merge, LocationIdentity locationIdentity, ValueNode[] values) { 46 public MemoryPhiNode(AbstractMergeNode merge, LocationIdentity locationIdentity, ValueNode[] values) {
47 super(StampFactory.forVoid(), merge); 47 super(StampFactory.forVoid(), merge);
48 this.locationIdentity = locationIdentity; 48 this.locationIdentity = locationIdentity;
49 this.values = new NodeInputList<>(this, values); 49 this.values = new NodeInputList<>(this, values);
50 } 50 }
51 51