src/hotspot/share/opto/node.hpp

*** 83,10 ***
--- 83,11 ---
  class EncodeNarrowPtrNode;
  class EncodePNode;
  class EncodePKlassNode;
  class FastLockNode;
  class FastUnlockNode;
+ class FlatArrayCheckNode;
  class HaltNode;
  class IfNode;
  class IfProjNode;
  class IfFalseNode;
  class IfTrueNode;

*** 115,16 ***
--- 116,18 ---
  class MachIfNode;
  class MachJumpNode;
  class MachNode;
  class MachNullCheckNode;
  class MachProjNode;
+ class MachPrologNode;
  class MachReturnNode;
  class MachSafePointNode;
  class MachSpillCopyNode;
  class MachTempNode;
  class MachMergeNode;
  class MachMemBarNode;
+ class MachVEPNode;
  class Matcher;
  class MemBarNode;
  class MemBarStoreStoreNode;
  class MemNode;
  class MergeMemNode;

*** 174,10 ***
--- 177,11 ---
  class SubNode;
  class SubTypeCheckNode;
  class Type;
  class TypeNode;
  class UnlockNode;
+ class InlineTypeNode;
  class VectorNode;
  class LoadVectorNode;
  class LoadVectorMaskedNode;
  class StoreVectorMaskedNode;
  class LoadVectorGatherNode;

*** 688,10 ***
--- 692,11 ---
          DEFINE_CLASS_ID(NeverBranch, MultiBranch, 2)
        DEFINE_CLASS_ID(Start,       Multi, 2)
        DEFINE_CLASS_ID(MemBar,      Multi, 3)
          DEFINE_CLASS_ID(Initialize,       MemBar, 0)
          DEFINE_CLASS_ID(MemBarStoreStore, MemBar, 1)
+         DEFINE_CLASS_ID(Blackhole,        MemBar, 2)
  
      DEFINE_CLASS_ID(Mach,  Node, 1)
        DEFINE_CLASS_ID(MachReturn, Mach, 0)
          DEFINE_CLASS_ID(MachSafePoint, MachReturn, 0)
            DEFINE_CLASS_ID(MachCall, MachSafePoint, 0)

*** 709,10 ***
--- 714,12 ---
        DEFINE_CLASS_ID(MachConstantBase, Mach, 4)
        DEFINE_CLASS_ID(MachConstant,     Mach, 5)
          DEFINE_CLASS_ID(MachJump,       MachConstant, 0)
        DEFINE_CLASS_ID(MachMerge,        Mach, 6)
        DEFINE_CLASS_ID(MachMemBar,       Mach, 7)
+       DEFINE_CLASS_ID(MachProlog,       Mach, 8)
+       DEFINE_CLASS_ID(MachVEP,          Mach, 9)
  
      DEFINE_CLASS_ID(Type,  Node, 2)
        DEFINE_CLASS_ID(Phi,   Type, 0)
        DEFINE_CLASS_ID(ConstraintCast, Type, 1)
          DEFINE_CLASS_ID(CastII, ConstraintCast, 0)

*** 738,14 ***
          DEFINE_CLASS_ID(CompressV, Vector, 4)
          DEFINE_CLASS_ID(ExpandV, Vector, 5)
          DEFINE_CLASS_ID(CompressM, Vector, 6)
          DEFINE_CLASS_ID(Reduction, Vector, 7)
          DEFINE_CLASS_ID(NegV, Vector, 8)
!       DEFINE_CLASS_ID(Con, Type, 8)
            DEFINE_CLASS_ID(ConI, Con, 0)
!       DEFINE_CLASS_ID(SafePointScalarMerge, Type, 9)
!       DEFINE_CLASS_ID(Convert, Type, 10)
  
  
      DEFINE_CLASS_ID(Proj,  Node, 3)
        DEFINE_CLASS_ID(CatchProj, Proj, 0)
        DEFINE_CLASS_ID(JumpProj,  Proj, 1)
--- 745,15 ---
          DEFINE_CLASS_ID(CompressV, Vector, 4)
          DEFINE_CLASS_ID(ExpandV, Vector, 5)
          DEFINE_CLASS_ID(CompressM, Vector, 6)
          DEFINE_CLASS_ID(Reduction, Vector, 7)
          DEFINE_CLASS_ID(NegV, Vector, 8)
!       DEFINE_CLASS_ID(InlineType, Type, 8)
+       DEFINE_CLASS_ID(Con, Type, 9)
            DEFINE_CLASS_ID(ConI, Con, 0)
!       DEFINE_CLASS_ID(SafePointScalarMerge, Type, 10)
!       DEFINE_CLASS_ID(Convert, Type, 11)
  
  
      DEFINE_CLASS_ID(Proj,  Node, 3)
        DEFINE_CLASS_ID(CatchProj, Proj, 0)
        DEFINE_CLASS_ID(JumpProj,  Proj, 1)

