Mercurial > hg > truffle
changeset 15017:ff5660822992
Merge
author | Andreas Woess <andreas.woess@jku.at> |
---|---|
date | Mon, 07 Apr 2014 23:35:41 +0200 |
parents | 05e5ab3d4d0f (current diff) 62e9e9c6ac38 (diff) |
children | db4254246f9a |
files | |
diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConditionAnchorNode.java Mon Apr 07 22:21:03 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConditionAnchorNode.java Mon Apr 07 23:35:41 2014 +0200 @@ -28,7 +28,7 @@ import com.oracle.graal.nodes.spi.*; import com.oracle.graal.nodes.type.*; -@NodeInfo(nameTemplate = "ConditionAnchor(!={p#negated})") +@NodeInfo(nameTemplate = "ConditionAnchor(!={p#negated})", allowedUsageTypes = {InputType.Guard}) public final class ConditionAnchorNode extends FixedWithNextNode implements Canonicalizable, Lowerable, GuardingNode { @Input(InputType.Condition) private LogicNode condition;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Mon Apr 07 22:21:03 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Mon Apr 07 23:35:41 2014 +0200 @@ -33,8 +33,8 @@ /** * The ValueAnchor instruction keeps non-CFG (floating) nodes above a certain point in the graph. */ -@NodeInfo(allowedUsageTypes = {InputType.Anchor}) -public final class ValueAnchorNode extends FixedWithNextNode implements LIRLowerable, Simplifiable, Virtualizable { +@NodeInfo(allowedUsageTypes = {InputType.Anchor, InputType.Guard}) +public final class ValueAnchorNode extends FixedWithNextNode implements LIRLowerable, Simplifiable, Virtualizable, GuardingNode { @Input(InputType.Guard) private ValueNode anchored;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeLoadFinalNode.java Mon Apr 07 22:21:03 2014 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeLoadFinalNode.java Mon Apr 07 23:35:41 2014 +0200 @@ -40,8 +40,8 @@ public class CustomizedUnsafeLoadFinalNode extends FixedWithNextNode implements Canonicalizable, Virtualizable, Lowerable { @Input private ValueNode object; @Input private ValueNode offset; - @Input(InputType.Condition) private ValueNode condition; - @Input(InputType.Association) private ValueNode location; + @Input private ValueNode condition; + @Input private ValueNode location; private final Kind accessKind; public CustomizedUnsafeLoadFinalNode(ValueNode object, ValueNode offset, ValueNode condition, ValueNode location, Kind accessKind) {