--- old/src/share/vm/opto/subnode.hpp	2016-07-03 23:43:08.204476315 +0900
+++ new/src/share/vm/opto/subnode.hpp	2016-07-03 23:43:08.062476905 +0900
@@ -69,7 +69,7 @@
 class SubINode : public SubNode {
 public:
   SubINode( Node *in1, Node *in2 ) : SubNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type *sub( const Type *, const Type * ) const;
   const Type *add_id() const { return TypeInt::ZERO; }
@@ -82,7 +82,7 @@
 class SubLNode : public SubNode {
 public:
   SubLNode( Node *in1, Node *in2 ) : SubNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type *sub( const Type *, const Type * ) const;
   const Type *add_id() const { return TypeLong::ZERO; }
@@ -106,7 +106,7 @@
 class SubFNode : public SubFPNode {
 public:
   SubFNode( Node *in1, Node *in2 ) : SubFPNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type *sub( const Type *, const Type * ) const;
   const Type   *add_id() const { return TypeF::ZERO; }
@@ -120,7 +120,7 @@
 class SubDNode : public SubFPNode {
 public:
   SubDNode( Node *in1, Node *in2 ) : SubFPNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type *sub( const Type *, const Type * ) const;
   const Type   *add_id() const { return TypeD::ZERO; }
@@ -153,7 +153,7 @@
 class CmpINode : public CmpNode {
 public:
   CmpINode( Node *in1, Node *in2 ) : CmpNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type *sub( const Type *, const Type * ) const;
 };
@@ -163,7 +163,7 @@
 class CmpUNode : public CmpNode {
 public:
   CmpUNode( Node *in1, Node *in2 ) : CmpNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type *sub( const Type *, const Type * ) const;
   const Type* Value(PhaseGVN* phase) const;
   bool is_index_range_check() const;
@@ -174,7 +174,7 @@
 class CmpPNode : public CmpNode {
 public:
   CmpPNode( Node *in1, Node *in2 ) : CmpNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type *sub( const Type *, const Type * ) const;
 };
@@ -184,7 +184,7 @@
 class CmpNNode : public CmpNode {
 public:
   CmpNNode( Node *in1, Node *in2 ) : CmpNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type *sub( const Type *, const Type * ) const;
 };
@@ -194,7 +194,7 @@
 class CmpLNode : public CmpNode {
 public:
   CmpLNode( Node *in1, Node *in2 ) : CmpNode(in1,in2) {}
-  virtual int    Opcode() const;
+  virtual uint  Opcode() const;
   virtual const Type *sub( const Type *, const Type * ) const;
 };
 
@@ -206,7 +206,7 @@
     // Since it is not consumed by Bools, it is not really a Cmp.
     init_class_id(Class_Sub);
   }
-  virtual int    Opcode() const;
+  virtual uint Opcode() const;
   virtual uint ideal_reg() const { return Op_RegI; }
 };
 
@@ -217,7 +217,7 @@
 class CmpFNode : public CmpNode {
 public:
   CmpFNode( Node *in1, Node *in2 ) : CmpNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type *sub( const Type *, const Type * ) const { ShouldNotReachHere(); return NULL; }
   const Type* Value(PhaseGVN* phase) const;
 };
@@ -232,7 +232,7 @@
     // Since it is not consumed by Bools, it is not really a Cmp.
     init_class_id(Class_Sub);
   }
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   // Since it is not consumed by Bools, it is not really a Cmp.
   virtual uint ideal_reg() const { return Op_RegI; }
 };
@@ -245,7 +245,7 @@
 class CmpDNode : public CmpNode {
 public:
   CmpDNode( Node *in1, Node *in2 ) : CmpNode(in1,in2) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type *sub( const Type *, const Type * ) const { ShouldNotReachHere(); return NULL; }
   const Type* Value(PhaseGVN* phase) const;
   virtual Node  *Ideal(PhaseGVN *phase, bool can_reshape);
@@ -261,7 +261,7 @@
     // Since it is not consumed by Bools, it is not really a Cmp.
     init_class_id(Class_Sub);
   }
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual uint ideal_reg() const { return Op_RegI; }
 };
 
