--- old/src/share/vm/opto/node.hpp	2016-01-13 16:06:10.167177189 +0100
+++ new/src/share/vm/opto/node.hpp	2016-01-13 16:06:09.876979682 +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)
--- old/test/compiler/c2/8007294/Test8007294.java	2016-01-13 16:06:10.204185007 +0100
+++ new/test/compiler/c2/8007294/Test8007294.java	2016-01-13 16:06:09.903530191 +0100
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8007294
+ * @bug 8146999
  * @summary ReduceFieldZeroing doesn't check for dependent load and can lead to incorrect execution
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+AlwaysIncrementalInline -XX:-UseOnStackReplacement -XX:-BackgroundCompilation Test8007294
  *
@@ -82,6 +83,7 @@
             }
         }
         for (int i = 0; i < 20000; i++) {
+            test2(0);  // pollute profile
             int res = test2(1);
             if (res != 2) {
                 System.out.println("FAILED test2 = " + res);