src/share/vm/opto/narrowptrnode.hpp

@@ -36,11 +36,11 @@
     init_class_id(Class_EncodeNarrowPtr);
     init_req(0, NULL);
     init_req(1, value);
   }
   public:
-  virtual uint  ideal_reg() const { return Op_RegN; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegN; }
 };
 
 //------------------------------EncodeP--------------------------------
 // Encodes an oop pointers into its compressed form
 // Takes an extra argument which is the real heap base as a long which

@@ -49,11 +49,11 @@
   public:
   EncodePNode(Node* value, const Type* type):
   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;
 };
 
 //------------------------------EncodePKlass--------------------------------

@@ -64,11 +64,11 @@
   public:
   EncodePKlassNode(Node* value, const Type* type):
   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;
 };
 
 //------------------------------DecodeNarrowPtr--------------------------------

@@ -79,11 +79,11 @@
     init_class_id(Class_DecodeNarrowPtr);
     init_req(0, NULL);
     init_req(1, value);
   }
   public:
-  virtual uint  ideal_reg() const { return Op_RegP; }
+  virtual Opcodes ideal_reg() const { return Opcodes::Op_RegP; }
 };
 
 //------------------------------DecodeN--------------------------------
 // Converts a narrow oop into a real oop ptr.
 // Takes an extra argument which is the real heap base as a long which

@@ -92,11 +92,11 @@
   public:
   DecodeNNode(Node* value, const Type* type):
   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);
 };
 
 //------------------------------DecodeNKlass--------------------------------

@@ -107,11 +107,11 @@
   public:
   DecodeNKlassNode(Node* value, const Type* type):
   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);
 };
 
 #endif // SHARE_VM_OPTO_NARROWPTRNODE_HPP