*** old/src/share/vm/compiler/abstractCompiler.hpp	Tue Sep 22 16:26:51 2015
--- new/src/share/vm/compiler/abstractCompiler.hpp	Tue Sep 22 16:26:51 2015

*** 93,105 ****
--- 93,106 ----
    //
    // From the modes above, (1) disable intrinsics globally, (2) and (3)
    // disable intrinsics on a per-method basis. In cases (2) and (3) the
    // compilation context is aClass::aMethod and java.lang.ref.Reference::get,
    // respectively.
!   virtual bool is_intrinsic_available(methodHandle method, methodHandle compilation_context) {
!   virtual bool is_intrinsic_available(methodHandle method, DirectiveSet* dirset) {
      return is_intrinsic_supported(method) &&
             !vmIntrinsics::is_disabled_by_flags(method, compilation_context);
+            dirset->is_intrinsic_disabled(method) &&
+            !vmIntrinsics::is_disabled_by_flags(method);
    }
  
    // Determines if an intrinsic is supported by the compiler, that is,
    // the compiler provides the instructions necessary to generate
    // the intrinsic code for method 'method'.