*** old/src/share/vm/opto/node.hpp	Sat Jun  2 20:04:17 2012
--- new/src/share/vm/opto/node.hpp	Sat Jun  2 20:04:17 2012

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 98,107 ****
--- 98,108 ----
  class Matcher;
  class MemBarNode;
  class MemBarStoreStoreNode;
  class MemNode;
  class MergeMemNode;
+ class MulNode;
  class MultiNode;
  class MultiBranchNode;
  class NeverBranchNode;
  class Node;
  class Node_Array;

*** 131,142 ****
--- 132,143 ----
  class SubNode;
  class Type;
  class TypeNode;
  class UnlockNode;
  class VectorNode;
! class VectorLoadNode;
! class VectorStoreNode;
! class LoadVectorNode;
! class StoreVectorNode;
  class VectorSet;
  typedef void (*NFunc)(Node&,void*);
  extern "C" {
    typedef int (*C_sort_func_t)(const void *, const void *);
  }

*** 607,619 ****
--- 608,620 ----
        DEFINE_CLASS_ID(Parm,      Proj, 4)
        DEFINE_CLASS_ID(MachProj,  Proj, 5)
  
      DEFINE_CLASS_ID(Mem,   Node, 4)
        DEFINE_CLASS_ID(Load,  Mem, 0)
!         DEFINE_CLASS_ID(VectorLoad,  Load, 0)
!         DEFINE_CLASS_ID(LoadVector,  Load, 0)
        DEFINE_CLASS_ID(Store, Mem, 1)
!         DEFINE_CLASS_ID(VectorStore, Store, 0)
!         DEFINE_CLASS_ID(StoreVector, Store, 0)
        DEFINE_CLASS_ID(LoadStore, Mem, 2)
  
      DEFINE_CLASS_ID(Region, Node, 5)
        DEFINE_CLASS_ID(Loop, Region, 0)
          DEFINE_CLASS_ID(Root,        Loop, 0)

*** 627,638 ****
--- 628,640 ----
      DEFINE_CLASS_ID(MergeMem, Node, 7)
      DEFINE_CLASS_ID(Bool,     Node, 8)
      DEFINE_CLASS_ID(AddP,     Node, 9)
      DEFINE_CLASS_ID(BoxLock,  Node, 10)
      DEFINE_CLASS_ID(Add,      Node, 11)
!     DEFINE_CLASS_ID(Vector,   Node, 12)
!     DEFINE_CLASS_ID(ClearArray, Node, 13)
!     DEFINE_CLASS_ID(Mul,      Node, 12)
!     DEFINE_CLASS_ID(Vector,   Node, 13)
+     DEFINE_CLASS_ID(ClearArray, Node, 14)
  
      _max_classes  = ClassMask_ClearArray
    };
    #undef DEFINE_CLASS_ID
  

*** 750,759 ****
--- 752,762 ----
    DEFINE_CLASS_QUERY(MachTemp)
    DEFINE_CLASS_QUERY(Mem)
    DEFINE_CLASS_QUERY(MemBar)
    DEFINE_CLASS_QUERY(MemBarStoreStore)
    DEFINE_CLASS_QUERY(MergeMem)
+   DEFINE_CLASS_QUERY(Mul)
    DEFINE_CLASS_QUERY(Multi)
    DEFINE_CLASS_QUERY(MultiBranch)
    DEFINE_CLASS_QUERY(Parm)
    DEFINE_CLASS_QUERY(PCTable)
    DEFINE_CLASS_QUERY(Phi)

*** 765,776 ****
--- 768,779 ----
    DEFINE_CLASS_QUERY(Start)
    DEFINE_CLASS_QUERY(Store)
    DEFINE_CLASS_QUERY(Sub)
    DEFINE_CLASS_QUERY(Type)
    DEFINE_CLASS_QUERY(Vector)
!   DEFINE_CLASS_QUERY(VectorLoad)
!   DEFINE_CLASS_QUERY(VectorStore)
!   DEFINE_CLASS_QUERY(LoadVector)
!   DEFINE_CLASS_QUERY(StoreVector)
    DEFINE_CLASS_QUERY(Unlock)
  
    #undef DEFINE_CLASS_QUERY
  
    // duplicate of is_MachSpillCopy()