src/share/vm/opto/macro.cpp

*** 1672,1683 ****
--- 1672,1690 ----
        case Node::Class_Lock:
        case Node::Class_Unlock:
          success = eliminate_locking_node(n->as_AbstractLock());
          break;
        default:
+         if (n->Opcode() == Op_Opaque1 || n->Opcode() == Op_Opaque2) {
+           _igvn.add_users_to_worklist(n);
+           _igvn.hash_delete(n);
+           _igvn.subsume_node(n, n->in(1));
+           success = true;
+         } else {
            assert(false, "unknown node type in macro list");
          }
+       }
        assert(success == (C->macro_count() < old_macro_count), "elimination reduces macro count");
        progress = progress || success;
      }
    }
    // Make sure expansion will not cause node limit to be exceeded.