--- old/src/share/vm/opto/cfgnode.hpp	2016-07-03 23:42:52.322542324 +0900
+++ new/src/share/vm/opto/cfgnode.hpp	2016-07-03 23:42:52.182542906 +0900
@@ -85,7 +85,7 @@
   PhiNode* has_unique_phi() const; // returns the unique phi user, or NULL
   // Is this region node unreachable from root?
   bool is_unreachable_region(PhaseGVN *phase) const;
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual bool pinned() const { return (const Node *)in(0) == this; }
   virtual bool  is_CFG   () const { return true; }
   virtual uint hash() const { return NO_HASH; }  // CFG nodes do not hash
@@ -103,7 +103,7 @@
 class JProjNode : public ProjNode {
  public:
   JProjNode( Node* ctrl, uint idx ) : ProjNode(ctrl,idx) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual bool  is_CFG() const { return true; }
   virtual uint  hash() const { return NO_HASH; }  // CFG nodes do not hash
   virtual const Node* is_block_proj() const { return in(0); }
@@ -190,7 +190,7 @@
   // Is it unsafe data loop? It becomes a dead loop if this phi node removed.
   bool is_unsafe_data_reference(Node *in) const;
   int  is_diamond_phi(bool check_control_only = false) const;
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual bool pinned() const { return in(0) != 0; }
   virtual const TypePtr *adr_type() const { verify_adr_type(true); return _adr_type; }
 
@@ -227,7 +227,7 @@
 class GotoNode : public Node {
 public:
   GotoNode( Node *control ) : Node(control) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual bool pinned() const { return true; }
   virtual bool  is_CFG() const { return true; }
   virtual uint hash() const { return NO_HASH; }  // CFG nodes do not hash
@@ -248,7 +248,7 @@
 class CProjNode : public ProjNode {
 public:
   CProjNode( Node *ctrl, uint idx ) : ProjNode(ctrl,idx) {}
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual bool  is_CFG() const { return true; }
   virtual uint hash() const { return NO_HASH; }  // CFG nodes do not hash
   virtual const Node *is_block_proj() const { return in(0); }
@@ -373,7 +373,7 @@
     init_req(0,control);
     init_req(1,b);
   }
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual bool pinned() const { return true; }
   virtual const Type *bottom_type() const { return TypeTuple::IFBOTH; }
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
@@ -404,7 +404,7 @@
     init_class_id(Class_RangeCheck);
   }
 
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual Node* Ideal(PhaseGVN *phase, bool can_reshape);
 };
 
@@ -428,7 +428,7 @@
   IfTrueNode( IfNode *ifnode ) : IfProjNode(ifnode,1) {
     init_class_id(Class_IfTrue);
   }
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 
 protected:
   virtual bool always_taken(const TypeTuple* t) const { return t == TypeTuple::IFTRUE; }
@@ -439,7 +439,7 @@
   IfFalseNode( IfNode *ifnode ) : IfProjNode(ifnode,0) {
     init_class_id(Class_IfFalse);
   }
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
 
 protected:
   virtual bool always_taken(const TypeTuple* t) const { return t == TypeTuple::IFFALSE; }
@@ -464,7 +464,7 @@
     init_req(0, ctrl);
     init_req(1, idx);
   }
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type *bottom_type() const;
@@ -480,7 +480,7 @@
   JumpNode( Node* control, Node* switch_val, uint size) : PCTableNode(control, switch_val, size) {
     init_class_id(Class_Jump);
   }
-  virtual int   Opcode() const;
+  virtual uint  Opcode() const;
   virtual const RegMask& out_RegMask() const;
   virtual const Node* is_block_proj() const { return this; }
 #ifndef PRODUCT
@@ -503,7 +503,7 @@
     init_class_id(Class_JumpProj);
   }
 
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type* bottom_type() const { return Type::CONTROL; }
   int  dest_bci()    const { return _dest_bci; }
   int  switch_val()  const { return _switch_val; }
@@ -524,7 +524,7 @@
   CatchNode( Node *ctrl, Node *idx, uint size ) : PCTableNode(ctrl,idx,size){
     init_class_id(Class_Catch);
   }
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual const Type* Value(PhaseGVN* phase) const;
 };
 
@@ -552,7 +552,7 @@
     assert(proj_no != fall_through_index || handler_bci < 0, "fall through case must have bci < 0");
   }
 
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual Node* Identity(PhaseGVN* phase);
   virtual const Type *bottom_type() const { return Type::CONTROL; }
   int  handler_bci() const        { return _handler_bci; }
@@ -571,7 +571,7 @@
     init_req(0, control);
     init_req(1, i_o);
   }
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual Node* Identity(PhaseGVN* phase);
   virtual bool pinned() const { return true; }
   uint match_edge(uint idx) const { return 0; }
@@ -585,7 +585,7 @@
 class NeverBranchNode : public MultiBranchNode {
 public:
   NeverBranchNode( Node *ctrl ) : MultiBranchNode(1) { init_req(0,ctrl); }
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual bool pinned() const { return true; };
   virtual const Type *bottom_type() const { return TypeTuple::IFBOTH; }
   virtual const Type* Value(PhaseGVN* phase) const;