# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1367605558 -7200
# Node ID 49b2c7b65e62c3c55adcd5b9fa4390f1e21deece
# Parent  c45c0bda360298f492bd96d020332080fb79abcc# Parent  3bb1834202f7f988f223f2761375f89a609e0396
Merge (fixed: 3bb1834202f7 Merge)

diff -r 3bb1834202f7 -r 49b2c7b65e62 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/CommitAllocationNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/CommitAllocationNode.java	Thu May 02 17:35:36 2013 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/CommitAllocationNode.java	Fri May 03 20:25:58 2013 +0200
@@ -35,7 +35,7 @@
 
     @Input private final NodeInputList<VirtualObjectNode> virtualObjects = new NodeInputList<>(this);
     @Input private final NodeInputList<ValueNode> values = new NodeInputList<>(this);
-    private final List<int[]> locks = new ArrayList<>();
+    private List<int[]> locks = new ArrayList<>();
 
     public CommitAllocationNode() {
         super(StampFactory.forVoid());
@@ -72,6 +72,13 @@
     }
 
     @Override
+    public Node clone(Graph into) {
+        CommitAllocationNode clone = (CommitAllocationNode) super.clone(into);
+        clone.locks = new ArrayList<>(locks);
+        return clone;
+    }
+
+    @Override
     public void virtualize(VirtualizerTool tool) {
         int pos = 0;
         for (int i = 0; i < virtualObjects.size(); i++) {