--- old/src/share/vm/opto/loopUnswitch.cpp	2016-07-11 22:46:33.651422419 +0900
+++ new/src/share/vm/opto/loopUnswitch.cpp	2016-07-11 22:46:33.516422891 +0900
@@ -173,7 +173,7 @@
     // Copy to a worklist for easier manipulation
     for (DUIterator_Fast jmax, j = proj->fast_outs(jmax); j < jmax; j++) {
       Node* use = proj->fast_out(j);
-      if (use->Opcode() == Op_CheckCastPP && loop->is_invariant(use->in(1))) {
+      if (use->Opcode() == Opcodes::Op_CheckCastPP && loop->is_invariant(use->in(1))) {
         worklist.push(use);
       }
     }
@@ -223,7 +223,7 @@
 // Return control projection of the entry to the fast version.
 ProjNode* PhaseIdealLoop::create_slow_version_of_loop(IdealLoopTree *loop,
                                                       Node_List &old_new,
-                                                      int opcode) {
+                                                      Opcodes opcode) {
   LoopNode* head  = loop->_head->as_Loop();
   bool counted_loop = head->is_CountedLoop();
   Node*     entry = head->in(LoopNode::EntryControl);
@@ -236,7 +236,7 @@
   register_node(opq, outer_loop, entry, dom_depth(entry));
   Node *bol       = new Conv2BNode(opq);
   register_node(bol, outer_loop, entry, dom_depth(entry));
-  IfNode* iff = (opcode == Op_RangeCheck) ? new RangeCheckNode(entry, bol, PROB_MAX, COUNT_UNKNOWN) :
+  IfNode* iff = (opcode == Opcodes::Op_RangeCheck) ? new RangeCheckNode(entry, bol, PROB_MAX, COUNT_UNKNOWN) :
     new IfNode(entry, bol, PROB_MAX, COUNT_UNKNOWN);
   register_node(iff, outer_loop, entry, dom_depth(entry));
   ProjNode* iffast = new IfTrueNode(iff);
@@ -405,7 +405,7 @@
     return false;
   }
 
-  if (iff->in(1)->Opcode() != Op_ConI) {
+  if (iff->in(1)->Opcode() != Opcodes::Op_ConI) {
     return false;
   }