--- old/src/share/vm/opto/node.hpp	2016-07-11 22:46:47.098375338 +0900
+++ new/src/share/vm/opto/node.hpp	2016-07-11 22:46:46.960375822 +0900
@@ -458,11 +458,11 @@
   }
 
   // Find out of current node that matches opcode.
-  Node* find_out_with(int opcode);
+  Node* find_out_with(Opcodes opcode);
   // Return true if the current node has an out that matches opcode.
-  bool has_out_with(int opcode);
+  bool has_out_with(Opcodes opcode);
   // Return true if the current node has an out that matches any of the opcodes.
-  bool has_out_with(int opcode1, int opcode2, int opcode3, int opcode4);
+  bool has_out_with(Opcodes opcode1, Opcodes opcode2, Opcodes opcode3, Opcodes opcode4);
 
 private:
   static Node* uncast_helper(const Node* n);
@@ -757,7 +757,7 @@
   void remove_flag(jushort fl) { clear_flag(fl); }
 
   // Return a dense integer opcode number
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
 
   // Virtual inherited Node size
   virtual uint size_of() const;
@@ -992,7 +992,7 @@
 
   // Return a node with opcode "opc" and same inputs as "this" if one can
   // be found; Otherwise return NULL;
-  Node* find_similar(int opc);
+  Node* find_similar(Opcodes opc);
 
   // Return the unique control out if only one. Null if none or more than one.
   Node* unique_ctrl_out() const;
@@ -1004,9 +1004,7 @@
 
   // Ideal register class for Matching.  Zero means unmatched instruction
   // (these are cloned instead of converted to machine nodes).
-  virtual uint ideal_reg() const;
-
-  static const uint NotAMachineReg;   // must be > max. machine register
+  virtual Opcodes ideal_reg() const;
 
   // Do we Match on this edge index or not?  Generally false for Control
   // and true for everything else.  Weird for calls & returns.
@@ -1710,7 +1708,7 @@
   }
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual const Type *bottom_type() const;
-  virtual       uint  ideal_reg() const;
+  virtual       Opcodes  ideal_reg() const;
 #ifndef PRODUCT
   virtual void dump_spec(outputStream *st) const;
   virtual void dump_compact_spec(outputStream *st) const;