*** 779,13 ***
            DEFINE_CLASS_ID(LongCountedLoop,   BaseCountedLoop, 1)
          DEFINE_CLASS_ID(OuterStripMinedLoop, Loop, 2)
  
      DEFINE_CLASS_ID(Sub,   Node, 6)
        DEFINE_CLASS_ID(Cmp,   Sub, 0)
!         DEFINE_CLASS_ID(FastLock,   Cmp, 0)
!         DEFINE_CLASS_ID(FastUnlock, Cmp, 1)
!         DEFINE_CLASS_ID(SubTypeCheck,Cmp, 2)
  
      DEFINE_CLASS_ID(MergeMem, Node, 7)
      DEFINE_CLASS_ID(Bool,     Node, 8)
      DEFINE_CLASS_ID(AddP,     Node, 9)
      DEFINE_CLASS_ID(BoxLock,  Node, 10)
--- 787,14 ---
            DEFINE_CLASS_ID(LongCountedLoop,   BaseCountedLoop, 1)
          DEFINE_CLASS_ID(OuterStripMinedLoop, Loop, 2)
  
      DEFINE_CLASS_ID(Sub,   Node, 6)
        DEFINE_CLASS_ID(Cmp,   Sub, 0)
!         DEFINE_CLASS_ID(FastLock,       Cmp, 0)
!         DEFINE_CLASS_ID(FastUnlock,     Cmp, 1)
!         DEFINE_CLASS_ID(SubTypeCheck,   Cmp, 2)
+         DEFINE_CLASS_ID(FlatArrayCheck, Cmp, 3)
  
      DEFINE_CLASS_ID(MergeMem, Node, 7)
      DEFINE_CLASS_ID(Bool,     Node, 8)
      DEFINE_CLASS_ID(AddP,     Node, 9)
      DEFINE_CLASS_ID(BoxLock,  Node, 10)

*** 887,10 ***
--- 896,11 ---
    DEFINE_CLASS_QUERY(Allocate)
    DEFINE_CLASS_QUERY(AllocateArray)
    DEFINE_CLASS_QUERY(ArrayCopy)
    DEFINE_CLASS_QUERY(BaseCountedLoop)
    DEFINE_CLASS_QUERY(BaseCountedLoopEnd)
+   DEFINE_CLASS_QUERY(Blackhole)
    DEFINE_CLASS_QUERY(Bool)
    DEFINE_CLASS_QUERY(BoxLock)
    DEFINE_CLASS_QUERY(Call)
    DEFINE_CLASS_QUERY(CallDynamicJava)
    DEFINE_CLASS_QUERY(CallJava)

*** 918,10 ***
--- 928,11 ---
    DEFINE_CLASS_QUERY(EncodeNarrowPtr)
    DEFINE_CLASS_QUERY(EncodeP)
    DEFINE_CLASS_QUERY(EncodePKlass)
    DEFINE_CLASS_QUERY(FastLock)
    DEFINE_CLASS_QUERY(FastUnlock)
+   DEFINE_CLASS_QUERY(FlatArrayCheck)
    DEFINE_CLASS_QUERY(Halt)
    DEFINE_CLASS_QUERY(If)
    DEFINE_CLASS_QUERY(RangeCheck)
    DEFINE_CLASS_QUERY(IfProj)
    DEFINE_CLASS_QUERY(IfFalse)

*** 950,16 ***
--- 961,18 ---
    DEFINE_CLASS_QUERY(MachGoto)
    DEFINE_CLASS_QUERY(MachIf)
    DEFINE_CLASS_QUERY(MachJump)
    DEFINE_CLASS_QUERY(MachNullCheck)
    DEFINE_CLASS_QUERY(MachProj)
+   DEFINE_CLASS_QUERY(MachProlog)
    DEFINE_CLASS_QUERY(MachReturn)
    DEFINE_CLASS_QUERY(MachSafePoint)
    DEFINE_CLASS_QUERY(MachSpillCopy)
    DEFINE_CLASS_QUERY(MachTemp)
    DEFINE_CLASS_QUERY(MachMemBar)
    DEFINE_CLASS_QUERY(MachMerge)
+   DEFINE_CLASS_QUERY(MachVEP)
    DEFINE_CLASS_QUERY(Mem)
    DEFINE_CLASS_QUERY(MemBar)
    DEFINE_CLASS_QUERY(MemBarStoreStore)
    DEFINE_CLASS_QUERY(MergeMem)
    DEFINE_CLASS_QUERY(Move)

*** 990,10 ***
--- 1003,11 ---
    DEFINE_CLASS_QUERY(Start)
    DEFINE_CLASS_QUERY(Store)
    DEFINE_CLASS_QUERY(Sub)
    DEFINE_CLASS_QUERY(SubTypeCheck)
    DEFINE_CLASS_QUERY(Type)
+   DEFINE_CLASS_QUERY(InlineType)
    DEFINE_CLASS_QUERY(Vector)
    DEFINE_CLASS_QUERY(VectorMaskCmp)
    DEFINE_CLASS_QUERY(VectorUnbox)
    DEFINE_CLASS_QUERY(VectorReinterpret)
    DEFINE_CLASS_QUERY(CompressV)