# HG changeset patch
# User Christian Wimmer <christian.wimmer@oracle.com>
# Date 1367456887 25200
# Node ID 3822ce079ec4e7f876ef68ebf2a409760f939c65
# Parent  b9e66fc67b317d814ef50f90eaf0cd49eabeea66# Parent  0285fbb8b05d7b8d408224cd6be58c40b4f45a20
Merge

diff -r b9e66fc67b31 -r 3822ce079ec4 graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeUtil.java
--- 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;
diff -r b9e66fc67b31 -r 3822ce079ec4 make/windows/makefiles/projectcreator.make
--- 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) \
diff -r b9e66fc67b31 -r 3822ce079ec4 src/gpu/ptx/gpu_ptx.cpp
--- a/src/gpu/ptx/gpu_ptx.cpp	Wed May 01 18:07:00 2013 -0700
+++ b/src/gpu/ptx/gpu_ptx.cpp	Wed May 01 18:08:07 2013 -0700
@@ -22,7 +22,7 @@
  *
  */
 
-
+#include "precompiled.hpp"
 #include "runtime/gpu.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ostream.hpp"