Mercurial > hg > truffle
changeset 9490:3822ce079ec4
Merge
author | Christian Wimmer <christian.wimmer@oracle.com> |
---|---|
date | Wed, 01 May 2013 18:08:07 -0700 |
parents | b9e66fc67b31 (current diff) 0285fbb8b05d (diff) |
children | 789cfd153265 |
files | |
diffstat | 3 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeUtil.java Wed May 01 18:07:00 2013 -0700 +++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeUtil.java Wed May 01 18:08:07 2013 -0700 @@ -234,7 +234,8 @@ for (long fieldOffset : nodeClass.nodeArrayFieldOffsets) { Node[] children = (Node[]) unsafe.getObject(orig, fieldOffset); if (children != null) { - Node[] clonedChildren = new Node[children.length]; + Node[] clonedChildren = children.clone(); + Arrays.fill(clonedChildren, null); for (int i = 0; i < children.length; i++) { Node clonedChild = cloneNode(children[i]); if (clonedChild == null) { @@ -392,7 +393,10 @@ if (clazz.isInstance(childNode)) { return (T) childNode; } else { - return findFirstNodeInstance(childNode, clazz); + T node = findFirstNodeInstance(childNode, clazz); + if (node != null) { + return node; + } } } return null;
--- a/make/windows/makefiles/projectcreator.make Wed May 01 18:07:00 2013 -0700 +++ b/make/windows/makefiles/projectcreator.make Wed May 01 18:08:07 2013 -0700 @@ -55,6 +55,7 @@ -relativeInclude src\os\windows\vm \ -relativeInclude src\os_cpu\windows_$(Platform_arch)\vm \ -relativeInclude src\cpu\$(Platform_arch)\vm \ + -relativeInclude src\gpu \ -absoluteInclude $(HOTSPOTBUILDSPACE)/%f/generated \ -relativeSrcInclude src \ -absoluteSrcInclude $(HOTSPOTBUILDSPACE) \