--- old/src/share/vm/opto/callnode.hpp	2016-07-03 23:42:50.664549215 +0900
+++ new/src/share/vm/opto/callnode.hpp	2016-07-03 23:42:50.526549789 +0900
@@ -72,7 +72,7 @@
     init_req(0,this);
     init_req(1,root);
   }
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual bool pinned() const { return true; };
   virtual const Type *bottom_type() const;
   virtual const TypePtr *adr_type() const { return TypePtr::BOTTOM; }
@@ -93,7 +93,7 @@
 class StartOSRNode : public StartNode {
 public:
   StartOSRNode( Node *root, const TypeTuple *domain ) : StartNode(root, domain) {}
-  virtual int   Opcode() const;
+  virtual uint   Opcode() const;
   static  const TypeTuple *osr_domain();
 };
 
@@ -106,7 +106,7 @@
   ParmNode( StartNode *src, uint con ) : ProjNode(src,con) {
     init_class_id(Class_Parm);
   }
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual bool  is_CFG() const { return (_con == TypeFunc::Control); }
   virtual uint ideal_reg() const;
 #ifndef PRODUCT
@@ -122,7 +122,7 @@
 class ReturnNode : public Node {
 public:
   ReturnNode( uint edges, Node *cntrl, Node *i_o, Node *memory, Node *retadr, Node *frameptr );
-  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 bool depends_only_on_test() const { return false; }
@@ -143,7 +143,7 @@
 class RethrowNode : public Node {
  public:
   RethrowNode( Node *cntrl, Node *i_o, Node *memory, Node *frameptr, Node *ret_adr, Node *exception );
-  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 bool depends_only_on_test() const { return false; }
@@ -167,7 +167,7 @@
     init_req(TypeFunc::Parms+1, moop);
   }
 
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual uint match_edge(uint idx) const;
 };
 
@@ -181,7 +181,7 @@
     init_req(TypeFunc::Parms+1, ex_oop);
   }
 
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual uint match_edge(uint idx) const;
 };
 
@@ -463,7 +463,7 @@
   }
 
   // Standard Node stuff
-  virtual int            Opcode() const;
+  virtual uint           Opcode() const;
   virtual bool           pinned() const { return true; }
   virtual const Type*    Value(PhaseGVN* phase) const;
   virtual const Type    *bottom_type() const { return Type::CONTROL; }
@@ -505,7 +505,7 @@
                             AllocateNode* alloc,
 #endif
                             uint first_index, uint n_fields);
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual uint           ideal_reg() const;
   virtual const RegMask &in_RegMask(uint) const;
   virtual const RegMask &out_RegMask() const;
@@ -671,7 +671,7 @@
     init_class_id(Class_CallJava);
   }
 
-  virtual int   Opcode() const;
+  virtual uint   Opcode() const;
   ciMethod* method() const                 { return _method; }
   void  set_method(ciMethod *m)            { _method = m; }
   void  set_optimized_virtual(bool f)      { _optimized_virtual = f; }
@@ -736,7 +736,7 @@
     }
   }
 
-  virtual int         Opcode() const;
+  virtual uint        Opcode() const;
 #ifndef PRODUCT
   virtual void        dump_spec(outputStream *st) const;
   virtual void        dump_compact_spec(outputStream *st) const;
@@ -754,7 +754,7 @@
   }
 
   int _vtable_index;
-  virtual int   Opcode() const;
+  virtual uint  Opcode() const;
 #ifndef PRODUCT
   virtual void  dump_spec(outputStream *st) const;
 #endif
@@ -774,7 +774,7 @@
     _name = name;
   }
 
-  virtual int   Opcode() const;
+  virtual uint  Opcode() const;
   virtual void  calling_convention( BasicType* sig_bt, VMRegPair *parm_regs, uint argcnt ) const;
 
 #ifndef PRODUCT
@@ -793,7 +793,7 @@
   {
     init_class_id(Class_CallLeaf);
   }
-  virtual int   Opcode() const;
+  virtual uint  Opcode() const;
   virtual bool        guaranteed_safepoint()  { return false; }
 #ifndef PRODUCT
   virtual void  dump_spec(outputStream *st) const;
@@ -810,7 +810,7 @@
     : CallLeafNode(tf, addr, name, adr_type)
   {
   }
-  virtual int   Opcode() const;
+  virtual uint   Opcode() const;
 };
 
 
@@ -871,7 +871,7 @@
       jvms()->set_map_deep(this);
     }
   }
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual uint ideal_reg() const { return Op_RegP; }
   virtual bool        guaranteed_safepoint()  { return false; }
 
@@ -950,7 +950,7 @@
     init_class_id(Class_AllocateArray);
     set_req(AllocateNode::ALength,        count_val);
   }
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
 
   // Dig the length operand out of a array allocation site.
@@ -1009,7 +1009,7 @@
     _counter = NULL;
 #endif
   }
-  virtual int Opcode() const = 0;
+  virtual uint Opcode() const = 0;
   Node *   obj_node() const       {return in(TypeFunc::Parms + 0); }
   Node *   box_node() const       {return in(TypeFunc::Parms + 1); }
   Node *   fastlock_node() const  {return in(TypeFunc::Parms + 2); }
@@ -1071,7 +1071,7 @@
     return TypeFunc::make(domain,range);
   }
 
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual uint size_of() const; // Size is bigger
   LockNode(Compile* C, const TypeFunc *tf) : AbstractLockNode( tf ) {
     init_class_id(Class_Lock);
@@ -1101,7 +1101,7 @@
   JVMState* const _dbg_jvms;      // Pointer to list of JVM State objects
 #endif
 public:
-  virtual int Opcode() const;
+  virtual uint Opcode() const;
   virtual uint size_of() const; // Size is bigger
   UnlockNode(Compile* C, const TypeFunc *tf) : AbstractLockNode( tf )
 #ifdef ASSERT