*** old/src/share/vm/opto/library_call.cpp	Thu Oct  8 14:07:19 2015
--- new/src/share/vm/opto/library_call.cpp	Thu Oct  8 14:07:19 2015

*** 324,336 ****
--- 324,337 ----
      // For calling is_intrinsic_supported and is_intrinsic_disabled_by_flag
      // the compiler must transition to '_thread_in_vm' state because both
      // 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) &&
                     !vmIntrinsics::is_disabled_by_flags(mh, ct);
+                    !C->directive()->is_intrinsic_disabled(mh) &&
+                    !vmIntrinsics::is_disabled_by_flags(mh);
+ 
    }
  
    if (is_available) {
      assert(id <= vmIntrinsics::LAST_COMPILER_INLINE, "caller responsibility");
      assert(id != vmIntrinsics::_Object_init && id != vmIntrinsics::_invoke, "enum out of order?");