# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1389264367 -3600
# Node ID 55a8ca3f49f76c424a3e71be31b3e899f95d5249
# Parent  29db3f666f8da2ae5f0dd81dc0a134019bd26d48# Parent  1335577dc50cfaf0c4940c0e71f5643a70cd81df
Merge.

diff -r 29db3f666f8d -r 55a8ca3f49f7 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/NewFrameNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/NewFrameNode.java	Thu Jan 09 11:45:41 2014 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/NewFrameNode.java	Thu Jan 09 11:46:07 2014 +0100
@@ -186,7 +186,7 @@
         frameEntryState[frameFieldList.indexOf(localsField)] = virtualFrameObjectArray;
         frameEntryState[frameFieldList.indexOf(primitiveLocalsField)] = virtualFramePrimitiveArray;
         frameEntryState[frameFieldList.indexOf(tagsField)] = virtualFrameTagArray;
-        tool.createVirtualObject(virtualFrame, frameEntryState, null);
+        tool.createVirtualObject(virtualFrame, frameEntryState, Collections.<MonitorIdNode> emptyList());
         tool.replaceWithVirtual(virtualFrame);
     }