--- old/src/share/vm/opto/loopnode.hpp	2016-07-11 22:46:34.883418105 +0900
+++ new/src/share/vm/opto/loopnode.hpp	2016-07-11 22:46:34.742418599 +0900
@@ -121,7 +121,7 @@
   }
 
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   bool can_be_counted_loop(PhaseTransform* phase) const {
     return req() == 3 && in(0) != NULL &&
       in(1) != NULL && phase->type(in(1)) != Type::TOP &&
@@ -198,7 +198,7 @@
     // Will be reset (lower) if the loop's trip count is known.
   }
 
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
 
   Node *init_control() const { return in(EntryControl); }
@@ -294,7 +294,7 @@
     : IfNode( control, test, prob, cnt) {
     init_class_id(Class_CountedLoopEnd);
   }
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
 
   Node *cmp_node() const            { return (in(TestValue)->req() >=2) ? in(TestValue)->in(1) : NULL; }
   Node *incr() const                { Node *tmp = cmp_node(); return (tmp && tmp->req()==3) ? tmp->in(1) : NULL; }
@@ -339,7 +339,7 @@
   Node *bc = back_control();
   if( bc == NULL ) return NULL;
   Node *le = bc->in(0);
-  if( le->Opcode() != Op_CountedLoopEnd )
+  if( le->Opcode() != Opcodes::Op_CountedLoopEnd )
     return NULL;
   return (CountedLoopEndNode*)le;
 }
@@ -366,9 +366,9 @@
     init_flags(Flag_is_macro);
     C->add_macro_node(this);
   }
-  virtual int Opcode() const;
+  virtual Opcodes Opcode() const;
   virtual 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; }
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual Node* Identity(PhaseGVN* phase);
@@ -959,7 +959,7 @@
   // Create a new if above the uncommon_trap_if_pattern for the predicate to be promoted
   ProjNode* create_new_if_for_predicate(ProjNode* cont_proj, Node* new_entry,
                                         Deoptimization::DeoptReason reason,
-                                        int opcode);
+                                        Opcodes opcode);
   void register_control(Node* n, IdealLoopTree *loop, Node* pred);
 
   // Clone loop predicates to cloned loops (peeled, unswitched)
@@ -1020,7 +1020,7 @@
   // and inserting an if to select fast-slow versions.
   ProjNode* create_slow_version_of_loop(IdealLoopTree *loop,
                                         Node_List &old_new,
-                                        int opcode);
+                                        Opcodes opcode);
 
   // Clone a loop and return the clone head (clone_loop_head).
   // Added nodes include int(1), int(0) - disconnected, If, IfTrue, IfFalse,