Mercurial > hg > truffle
changeset 13575:55a8ca3f49f7
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 09 Jan 2014 11:46:07 +0100 |
parents | 29db3f666f8d (current diff) 1335577dc50c (diff) |
children | 4e679d50ba9a |
files | |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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); }