--- old/src/share/vm/opto/intrinsicnode.hpp	2016-07-11 22:46:28.928438955 +0900
+++ new/src/share/vm/opto/intrinsicnode.hpp	2016-07-11 22:46:28.791439434 +0900
@@ -37,9 +37,9 @@
 class PartialSubtypeCheckNode : public Node {
  public:
   PartialSubtypeCheckNode(Node* c, Node* sub, Node* super) : Node(c,sub,super) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type* bottom_type() const { return TypeRawPtr::BOTTOM; }
-  virtual uint ideal_reg() const { return Op_RegP; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegP; }
 };
 
 //------------------------------StrIntrinsic-------------------------------
@@ -75,7 +75,7 @@
   virtual bool depends_only_on_test() const { return false; }
   virtual const TypePtr* adr_type() const { return TypeAryPtr::BYTES; }
   virtual uint match_edge(uint idx) const;
-  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);
   virtual const Type* Value(PhaseGVN* phase) const;
   ArgEncoding encoding() const { return _encoding; }
@@ -87,7 +87,7 @@
   StrCompNode(Node* control, Node* char_array_mem,
               Node* s1, Node* c1, Node* s2, Node* c2, ArgEncoding encoding):
   StrIntrinsicNode(control, char_array_mem, s1, c1, s2, c2, encoding) {};
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type* bottom_type() const { return TypeInt::INT; }
 };
 
@@ -97,7 +97,7 @@
   StrEqualsNode(Node* control, Node* char_array_mem,
                 Node* s1, Node* s2, Node* c, ArgEncoding encoding):
   StrIntrinsicNode(control, char_array_mem, s1, s2, c, encoding) {};
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type* bottom_type() const { return TypeInt::BOOL; }
 };
 
@@ -107,7 +107,7 @@
   StrIndexOfNode(Node* control, Node* char_array_mem,
                  Node* s1, Node* c1, Node* s2, Node* c2, ArgEncoding encoding):
   StrIntrinsicNode(control, char_array_mem, s1, c1, s2, c2, encoding) {};
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type* bottom_type() const { return TypeInt::INT; }
 };
 
@@ -117,7 +117,7 @@
   StrIndexOfCharNode(Node* control, Node* char_array_mem,
                      Node* s1, Node* c1, Node* c, ArgEncoding encoding):
   StrIntrinsicNode(control, char_array_mem, s1, c1, c, encoding) {};
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type* bottom_type() const { return TypeInt::INT; }
 };
 
@@ -127,7 +127,7 @@
   StrCompressedCopyNode(Node* control, Node* arymem,
                         Node* s1, Node* s2, Node* c):
   StrIntrinsicNode(control, arymem, s1, s2, c, none) {};
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type* bottom_type() const { return TypeInt::INT; }
   virtual const TypePtr* adr_type() const { return TypePtr::BOTTOM; }
   virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
@@ -139,7 +139,7 @@
   StrInflatedCopyNode(Node* control, Node* arymem,
                       Node* s1, Node* s2, Node* c):
   StrIntrinsicNode(control, arymem, s1, s2, c, none) {};
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type* bottom_type() const { return Type::MEMORY; }
   virtual const TypePtr* adr_type() const { return TypePtr::BOTTOM; }
   virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
@@ -151,7 +151,7 @@
   AryEqNode(Node* control, Node* char_array_mem,
             Node* s1, Node* s2, ArgEncoding encoding):
   StrIntrinsicNode(control, char_array_mem, s1, s2, encoding) {};
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type* bottom_type() const { return TypeInt::BOOL; }
 };
 
@@ -160,7 +160,7 @@
  public:
   HasNegativesNode(Node* control, Node* char_array_mem, Node* s1, Node* c1):
   StrIntrinsicNode(control, char_array_mem, s1, c1, none) {};
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type* bottom_type() const { return TypeInt::BOOL; }
 };
 
@@ -170,12 +170,12 @@
 class EncodeISOArrayNode: public Node {
  public:
   EncodeISOArrayNode(Node* control, Node* arymem, Node* s1, Node* s2, Node* c): Node(control, arymem, s1, s2, c) {};
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual bool depends_only_on_test() const { return false; }
   virtual const Type* bottom_type() const { return TypeInt::INT; }
   virtual const TypePtr* adr_type() const { return TypePtr::BOTTOM; }
   virtual uint match_edge(uint idx) const;
-  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);
   virtual const Type* Value(PhaseGVN* phase) const;
 };