--- old/src/share/vm/opto/castnode.hpp	2016-07-11 22:46:15.808484890 +0900
+++ new/src/share/vm/opto/castnode.hpp	2016-07-11 22:46:15.671485370 +0900
@@ -47,12 +47,12 @@
   virtual Node* Identity(PhaseGVN* phase);
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
-  virtual int Opcode() const;
-  virtual uint ideal_reg() const = 0;
+  virtual Opcodes Opcode() const;
+  virtual Opcodes ideal_reg() const = 0;
   virtual bool depends_only_on_test() const { return !_carry_dependency; }
   bool carry_dependency() const { return _carry_dependency; }
   TypeNode* dominating_cast(PhaseTransform *phase) const;
-  static Node* make_cast(int opcode,  Node* c, Node *n, const Type *t, bool carry_dependency);
+  static Node* make_cast(Opcodes opcode,  Node* c, Node *n, const Type *t, bool carry_dependency);
 
 #ifndef PRODUCT
   virtual void dump_spec(outputStream *st) const;
@@ -73,8 +73,8 @@
     : ConstraintCastNode(n, t, carry_dependency), _range_check_dependency(range_check_dependency) {
     init_class_id(Class_CastII);
   }
-  virtual int Opcode() const;
-  virtual uint ideal_reg() const { return Op_RegI; }
+  virtual Opcodes Opcode() const;
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegI; }
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   const bool has_range_check() {
@@ -98,8 +98,8 @@
   CastPPNode (Node *n, const Type *t, bool carry_dependency = false)
     : ConstraintCastNode(n, t, carry_dependency) {
   }
-  virtual int Opcode() const;
-  virtual uint ideal_reg() const { return Op_RegP; }
+  virtual Opcodes Opcode() const;
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegP; }
 };
 
 //------------------------------CheckCastPPNode--------------------------------
@@ -114,8 +114,8 @@
 
   virtual Node* Identity(PhaseGVN* phase);
   virtual const Type* Value(PhaseGVN* phase) const;
-  virtual int   Opcode() const;
-  virtual uint  ideal_reg() const { return Op_RegP; }
+  virtual Opcodes  Opcode() const;
+  virtual Opcodes  ideal_reg() const { return Opcodes::Op_RegP; }
 };
 
 
@@ -124,11 +124,11 @@
 class CastX2PNode : public Node {
   public:
   CastX2PNode( Node *n ) : Node(NULL, n) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual Node* Identity(PhaseGVN* phase);
-  virtual uint ideal_reg() const { return Op_RegP; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegP; }
   virtual const Type *bottom_type() const { return TypeRawPtr::BOTTOM; }
 };
 
@@ -138,11 +138,11 @@
 class CastP2XNode : public Node {
   public:
   CastP2XNode( Node *ctrl, Node *n ) : Node(ctrl, n) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual Node* Identity(PhaseGVN* phase);
-  virtual uint ideal_reg() const { return Op_RegX; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegX; }
   virtual const Type *bottom_type() const { return TypeX_X; }
   // Return false to keep node from moving away from an associated card mark.
   virtual bool depends_only_on_test() const { return false; }