--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CheckGraalInvariants.java	Sat Aug 16 00:05:59 2014 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CheckGraalInvariants.java	Mon Aug 18 13:49:25 2014 +0200
@@ -188,10 +188,12 @@
                 if (c.getAnnotation(NodeInfo.class) == null) {
                     throw new AssertionError(String.format("Node subclass %s requires %s annotation", c.getName(), NodeClass.class.getSimpleName()));
                 }
-                try {
-                    Class.forName(c.getName() + "Gen");
-                } catch (ClassNotFoundException e) {
-                    throw new AssertionError(String.format("Missing generated Node class %s", c.getName() + "Gen"));
+                if (!Modifier.isAbstract(c.getModifiers())) {
+                    try {
+                        Class.forName(c.getName().replace('$', '_') + "Gen");
+                    } catch (ClassNotFoundException e) {
+                        throw new AssertionError(String.format("Missing generated Node class %s", c.getName() + "Gen"));
+                    }
                 }
             }
         }
@@ -202,6 +204,7 @@
      */
     private static void checkGraph(HighTierContext context, StructuredGraph graph, boolean verifyEquals) {
         if (verifyEquals) {
+            new VerifyNoNodeClassLiteralIdentityTests().apply(graph, context);
             new VerifyUsageWithEquals(Value.class).apply(graph, context);
             new VerifyUsageWithEquals(Register.class).apply(graph, context);
             new VerifyUsageWithEquals(JavaType.class).apply(graph, context);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/verify/VerifyNoNodeClassLiteralIdentityTests.java	Mon Aug 18 13:49:25 2014 +0200
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2014, 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 com.oracle.graal.phases.verify;
+
+import java.util.*;
+
+import com.oracle.graal.api.meta.*;
+import com.oracle.graal.graph.*;
+import com.oracle.graal.nodeinfo.*;
+import com.oracle.graal.nodes.*;
+import com.oracle.graal.nodes.calc.*;
+import com.oracle.graal.phases.*;
+import com.oracle.graal.phases.tiers.*;
+
+/**
+ * Since only {@linkplain GeneratedNode generated} {@link Node} types can be instantiated (which is
+ * checked by an assertion in {@link Node#Node()}), any identity test of a node's
+ * {@linkplain Object#getClass() class} against a class literal of a non-generated node types will
+ * always return false. Instead, a static {@code getGenClass()} helper method should be used for
+ * such identity tests. For example, instead of:
+ *
+ * <pre>
+ *     if (operation.getClass() == IntegerAddNode.class) { ... }
+ * </pre>
+ *
+ * this should be used:
+ *
+ * <pre>
+ *     if (operation.getClass() == IntegerAddNode.getGenClass()) { ... }
+ * </pre>
+ *
+ * This phase verifies there are no identity tests against class literals for non-generated Node
+ * types.
+ */
+public class VerifyNoNodeClassLiteralIdentityTests extends VerifyPhase<PhaseContext> {
+
+    @Override
+    protected boolean verify(StructuredGraph graph, PhaseContext context) {
+        List<String> literals = new ArrayList<>();
+        for (ConstantNode c : ConstantNode.getConstantNodes(graph)) {
+            ResolvedJavaType nodeClassType = context.getMetaAccess().lookupJavaType(Node.class);
+            ResolvedJavaType nodeType = context.getConstantReflection().asJavaType(c.asConstant());
+            if (nodeType != null && nodeClassType.isAssignableFrom(nodeType)) {
+                if (c.usages().filter(ObjectEqualsNode.class).isNotEmpty()) {
+                    literals.add(nodeType.toJavaName(false));
+                }
+            }
+        }
+        if (literals.isEmpty()) {
+            return true;
+        }
+        StackTraceElement ste = graph.method().asStackTraceElement(0);
+        throw new VerificationError("Found illegal identity test against following Node class literals in " + graph.method().format("%h.%n(%p)") + ": " + String.join(", ", literals) + "\n    " + ste);
+    }
+}