--- old/src/share/vm/opto/graphKit.cpp	2016-07-11 22:46:25.476451041 +0900
+++ new/src/share/vm/opto/graphKit.cpp	2016-07-11 22:46:25.333451542 +0900
@@ -1267,7 +1267,7 @@
     Node *cfg = control();
     int depth = 0;
     while( depth < 16 ) {       // Limit search depth for speed
-      if( cfg->Opcode() == Op_IfTrue &&
+      if( cfg->Opcode() == Opcodes::Op_IfTrue &&
           cfg->in(0)->in(1) == tst ) {
         // Found prior test.  Use "cast_not_null" to construct an identical
         // CastPP (and hence hash to) as already exists for the prior test.
@@ -2034,7 +2034,7 @@
   if (i0 != NULL && i0->is_If()) {        // Found a guarding if test?
     IfNode *iff = i0->as_If();
     float f = iff->_prob;   // Get prob
-    if (control()->Opcode() == Op_IfTrue) {
+    if (control()->Opcode() == Opcodes::Op_IfTrue) {
       if (f > PROB_UNLIKELY_MAG(4))
         iff->_prob = PROB_MIN;
     } else {
@@ -3110,7 +3110,7 @@
 //------------------------------insert_mem_bar---------------------------------
 // Memory barrier to avoid floating things around
 // The membar serves as a pinch point between both control and all memory slices.
-Node* GraphKit::insert_mem_bar(int opcode, Node* precedent) {
+Node* GraphKit::insert_mem_bar(Opcodes opcode, Node* precedent) {
   MemBarNode* mb = MemBarNode::make(C, opcode, Compile::AliasIdxBot, precedent);
   mb->init_req(TypeFunc::Control, control());
   mb->init_req(TypeFunc::Memory,  reset_memory());
@@ -3125,7 +3125,7 @@
 // The membar serves as a pinch point between both control and memory(alias_idx).
 // If you want to make a pinch point on all memory slices, do not use this
 // function (even with AliasIdxBot); use insert_mem_bar() instead.
-Node* GraphKit::insert_mem_bar_volatile(int opcode, int alias_idx, Node* precedent) {
+Node* GraphKit::insert_mem_bar_volatile(Opcodes opcode, int alias_idx, Node* precedent) {
   // When Parse::do_put_xxx updates a volatile field, it appends a series
   // of MemBarVolatile nodes, one for *each* volatile field alias category.
   // The first membar is on the same memory slice as the field store opcode.
@@ -3140,7 +3140,7 @@
   if (alias_idx == Compile::AliasIdxBot) {
     mb->set_req(TypeFunc::Memory, merged_memory()->base_memory());
   } else {
-    assert(!(opcode == Op_Initialize && alias_idx != Compile::AliasIdxRaw), "fix caller");
+    assert(!(opcode == Opcodes::Op_Initialize && alias_idx != Compile::AliasIdxRaw), "fix caller");
     mb->set_req(TypeFunc::Memory, memory(alias_idx));
   }
   Node* membar = _gvn.transform(mb);
@@ -3155,7 +3155,7 @@
 
 void GraphKit::insert_store_load_for_barrier() {
   Node* mem = reset_memory();
-  MemBarNode* mb = MemBarNode::make(C, Op_MemBarVolatile, Compile::AliasIdxBot);
+  MemBarNode* mb = MemBarNode::make(C, Opcodes::Op_MemBarVolatile, Compile::AliasIdxBot);
   mb->init_req(TypeFunc::Control, control());
   mb->init_req(TypeFunc::Memory, mem);
   Node* membar = _gvn.transform(mb);
@@ -3216,7 +3216,7 @@
   // lock has no side-effects, sets few values
   set_predefined_output_for_runtime_call(lock, mem, TypeRawPtr::BOTTOM);
 
-  insert_mem_bar(Op_MemBarAcquireLock);
+  insert_mem_bar(Opcodes::Op_MemBarAcquireLock);
 
   // Add this to the worklist so that the lock can be eliminated
   record_for_igvn(lock);
@@ -3249,7 +3249,7 @@
   }
 
   // Memory barrier to avoid floating things down past the locked region
-  insert_mem_bar(Op_MemBarReleaseLock);
+  insert_mem_bar(Opcodes::Op_MemBarReleaseLock);
 
   const TypeFunc *tf = OptoRuntime::complete_monitor_exit_Type();
   UnlockNode *unlock = new UnlockNode(C, tf);
@@ -3337,7 +3337,7 @@
   Node* rawoop = _gvn.transform( new ProjNode(allocx, TypeFunc::Parms) );
 
   // put in an initialization barrier
-  InitializeNode* init = insert_mem_bar_volatile(Op_Initialize, rawidx,
+  InitializeNode* init = insert_mem_bar_volatile(Opcodes::Op_Initialize, rawidx,
                                                  rawoop)->as_Initialize();
   assert(alloc->initialization() == init,  "2-way macro link must work");
   assert(init ->allocation()     == alloc, "2-way macro link must work");
@@ -4400,7 +4400,7 @@
 }
 
 Node* GraphKit::compress_string(Node* src, const TypeAryPtr* src_type, Node* dst, Node* count) {
-  assert(Matcher::match_rule_supported(Op_StrCompressedCopy), "Intrinsic not supported");
+  assert(Matcher::match_rule_supported(Opcodes::Op_StrCompressedCopy), "Intrinsic not supported");
   assert(src_type == TypeAryPtr::BYTES || src_type == TypeAryPtr::CHARS, "invalid source type");
   // If input and output memory types differ, capture both states to preserve
   // the dependency between preceding and subsequent loads/stores.
@@ -4423,7 +4423,7 @@
 }
 
 void GraphKit::inflate_string(Node* src, Node* dst, const TypeAryPtr* dst_type, Node* count) {
-  assert(Matcher::match_rule_supported(Op_StrInflatedCopy), "Intrinsic not supported");
+  assert(Matcher::match_rule_supported(Opcodes::Op_StrInflatedCopy), "Intrinsic not supported");
   assert(dst_type == TypeAryPtr::BYTES || dst_type == TypeAryPtr::CHARS, "invalid dest type");
   // Capture src and dst memory (see comment in 'compress_string').
   Node* mem = capture_memory(TypeAryPtr::BYTES, dst_type);