src/share/vm/opto/node.hpp

*** 96,105 ****
--- 96,106 ----
  class MachProjNode;
  class MachReturnNode;
  class MachSafePointNode;
  class MachSpillCopyNode;
  class MachTempNode;
+ class MachMergeNode;
  class Matcher;
  class MemBarNode;
  class MemBarStoreStoreNode;
  class MemNode;
  class MergeMemNode;
*** 589,598 ****
--- 590,600 ----
          DEFINE_CLASS_ID(MachNullCheck,  MachBranch, 2)
        DEFINE_CLASS_ID(MachSpillCopy,    Mach, 2)
        DEFINE_CLASS_ID(MachTemp,         Mach, 3)
        DEFINE_CLASS_ID(MachConstantBase, Mach, 4)
        DEFINE_CLASS_ID(MachConstant,     Mach, 5)
+       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)
*** 759,768 ****
--- 761,771 ----
    DEFINE_CLASS_QUERY(MachProj)
    DEFINE_CLASS_QUERY(MachReturn)
    DEFINE_CLASS_QUERY(MachSafePoint)
    DEFINE_CLASS_QUERY(MachSpillCopy)
    DEFINE_CLASS_QUERY(MachTemp)
+   DEFINE_CLASS_QUERY(MachMerge)
    DEFINE_CLASS_QUERY(Mem)
    DEFINE_CLASS_QUERY(MemBar)
    DEFINE_CLASS_QUERY(MemBarStoreStore)
    DEFINE_CLASS_QUERY(MergeMem)
    DEFINE_CLASS_QUERY(Mul)