--- old/src/share/vm/opto/countbitsnode.hpp	2016-07-11 22:46:22.002463204 +0900
+++ new/src/share/vm/opto/countbitsnode.hpp	2016-07-11 22:46:21.864463687 +0900
@@ -35,7 +35,7 @@
   public:
   CountBitsNode(Node* in1) : Node(0, in1) {}
   const Type* bottom_type() const { return TypeInt::INT; }
-  virtual uint ideal_reg() const { return Op_RegI; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegI; }
 };
 
 //---------- CountLeadingZerosINode --------------------------------------------
@@ -43,7 +43,7 @@
 class CountLeadingZerosINode : public CountBitsNode {
   public:
   CountLeadingZerosINode(Node* in1) : CountBitsNode(in1) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type* Value(PhaseGVN* phase) const;
 };
 
@@ -52,7 +52,7 @@
 class CountLeadingZerosLNode : public CountBitsNode {
   public:
   CountLeadingZerosLNode(Node* in1) : CountBitsNode(in1) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type* Value(PhaseGVN* phase) const;
 };
 
@@ -61,7 +61,7 @@
 class CountTrailingZerosINode : public CountBitsNode {
   public:
   CountTrailingZerosINode(Node* in1) : CountBitsNode(in1) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type* Value(PhaseGVN* phase) const;
 };
 
@@ -70,7 +70,7 @@
 class CountTrailingZerosLNode : public CountBitsNode {
   public:
   CountTrailingZerosLNode(Node* in1) : CountBitsNode(in1) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type* Value(PhaseGVN* phase) const;
 };
 
@@ -79,7 +79,7 @@
 class PopCountINode : public CountBitsNode {
   public:
   PopCountINode(Node* in1) : CountBitsNode(in1) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
 };
 
 //---------- PopCountLNode -----------------------------------------------------
@@ -87,7 +87,7 @@
 class PopCountLNode : public CountBitsNode {
   public:
   PopCountLNode(Node* in1) : CountBitsNode(in1) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
 };