*** old/src/share/vm/opto/node.hpp	Mon Jan 18 21:38:35 2016
--- new/src/share/vm/opto/node.hpp	Mon Jan 18 21:38:34 2016

*** 651,661 ****
--- 651,661 ----
        DEFINE_CLASS_ID(MachMerge,        Mach, 6)
  
      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)
          DEFINE_CLASS_ID(DecodeN, DecodeNarrowPtr, 0)
          DEFINE_CLASS_ID(DecodeNKlass, DecodeNarrowPtr, 1)