--- old/src/share/vm/opto/vectornode.hpp	2016-07-03 23:43:09.415471282 +0900
+++ new/src/share/vm/opto/vectornode.hpp	2016-07-03 23:43:09.279471847 +0900
@@ -55,7 +55,7 @@
   uint length() const { return vect_type()->length(); } // Vector length
   uint length_in_bytes() const { return vect_type()->length_in_bytes(); }
 
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 
   virtual uint ideal_reg() const { return Matcher::vector_ideal_reg(vect_type()->length_in_bytes()); }
 
@@ -78,7 +78,7 @@
 class AddVBNode : public VectorNode {
  public:
   AddVBNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------AddVSNode--------------------------------------
@@ -86,7 +86,7 @@
 class AddVSNode : public VectorNode {
  public:
   AddVSNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------AddVINode--------------------------------------
@@ -94,7 +94,7 @@
 class AddVINode : public VectorNode {
  public:
   AddVINode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------AddVLNode--------------------------------------
@@ -102,7 +102,7 @@
 class AddVLNode : public VectorNode {
 public:
   AddVLNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1, in2, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------AddVFNode--------------------------------------
@@ -110,7 +110,7 @@
 class AddVFNode : public VectorNode {
 public:
   AddVFNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1, in2, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------AddVDNode--------------------------------------
@@ -118,7 +118,7 @@
 class AddVDNode : public VectorNode {
 public:
   AddVDNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1, in2, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------ReductionNode------------------------------------
@@ -137,7 +137,7 @@
 class AddReductionVINode : public ReductionNode {
 public:
   AddReductionVINode(Node * ctrl, Node* in1, Node* in2) : ReductionNode(ctrl, in1, in2) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type* bottom_type() const { return TypeInt::INT; }
   virtual uint ideal_reg() const { return Op_RegI; }
 };
@@ -147,7 +147,7 @@
 class AddReductionVLNode : public ReductionNode {
 public:
   AddReductionVLNode(Node *ctrl, Node* in1, Node* in2) : ReductionNode(ctrl, in1, in2) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type* bottom_type() const { return TypeLong::LONG; }
   virtual uint ideal_reg() const { return Op_RegL; }
 };
@@ -157,7 +157,7 @@
 class AddReductionVFNode : public ReductionNode {
 public:
   AddReductionVFNode(Node *ctrl, Node* in1, Node* in2) : ReductionNode(ctrl, in1, in2) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type* bottom_type() const { return Type::FLOAT; }
   virtual uint ideal_reg() const { return Op_RegF; }
 };
@@ -167,7 +167,7 @@
 class AddReductionVDNode : public ReductionNode {
 public:
   AddReductionVDNode(Node *ctrl, Node* in1, Node* in2) : ReductionNode(ctrl, in1, in2) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type* bottom_type() const { return Type::DOUBLE; }
   virtual uint ideal_reg() const { return Op_RegD; }
 };
@@ -177,7 +177,7 @@
 class SubVBNode : public VectorNode {
  public:
   SubVBNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------SubVSNode--------------------------------------
@@ -185,7 +185,7 @@
 class SubVSNode : public VectorNode {
  public:
   SubVSNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------SubVINode--------------------------------------
@@ -193,7 +193,7 @@
 class SubVINode : public VectorNode {
  public:
   SubVINode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------SubVLNode--------------------------------------
@@ -201,7 +201,7 @@
 class SubVLNode : public VectorNode {
  public:
   SubVLNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------SubVFNode--------------------------------------
@@ -209,7 +209,7 @@
 class SubVFNode : public VectorNode {
  public:
   SubVFNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------SubVDNode--------------------------------------
@@ -217,7 +217,7 @@
 class SubVDNode : public VectorNode {
  public:
   SubVDNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------MulVSNode--------------------------------------
@@ -225,7 +225,7 @@
 class MulVSNode : public VectorNode {
  public:
   MulVSNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------MulVINode--------------------------------------
@@ -233,7 +233,7 @@
 class MulVINode : public VectorNode {
  public:
   MulVINode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------MulVLNode--------------------------------------
@@ -241,7 +241,7 @@
 class MulVLNode : public VectorNode {
 public:
   MulVLNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1, in2, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------MulVFNode--------------------------------------
@@ -249,7 +249,7 @@
 class MulVFNode : public VectorNode {
 public:
   MulVFNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1, in2, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------MulVDNode--------------------------------------
@@ -257,7 +257,7 @@
 class MulVDNode : public VectorNode {
 public:
   MulVDNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1, in2, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------CMoveVDNode--------------------------------------
@@ -265,7 +265,7 @@
 class CMoveVDNode : public VectorNode {
 public:
   CMoveVDNode(Node* in1, Node* in2, Node* in3, const TypeVect* vt) : VectorNode(in1, in2, in3, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------MulReductionVINode--------------------------------------
@@ -273,7 +273,7 @@
 class MulReductionVINode : public ReductionNode {
 public:
   MulReductionVINode(Node *ctrl, Node* in1, Node* in2) : ReductionNode(ctrl, in1, in2) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type* bottom_type() const { return TypeInt::INT; }
   virtual uint ideal_reg() const { return Op_RegI; }
 };
@@ -283,7 +283,7 @@
 class MulReductionVLNode : public ReductionNode {
 public:
   MulReductionVLNode(Node *ctrl, Node* in1, Node* in2) : ReductionNode(ctrl, in1, in2) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type* bottom_type() const { return TypeLong::LONG; }
   virtual uint ideal_reg() const { return Op_RegI; }
 };
@@ -293,7 +293,7 @@
 class MulReductionVFNode : public ReductionNode {
 public:
   MulReductionVFNode(Node *ctrl, Node* in1, Node* in2) : ReductionNode(ctrl, in1, in2) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type* bottom_type() const { return Type::FLOAT; }
   virtual uint ideal_reg() const { return Op_RegF; }
 };
@@ -303,7 +303,7 @@
 class MulReductionVDNode : public ReductionNode {
 public:
   MulReductionVDNode(Node *ctrl, Node* in1, Node* in2) : ReductionNode(ctrl, in1, in2) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type* bottom_type() const { return Type::DOUBLE; }
   virtual uint ideal_reg() const { return Op_RegD; }
 };
@@ -313,7 +313,7 @@
 class DivVFNode : public VectorNode {
  public:
   DivVFNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------DivVDNode--------------------------------------
@@ -321,7 +321,7 @@
 class DivVDNode : public VectorNode {
  public:
   DivVDNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------AbsVFNode--------------------------------------
@@ -329,7 +329,7 @@
 class AbsVFNode : public VectorNode {
  public:
   AbsVFNode(Node* in, const TypeVect* vt) : VectorNode(in,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------AbsVDNode--------------------------------------
@@ -337,7 +337,7 @@
 class AbsVDNode : public VectorNode {
  public:
   AbsVDNode(Node* in, const TypeVect* vt) : VectorNode(in,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------NegVFNode--------------------------------------
@@ -345,7 +345,7 @@
 class NegVFNode : public VectorNode {
  public:
   NegVFNode(Node* in, const TypeVect* vt) : VectorNode(in,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------NegVDNode--------------------------------------
@@ -353,7 +353,7 @@
 class NegVDNode : public VectorNode {
  public:
   NegVDNode(Node* in, const TypeVect* vt) : VectorNode(in,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------SqrtVDNode--------------------------------------
@@ -361,7 +361,7 @@
 class SqrtVDNode : public VectorNode {
  public:
   SqrtVDNode(Node* in, const TypeVect* vt) : VectorNode(in,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------LShiftVBNode-----------------------------------
@@ -369,7 +369,7 @@
 class LShiftVBNode : public VectorNode {
  public:
   LShiftVBNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------LShiftVSNode-----------------------------------
@@ -377,7 +377,7 @@
 class LShiftVSNode : public VectorNode {
  public:
   LShiftVSNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------LShiftVINode-----------------------------------
@@ -385,7 +385,7 @@
 class LShiftVINode : public VectorNode {
  public:
   LShiftVINode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------LShiftVLNode-----------------------------------
@@ -393,7 +393,7 @@
 class LShiftVLNode : public VectorNode {
  public:
   LShiftVLNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------RShiftVBNode-----------------------------------
@@ -401,7 +401,7 @@
 class RShiftVBNode : public VectorNode {
  public:
   RShiftVBNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------RShiftVSNode-----------------------------------
@@ -409,7 +409,7 @@
 class RShiftVSNode : public VectorNode {
  public:
   RShiftVSNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------RShiftVINode-----------------------------------
@@ -417,7 +417,7 @@
 class RShiftVINode : public VectorNode {
  public:
   RShiftVINode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------RShiftVLNode-----------------------------------
@@ -425,7 +425,7 @@
 class RShiftVLNode : public VectorNode {
  public:
   RShiftVLNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------URShiftVBNode----------------------------------
@@ -433,7 +433,7 @@
 class URShiftVBNode : public VectorNode {
  public:
   URShiftVBNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------URShiftVSNode----------------------------------
@@ -441,7 +441,7 @@
 class URShiftVSNode : public VectorNode {
  public:
   URShiftVSNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------URShiftVINode----------------------------------
@@ -449,7 +449,7 @@
 class URShiftVINode : public VectorNode {
  public:
   URShiftVINode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------URShiftVLNode----------------------------------
@@ -457,7 +457,7 @@
 class URShiftVLNode : public VectorNode {
  public:
   URShiftVLNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------LShiftCntVNode---------------------------------
@@ -465,7 +465,7 @@
 class LShiftCntVNode : public VectorNode {
  public:
   LShiftCntVNode(Node* cnt, const TypeVect* vt) : VectorNode(cnt,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual uint ideal_reg() const { return Matcher::vector_shift_count_ideal_reg(vect_type()->length_in_bytes()); }
 };
 
@@ -474,7 +474,7 @@
 class RShiftCntVNode : public VectorNode {
  public:
   RShiftCntVNode(Node* cnt, const TypeVect* vt) : VectorNode(cnt,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual uint ideal_reg() const { return Matcher::vector_shift_count_ideal_reg(vect_type()->length_in_bytes()); }
 };
 
@@ -484,7 +484,7 @@
 class AndVNode : public VectorNode {
  public:
   AndVNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------OrVNode---------------------------------------
@@ -492,7 +492,7 @@
 class OrVNode : public VectorNode {
  public:
   OrVNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------XorVNode---------------------------------------
@@ -500,7 +500,7 @@
 class XorVNode : public VectorNode {
  public:
   XorVNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //================================= M E M O R Y ===============================
@@ -517,13 +517,13 @@
   const TypeVect* vect_type() const { return type()->is_vect(); }
   uint length() const { return vect_type()->length(); } // Vector length
 
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 
   virtual uint ideal_reg() const  { return Matcher::vector_ideal_reg(memory_size()); }
   virtual BasicType memory_type() const { return T_VOID; }
   virtual int memory_size() const { return vect_type()->length_in_bytes(); }
 
-  virtual int store_Opcode() const { return Op_StoreVector; }
+  virtual uint store_Opcode() const { return Op_StoreVector; }
 
   static LoadVectorNode* make(int opc, Node* ctl, Node* mem,
                               Node* adr, const TypePtr* atyp,
@@ -545,7 +545,7 @@
   const TypeVect* vect_type() const { return in(MemNode::ValueIn)->bottom_type()->is_vect(); }
   uint length() const { return vect_type()->length(); } // Vector length
 
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 
   virtual uint ideal_reg() const  { return Matcher::vector_ideal_reg(memory_size()); }
   virtual BasicType memory_type() const { return T_VOID; }
@@ -566,7 +566,7 @@
 class ReplicateBNode : public VectorNode {
  public:
   ReplicateBNode(Node* in1, const TypeVect* vt) : VectorNode(in1, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------ReplicateSNode---------------------------------
@@ -574,7 +574,7 @@
 class ReplicateSNode : public VectorNode {
  public:
   ReplicateSNode(Node* in1, const TypeVect* vt) : VectorNode(in1, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------ReplicateINode---------------------------------
@@ -582,7 +582,7 @@
 class ReplicateINode : public VectorNode {
  public:
   ReplicateINode(Node* in1, const TypeVect* vt) : VectorNode(in1, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------ReplicateLNode---------------------------------
@@ -590,7 +590,7 @@
 class ReplicateLNode : public VectorNode {
  public:
   ReplicateLNode(Node* in1, const TypeVect* vt) : VectorNode(in1, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------ReplicateFNode---------------------------------
@@ -598,7 +598,7 @@
 class ReplicateFNode : public VectorNode {
  public:
   ReplicateFNode(Node* in1, const TypeVect* vt) : VectorNode(in1, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------ReplicateDNode---------------------------------
@@ -606,7 +606,7 @@
 class ReplicateDNode : public VectorNode {
  public:
   ReplicateDNode(Node* in1, const TypeVect* vt) : VectorNode(in1, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //========================Pack_Scalars_into_a_Vector===========================
@@ -617,7 +617,7 @@
  public:
   PackNode(Node* in1, const TypeVect* vt) : VectorNode(in1, vt) {}
   PackNode(Node* in1, Node* n2, const TypeVect* vt) : VectorNode(in1, n2, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 
   void add_opd(Node* n) {
     add_req(n);
@@ -634,7 +634,7 @@
 class PackBNode : public PackNode {
  public:
   PackBNode(Node* in1, const TypeVect* vt)  : PackNode(in1, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------PackSNode--------------------------------------
@@ -643,7 +643,7 @@
  public:
   PackSNode(Node* in1, const TypeVect* vt)  : PackNode(in1, vt) {}
   PackSNode(Node* in1, Node* in2, const TypeVect* vt) : PackNode(in1, in2, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------PackINode--------------------------------------
@@ -652,7 +652,7 @@
  public:
   PackINode(Node* in1, const TypeVect* vt)  : PackNode(in1, vt) {}
   PackINode(Node* in1, Node* in2, const TypeVect* vt) : PackNode(in1, in2, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------PackLNode--------------------------------------
@@ -661,7 +661,7 @@
  public:
   PackLNode(Node* in1, const TypeVect* vt)  : PackNode(in1, vt) {}
   PackLNode(Node* in1, Node* in2, const TypeVect* vt) : PackNode(in1, in2, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------Pack2LNode-------------------------------------
@@ -669,7 +669,7 @@
 class Pack2LNode : public PackNode {
  public:
   Pack2LNode(Node* in1, Node* in2, const TypeVect* vt) : PackNode(in1, in2, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------PackFNode--------------------------------------
@@ -678,7 +678,7 @@
  public:
   PackFNode(Node* in1, const TypeVect* vt)  : PackNode(in1, vt) {}
   PackFNode(Node* in1, Node* in2, const TypeVect* vt) : PackNode(in1, in2, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------PackDNode--------------------------------------
@@ -687,7 +687,7 @@
  public:
   PackDNode(Node* in1, const TypeVect* vt) : PackNode(in1, vt) {}
   PackDNode(Node* in1, Node* in2, const TypeVect* vt) : PackNode(in1, in2, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 //------------------------------Pack2DNode-------------------------------------
@@ -695,7 +695,7 @@
 class Pack2DNode : public PackNode {
  public:
   Pack2DNode(Node* in1, Node* in2, const TypeVect* vt) : PackNode(in1, in2, vt) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 };
 
 
@@ -708,7 +708,7 @@
   ExtractNode(Node* src, ConINode* pos) : Node(NULL, src, (Node*)pos) {
     assert(in(2)->get_int() >= 0, "positive constants");
   }
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   uint  pos() const { return in(2)->get_int(); }
 
   static Node* make(Node* v, uint position, BasicType bt);
@@ -719,7 +719,7 @@
 class ExtractBNode : public ExtractNode {
  public:
   ExtractBNode(Node* src, ConINode* pos) : ExtractNode(src, pos) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type *bottom_type() const { return TypeInt::INT; }
   virtual uint ideal_reg() const { return Op_RegI; }
 };
@@ -729,7 +729,7 @@
 class ExtractUBNode : public ExtractNode {
  public:
   ExtractUBNode(Node* src, ConINode* pos) : ExtractNode(src, pos) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type *bottom_type() const { return TypeInt::INT; }
   virtual uint ideal_reg() const { return Op_RegI; }
 };
@@ -739,7 +739,7 @@
 class ExtractCNode : public ExtractNode {
  public:
   ExtractCNode(Node* src, ConINode* pos) : ExtractNode(src, pos) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type *bottom_type() const { return TypeInt::INT; }
   virtual uint ideal_reg() const { return Op_RegI; }
 };
@@ -749,7 +749,7 @@
 class ExtractSNode : public ExtractNode {
  public:
   ExtractSNode(Node* src, ConINode* pos) : ExtractNode(src, pos) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type *bottom_type() const { return TypeInt::INT; }
   virtual uint ideal_reg() const { return Op_RegI; }
 };
@@ -759,7 +759,7 @@
 class ExtractINode : public ExtractNode {
  public:
   ExtractINode(Node* src, ConINode* pos) : ExtractNode(src, pos) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type *bottom_type() const { return TypeInt::INT; }
   virtual uint ideal_reg() const { return Op_RegI; }
 };
@@ -769,7 +769,7 @@
 class ExtractLNode : public ExtractNode {
  public:
   ExtractLNode(Node* src, ConINode* pos) : ExtractNode(src, pos) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type *bottom_type() const { return TypeLong::LONG; }
   virtual uint ideal_reg() const { return Op_RegL; }
 };
@@ -779,7 +779,7 @@
 class ExtractFNode : public ExtractNode {
  public:
   ExtractFNode(Node* src, ConINode* pos) : ExtractNode(src, pos) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type *bottom_type() const { return Type::FLOAT; }
   virtual uint ideal_reg() const { return Op_RegF; }
 };
@@ -789,7 +789,7 @@
 class ExtractDNode : public ExtractNode {
  public:
   ExtractDNode(Node* src, ConINode* pos) : ExtractNode(src, pos) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type *bottom_type() const { return Type::DOUBLE; }
   virtual uint ideal_reg() const { return Op_RegD; }
 };
@@ -799,7 +799,7 @@
 class SetVectMaskINode : public Node {
 public:
   SetVectMaskINode(Node *c, Node *in1) : Node(c, in1) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   const Type *bottom_type() const { return TypeInt::INT; }
   virtual uint ideal_reg() const { return Op_RegI; }
   virtual const Type *Value(PhaseGVN *phase) const { return TypeInt::INT; }