--- /dev/null	2017-01-22 10:16:57.869617664 -0800
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ReturnNode.java	2017-02-15 17:06:50.058132560 -0800
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.nodes;
+
+import static org.graalvm.compiler.nodeinfo.InputType.Extension;
+import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
+
+import org.graalvm.compiler.core.common.type.StampFactory;
+import org.graalvm.compiler.graph.IterableNodeType;
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.memory.MemoryMapNode;
+import org.graalvm.compiler.nodes.spi.LIRLowerable;
+import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+
+import jdk.vm.ci.code.TargetDescription;
+import jdk.vm.ci.meta.JavaKind;
+
+@NodeInfo(cycles = CYCLES_UNKNOWN, size = SIZE_UNKNOWN)
+public final class ReturnNode extends ControlSinkNode implements LIRLowerable, IterableNodeType {
+
+    public static final NodeClass<ReturnNode> TYPE = NodeClass.create(ReturnNode.class);
+    @OptionalInput ValueNode result;
+    @OptionalInput(Extension) MemoryMapNode memoryMap;
+
+    public ValueNode result() {
+        return result;
+    }
+
+    public ReturnNode(ValueNode result) {
+        this(result, null);
+    }
+
+    public ReturnNode(ValueNode result, MemoryMapNode memoryMap) {
+        super(TYPE, StampFactory.forVoid());
+        this.result = result;
+        this.memoryMap = memoryMap;
+    }
+
+    @Override
+    public void generate(NodeLIRBuilderTool gen) {
+        assert verifyReturn(gen.getLIRGeneratorTool().target());
+        if (result == null) {
+            gen.getLIRGeneratorTool().emitReturn(JavaKind.Void, null);
+        } else {
+            gen.getLIRGeneratorTool().emitReturn(result.getStackKind(), gen.operand(result));
+        }
+    }
+
+    public void setMemoryMap(MemoryMapNode memoryMap) {
+        updateUsages(this.memoryMap, memoryMap);
+        this.memoryMap = memoryMap;
+    }
+
+    public MemoryMapNode getMemoryMap() {
+        return memoryMap;
+    }
+
+    private boolean verifyReturn(TargetDescription target) {
+        if (graph().method() != null) {
+            JavaKind actual = result == null ? JavaKind.Void : result.getStackKind();
+            JavaKind expected = graph().method().getSignature().getReturnKind().getStackKind();
+            if (actual == target.wordJavaKind && expected == JavaKind.Object) {
+                // OK, we're compiling a snippet that returns a Word
+                return true;
+            }
+            assert actual == expected : "return kind doesn't match: actual " + actual + ", expected: " + expected;
+        }
+        return true;
+    }
+}