# HG changeset patch
# User Lukas Stadler <lukas.stadler@oracle.com>
# Date 1404207437 -7200
# Node ID c88a9e432faf1723521b73847e6d07d131031b78
# Parent  524f5cf6cb95ea1dea30ba8fd6c0246d6e7c72ee
small fix and doc for @OptionalInput

diff -r 524f5cf6cb95 -r c88a9e432faf graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java	Mon Jun 30 19:34:05 2014 -0700
+++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java	Tue Jul 01 11:37:17 2014 +0200
@@ -59,10 +59,10 @@
     static final int ALIVE_ID_START = 0;
 
     /**
-     * Denotes a non-optional node input. This should be applied to exactly the fields of a node
-     * that are of type {@link Node} or {@link NodeInputList}. Nodes that update fields of type
-     * {@link Node} outside of their constructor should call {@link Node#updateUsages(Node, Node)}
-     * just prior to doing the update of the input.
+     * Denotes a non-optional (non-null) node input. This should be applied to exactly the fields of
+     * a node that are of type {@link Node} or {@link NodeInputList}. Nodes that update fields of
+     * type {@link Node} outside of their constructor should call
+     * {@link Node#updateUsages(Node, Node)} just prior to doing the update of the input.
      */
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.FIELD)
@@ -71,8 +71,8 @@
     }
 
     /**
-     * Denotes an optional node input. This should be applied to exactly the fields of a node that
-     * are of type {@link Node} or {@link NodeInputList}. Nodes that update fields of type
+     * Denotes an optional (nullable) node input. This should be applied to exactly the fields of a
+     * node that are of type {@link Node} or {@link NodeInputList}. Nodes that update fields of type
      * {@link Node} outside of their constructor should call {@link Node#updateUsages(Node, Node)}
      * just prior to doing the update of the input.
      */
diff -r 524f5cf6cb95 -r c88a9e432faf graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java	Mon Jun 30 19:34:05 2014 -0700
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java	Tue Jul 01 11:37:17 2014 +0200
@@ -61,7 +61,7 @@
      */
     @OptionalInput private final NodeInputList<ValueNode> values;
 
-    @Input(InputType.Association) private final NodeInputList<MonitorIdNode> monitorIds;
+    @OptionalInput(InputType.Association) private final NodeInputList<MonitorIdNode> monitorIds;
 
     @Input(InputType.State) private final NodeInputList<EscapeObjectState> virtualObjectMappings;