@@ -307,7 +307,7 @@
   Node* as_int_value(PhaseGVN* phase);
   // Invert sense of self, returning new Bool.
   BoolNode* negate(PhaseGVN* phase);
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual const Type *bottom_type() const { return TypeInt::BOOL; }
@@ -335,7 +335,7 @@
 class AbsINode : public AbsNode {
 public:
   AbsINode( Node *in1 ) : AbsNode(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; }
 };
@@ -347,7 +347,7 @@
 class AbsFNode : public AbsNode {
 public:
   AbsFNode( Node *in1 ) : AbsNode(in1) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   const Type *bottom_type() const { return Type::FLOAT; }
   virtual uint ideal_reg() const { return Op_RegF; }
 };
@@ -359,7 +359,7 @@
 class AbsDNode : public AbsNode {
 public:
   AbsDNode( Node *in1 ) : AbsNode(in1) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   const Type *bottom_type() const { return Type::DOUBLE; }
   virtual uint ideal_reg() const { return Op_RegD; }
 };
@@ -370,7 +370,7 @@
 class CmpLTMaskNode : public Node {
 public:
   CmpLTMaskNode( Node *p, Node *q ) : Node(0, p, q) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   const Type *bottom_type() const { return TypeInt::INT; }
   virtual uint ideal_reg() const { return Op_RegI; }
 };
@@ -390,7 +390,7 @@
 class NegFNode : public NegNode {
 public:
   NegFNode( Node *in1 ) : NegNode(in1) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   const Type *bottom_type() const { return Type::FLOAT; }
   virtual uint ideal_reg() const { return Op_RegF; }
 };
@@ -403,7 +403,7 @@
 class NegDNode : public NegNode {
 public:
   NegDNode( Node *in1 ) : NegNode(in1) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   const Type *bottom_type() const { return Type::DOUBLE; }
   virtual uint ideal_reg() const { return Op_RegD; }
 };
@@ -413,7 +413,7 @@
 class AtanDNode : public Node {
 public:
   AtanDNode(Node *c, Node *in1, Node *in2  ) : Node(c, in1, in2) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   const Type *bottom_type() const { return Type::DOUBLE; }
   virtual uint ideal_reg() const { return Op_RegD; }
 };
@@ -427,7 +427,7 @@
     init_flags(Flag_is_expensive);
     C->add_expensive_node(this);
   }
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   const Type *bottom_type() const { return Type::DOUBLE; }
   virtual uint ideal_reg() const { return Op_RegD; }
   virtual const Type* Value(PhaseGVN* phase) const;
@@ -438,7 +438,7 @@
 class ReverseBytesINode : public Node {
 public:
   ReverseBytesINode(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; }
 };
@@ -448,7 +448,7 @@
 class ReverseBytesLNode : public Node {
 public:
   ReverseBytesLNode(Node *c, Node *in1) : Node(c, in1) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   const Type *bottom_type() const { return TypeLong::LONG; }
   virtual uint ideal_reg() const { return Op_RegL; }
 };
@@ -458,7 +458,7 @@
 class ReverseBytesUSNode : public Node {
 public:
   ReverseBytesUSNode(Node *c, Node *in1) : Node(c, in1) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   const Type *bottom_type() const { return TypeInt::CHAR; }
   virtual uint ideal_reg() const { return Op_RegI; }
 };
@@ -468,7 +468,7 @@
 class ReverseBytesSNode : public Node {
 public:
   ReverseBytesSNode(Node *c, Node *in1) : Node(c, in1) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   const Type *bottom_type() const { return TypeInt::SHORT; }
   virtual uint ideal_reg() const { return Op_RegI; }
 };