--- old/src/share/vm/opto/block.cpp	2016-07-11 22:46:12.429496721 +0900
+++ new/src/share/vm/opto/block.cpp	2016-07-11 22:46:12.293497197 +0900
@@ -209,8 +209,8 @@
     }
   }
 
-  int op = en->is_Mach() ? en->as_Mach()->ideal_Opcode() : en->Opcode();
-  return op == Op_Halt;
+  Opcodes op = en->is_Mach() ? en->as_Mach()->ideal_Opcode() : en->Opcode();
+  return op == Opcodes::Op_Halt;
 }
 
 // True if block is low enough frequency or guarded by a test which
@@ -547,8 +547,8 @@
     if (branch->is_MachNullCheck()) {
       return true;
     }
-    int iop = branch->as_Mach()->ideal_Opcode();
-    if (iop == Op_FastLock || iop == Op_FastUnlock) {
+    Opcodes iop = branch->as_Mach()->ideal_Opcode();
+    if (iop == Opcodes::Op_FastLock || iop == Opcodes::Op_FastUnlock) {
       return true;
     }
     // Don't flip if branch has an implicit check.
@@ -680,7 +680,7 @@
     // to give a fake exit path to infinite loops.  At this late stage they
     // need to turn into Goto's so that when you enter the infinite loop you
     // indeed hang.
-    if (block->get_node(block->end_idx())->Opcode() == Op_NeverBranch) {
+    if (block->get_node(block->end_idx())->Opcode() == Opcodes::Op_NeverBranch) {
       convert_NeverBranch_to_Goto(block);
     }
 
@@ -724,8 +724,8 @@
   MachIfNode *iff   = block->get_node(block->number_of_nodes()-3)->as_MachIf();
   ProjNode   *proj0 = block->get_node(block->number_of_nodes()-2)->as_Proj();
   ProjNode   *proj1 = block->get_node(block->number_of_nodes()-1)->as_Proj();
-  ProjNode   *projt = (proj0->Opcode() == Op_IfTrue)  ? proj0 : proj1;
-  ProjNode   *projf = (proj0->Opcode() == Op_IfFalse) ? proj0 : proj1;
+  ProjNode   *projt = (proj0->Opcode() == Opcodes::Op_IfTrue)  ? proj0 : proj1;
+  ProjNode   *projf = (proj0->Opcode() == Opcodes::Op_IfFalse) ? proj0 : proj1;
 
   // Assert that proj0 and succs[0] match up. Similarly for proj1 and succs[1].
   assert(proj0->raw_out(0) == block->_succs[0]->head(), "Mismatch successor 0");
@@ -870,7 +870,7 @@
         // _prob is the probability of taking the true path. Make
         // p the probability of taking successor #1.
         float p = iff->as_MachIf()->_prob;
-        if (proj0->Opcode() == Op_IfTrue) {
+        if (proj0->Opcode() == Opcodes::Op_IfTrue) {
           p = 1.0 - p;
         }
 
@@ -916,7 +916,7 @@
       }
 
       // Make sure we TRUE branch to the target
-      if (proj0->Opcode() == Op_IfFalse) {
+      if (proj0->Opcode() == Opcodes::Op_IfFalse) {
         iff->as_MachIf()->negate();
       }
 
@@ -1209,7 +1209,7 @@
     for (j = 0; j < cnt; j++)  {
       Node *n = block->get_node(j);
       assert(get_block_for_node(n) == block, "");
-      if (j >= 1 && n->is_Mach() && n->as_Mach()->ideal_Opcode() == Op_CreateEx) {
+      if (j >= 1 && n->is_Mach() && n->as_Mach()->ideal_Opcode() == Opcodes::Op_CreateEx) {
         assert(j == 1 || block->get_node(j-1)->is_Phi(), "CreateEx must be first instruction in block");
       }
       for (uint k = 0; k < n->req(); k++) {
@@ -1247,7 +1247,7 @@
         ;
       }
       assert(block->get_node(j)->is_MachCall(), "CatchProj must follow call");
-    } else if (bp->is_Mach() && bp->as_Mach()->ideal_Opcode() == Op_If) {
+    } else if (bp->is_Mach() && bp->as_Mach()->ideal_Opcode() == Opcodes::Op_If) {
       assert(block->_num_succs == 2, "Conditional branch must have two targets");
     }
   }