--- old/src/share/vm/opto/node.hpp	2016-01-18 21:38:35.183278359 +0100
+++ new/src/share/vm/opto/node.hpp	2016-01-18 21:38:34.895145744 +0100
@@ -653,7 +653,7 @@
     DEFINE_CLASS_ID(Type,  Node, 2)
       DEFINE_CLASS_ID(Phi,   Type, 0)
       DEFINE_CLASS_ID(ConstraintCast, Type, 1)
-      DEFINE_CLASS_ID(CheckCastPP, Type, 2)
+        DEFINE_CLASS_ID(CheckCastPP, ConstraintCast, 0)
       DEFINE_CLASS_ID(CMove, Type, 3)
       DEFINE_CLASS_ID(SafePointScalarObject, Type, 4)
       DEFINE_CLASS_ID(DecodeNarrowPtr, Type, 5)