--- old/src/share/vm/opto/narrowptrnode.hpp	2016-07-11 22:46:45.968379295 +0900
+++ new/src/share/vm/opto/narrowptrnode.hpp	2016-07-11 22:46:45.834379764 +0900
@@ -38,7 +38,7 @@
     init_req(1, value);
   }
   public:
-  virtual uint  ideal_reg() const { return Op_RegN; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegN; }
 };
 
 //------------------------------EncodeP--------------------------------
@@ -51,7 +51,7 @@
   EncodeNarrowPtrNode(value, type) {
     init_class_id(Class_EncodeP);
   }
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual Node* Identity(PhaseGVN* phase);
   virtual const Type* Value(PhaseGVN* phase) const;
 };
@@ -66,7 +66,7 @@
   EncodeNarrowPtrNode(value, type) {
     init_class_id(Class_EncodePKlass);
   }
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual Node* Identity(PhaseGVN* phase);
   virtual const Type* Value(PhaseGVN* phase) const;
 };
@@ -81,7 +81,7 @@
     init_req(1, value);
   }
   public:
-  virtual uint  ideal_reg() const { return Op_RegP; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegP; }
 };
 
 //------------------------------DecodeN--------------------------------
@@ -94,7 +94,7 @@
   DecodeNarrowPtrNode(value, type) {
     init_class_id(Class_DecodeN);
   }
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node* Identity(PhaseGVN* phase);
 };
@@ -109,7 +109,7 @@
   DecodeNarrowPtrNode(value, type) {
     init_class_id(Class_DecodeNKlass);
   }
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node* Identity(PhaseGVN* phase);
 };