--- old/src/share/vm/opto/connode.hpp	2016-07-11 22:46:20.407468788 +0900
+++ new/src/share/vm/opto/connode.hpp	2016-07-11 22:46:20.270469268 +0900
@@ -40,7 +40,7 @@
     init_req(0, (Node*)Compile::current()->root());
     init_flags(Flag_is_Con);
   }
-  virtual int  Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual uint hash() const;
   virtual const RegMask &out_RegMask() const { return RegMask::Empty; }
   virtual const RegMask &in_RegMask(uint) const { return RegMask::Empty; }
@@ -54,7 +54,7 @@
 class ConINode : public ConNode {
 public:
   ConINode( const TypeInt *t ) : ConNode(t) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
 
   // Factory method:
   static ConINode* make(int con) {
@@ -68,7 +68,7 @@
 class ConPNode : public ConNode {
 public:
   ConPNode( const TypePtr *t ) : ConNode(t) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
 
   // Factory methods:
   static ConPNode* make(address con) {
@@ -85,7 +85,7 @@
 class ConNNode : public ConNode {
 public:
   ConNNode( const TypeNarrowOop *t ) : ConNode(t) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
 };
 
 //------------------------------ConNKlassNode---------------------------------
@@ -93,7 +93,7 @@
 class ConNKlassNode : public ConNode {
 public:
   ConNKlassNode( const TypeNarrowKlass *t ) : ConNode(t) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
 };
 
 
@@ -102,7 +102,7 @@
 class ConLNode : public ConNode {
 public:
   ConLNode( const TypeLong *t ) : ConNode(t) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
 
   // Factory method:
   static ConLNode* make(jlong con) {
@@ -116,7 +116,7 @@
 class ConFNode : public ConNode {
 public:
   ConFNode( const TypeF *t ) : ConNode(t) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
 
   // Factory method:
   static ConFNode* make(float con) {
@@ -130,7 +130,7 @@
 class ConDNode : public ConNode {
 public:
   ConDNode( const TypeD *t ) : ConNode(t) {}
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
 
   // Factory method:
   static ConDNode* make(double con) {
@@ -144,9 +144,9 @@
 class ThreadLocalNode : public Node {
 public:
     ThreadLocalNode( ) : Node((Node*)Compile::current()->root()) {}
-    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; }
 };