--- old/src/share/vm/opto/addnode.hpp	2016-07-11 22:46:10.847502260 +0900
+++ new/src/share/vm/opto/addnode.hpp	2016-07-11 22:46:10.711502736 +0900
@@ -75,13 +75,13 @@
 class AddINode : public AddNode {
 public:
   AddINode( Node *in1, Node *in2 ) : AddNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type *add_ring( const Type *, const Type * ) const;
   virtual const Type *add_id() const { return TypeInt::ZERO; }
   virtual const Type *bottom_type() const { return TypeInt::INT; }
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual Node* Identity(PhaseGVN* phase);
-  virtual uint ideal_reg() const { return Op_RegI; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegI; }
 };
 
 //------------------------------AddLNode---------------------------------------
@@ -89,13 +89,13 @@
 class AddLNode : public AddNode {
 public:
   AddLNode( Node *in1, Node *in2 ) : AddNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type *add_ring( const Type *, const Type * ) const;
   virtual const Type *add_id() const { return TypeLong::ZERO; }
   virtual const Type *bottom_type() const { return TypeLong::LONG; }
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual Node* Identity(PhaseGVN* phase);
-  virtual uint ideal_reg() const { return Op_RegL; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegL; }
 };
 
 //------------------------------AddFNode---------------------------------------
@@ -103,14 +103,14 @@
 class AddFNode : public AddNode {
 public:
   AddFNode( Node *in1, Node *in2 ) : AddNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type *add_of_identity( const Type *t1, const Type *t2 ) const;
   virtual const Type *add_ring( const Type *, const Type * ) const;
   virtual const Type *add_id() const { return TypeF::ZERO; }
   virtual const Type *bottom_type() const { return Type::FLOAT; }
   virtual Node* Identity(PhaseGVN* phase) { return this; }
-  virtual uint ideal_reg() const { return Op_RegF; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegF; }
 };
 
 //------------------------------AddDNode---------------------------------------
@@ -118,14 +118,14 @@
 class AddDNode : public AddNode {
 public:
   AddDNode( Node *in1, Node *in2 ) : AddNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type *add_of_identity( const Type *t1, const Type *t2 ) const;
   virtual const Type *add_ring( const Type *, const Type * ) const;
   virtual const Type *add_id() const { return TypeD::ZERO; }
   virtual const Type *bottom_type() const { return Type::DOUBLE; }
   virtual Node* Identity(PhaseGVN* phase) { return this; }
-  virtual uint ideal_reg() const { return Op_RegD; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegD; }
 };
 
 //------------------------------AddPNode---------------------------------------
@@ -141,12 +141,12 @@
   AddPNode( Node *base, Node *ptr, Node *off ) : Node(0,base,ptr,off) {
     init_class_id(Class_AddP);
   }
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual Node* Identity(PhaseGVN* phase);
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual const Type *bottom_type() const;
-  virtual uint  ideal_reg() const { return Op_RegP; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegP; }
   Node         *base_node() { assert( req() > Base, "Missing base"); return in(Base); }
   static Node* Ideal_base_and_offset(Node* ptr, PhaseTransform* phase,
                                      // second return value:
@@ -166,12 +166,12 @@
 class OrINode : public AddNode {
 public:
   OrINode( Node *in1, Node *in2 ) : AddNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type *add_ring( const Type *, const Type * ) const;
   virtual const Type *add_id() const { return TypeInt::ZERO; }
   virtual const Type *bottom_type() const { return TypeInt::INT; }
   virtual Node* Identity(PhaseGVN* phase);
-  virtual uint ideal_reg() const { return Op_RegI; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegI; }
 };
 
 //------------------------------OrLNode----------------------------------------
@@ -180,12 +180,12 @@
 class OrLNode : public AddNode {
 public:
   OrLNode( Node *in1, Node *in2 ) : AddNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type *add_ring( const Type *, const Type * ) const;
   virtual const Type *add_id() const { return TypeLong::ZERO; }
   virtual const Type *bottom_type() const { return TypeLong::LONG; }
   virtual Node* Identity(PhaseGVN* phase);
-  virtual uint ideal_reg() const { return Op_RegL; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegL; }
 };
 
 //------------------------------XorINode---------------------------------------
@@ -193,11 +193,11 @@
 class XorINode : public AddNode {
 public:
   XorINode( Node *in1, Node *in2 ) : AddNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type *add_ring( const Type *, const Type * ) const;
   virtual const Type *add_id() const { return TypeInt::ZERO; }
   virtual const Type *bottom_type() const { return TypeInt::INT; }
-  virtual uint ideal_reg() const { return Op_RegI; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegI; }
 };
 
 //------------------------------XorINode---------------------------------------
@@ -205,11 +205,11 @@
 class XorLNode : public AddNode {
 public:
   XorLNode( Node *in1, Node *in2 ) : AddNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type *add_ring( const Type *, const Type * ) const;
   virtual const Type *add_id() const { return TypeLong::ZERO; }
   virtual const Type *bottom_type() const { return TypeLong::LONG; }
-  virtual uint ideal_reg() const { return Op_RegL; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegL; }
 };
 
 //------------------------------MaxNode----------------------------------------
@@ -219,7 +219,7 @@
 class MaxNode : public AddNode {
 public:
   MaxNode( Node *in1, Node *in2 ) : AddNode(in1,in2) {}
-  virtual int Opcode() const = 0;
+  virtual Opcodes Opcode() const = 0;
 };
 
 //------------------------------MaxINode---------------------------------------
@@ -228,11 +228,11 @@
 class MaxINode : public MaxNode {
 public:
   MaxINode( Node *in1, Node *in2 ) : MaxNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type *add_ring( const Type *, const Type * ) const;
   virtual const Type *add_id() const { return TypeInt::make(min_jint); }
   virtual const Type *bottom_type() const { return TypeInt::INT; }
-  virtual uint ideal_reg() const { return Op_RegI; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegI; }
 };
 
 //------------------------------MinINode---------------------------------------
@@ -241,11 +241,11 @@
 class MinINode : public MaxNode {
 public:
   MinINode( Node *in1, Node *in2 ) : MaxNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type *add_ring( const Type *, const Type * ) const;
   virtual const Type *add_id() const { return TypeInt::make(max_jint); }
   virtual const Type *bottom_type() const { return TypeInt::INT; }
-  virtual uint ideal_reg() const { return Op_RegI; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegI; }
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
 };