--- old/src/share/vm/opto/macroArrayCopy.cpp	2016-07-11 22:46:38.366405911 +0900
+++ new/src/share/vm/opto/macroArrayCopy.cpp	2016-07-11 22:46:38.229406390 +0900
@@ -31,7 +31,7 @@
 #include "opto/runtime.hpp"
 
 
-void PhaseMacroExpand::insert_mem_bar(Node** ctrl, Node** mem, int opcode, Node* precedent) {
+void PhaseMacroExpand::insert_mem_bar(Node** ctrl, Node** mem, Opcodes opcode, Node* precedent) {
   MemBarNode* mb = MemBarNode::make(C, opcode, Compile::AliasIdxBot, precedent);
   mb->init_req(TypeFunc::Control, *ctrl);
   mb->init_req(TypeFunc::Memory, *mem);
@@ -390,7 +390,7 @@
         // Use a secondary InitializeNode as raw memory barrier.
         // Currently it is needed only on this path since other
         // paths have stub or runtime calls as raw memory barriers.
-        MemBarNode* mb = MemBarNode::make(C, Op_Initialize,
+        MemBarNode* mb = MemBarNode::make(C, Opcodes::Op_Initialize,
                                           Compile::AliasIdxRaw,
                                           top());
         transform_later(mb);
@@ -709,9 +709,9 @@
     // Do not let stores that initialize this object be reordered with
     // a subsequent store that would make this object accessible by
     // other threads.
-    insert_mem_bar(ctrl, &out_mem, Op_MemBarStoreStore);
+    insert_mem_bar(ctrl, &out_mem, Opcodes::Op_MemBarStoreStore);
   } else if (InsertMemBarAfterArraycopy) {
-    insert_mem_bar(ctrl, &out_mem, Op_MemBarCPUOrder);
+    insert_mem_bar(ctrl, &out_mem, Opcodes::Op_MemBarCPUOrder);
   }
 
   _igvn.replace_node(_memproj_fallthrough, out_mem);
@@ -1145,7 +1145,7 @@
     // Do not let writes into the source float below the arraycopy.
     {
       Node* mem = ac->in(TypeFunc::Memory);
-      insert_mem_bar(&ctrl, &mem, Op_MemBarCPUOrder);
+      insert_mem_bar(&ctrl, &mem, Opcodes::Op_MemBarCPUOrder);
 
       merge_mem = MergeMemNode::make(mem);
       transform_later(merge_mem);
@@ -1162,7 +1162,7 @@
     // memory slices which pertain to array elements--but don't bother.
     if (!InsertMemBarAfterArraycopy) {
       // (If InsertMemBarAfterArraycopy, there is already one in place.)
-      insert_mem_bar(&ctrl, &mem, Op_MemBarCPUOrder);
+      insert_mem_bar(&ctrl, &mem, Opcodes::Op_MemBarCPUOrder);
     }
     return;
   }