*** old/src/share/vm/opto/library_call.cpp	Fri Jul 31 11:54:47 2015
--- new/src/share/vm/opto/library_call.cpp	Fri Jul 31 11:54:46 2015

*** 325,335 ****
--- 325,335 ----
      // methods access VM-internal data.
      VM_ENTRY_MARK;
      methodHandle mh(THREAD, m->get_Method());
      methodHandle ct(THREAD, method()->get_Method());
      is_available = compiler->is_intrinsic_supported(mh, is_virtual) &&
!                    !compiler->is_intrinsic_disabled_by_flag(mh, ct);
!                    !vmIntrinsics::is_disabled_by_flags(mh, ct);
    }
  
    if (is_available) {
      assert(id <= vmIntrinsics::LAST_COMPILER_INLINE, "caller responsibility");
      assert(id != vmIntrinsics::_Object_init && id != vmIntrinsics::_invoke, "enum out of order?");