*** old/src/share/vm/compiler/abstractCompiler.hpp	Wed Oct  7 12:14:48 2015
--- new/src/share/vm/compiler/abstractCompiler.hpp	Wed Oct  7 12:14:48 2015

*** 24,33 ****
--- 24,34 ----
  
  #ifndef SHARE_VM_COMPILER_ABSTRACTCOMPILER_HPP
  #define SHARE_VM_COMPILER_ABSTRACTCOMPILER_HPP
  
  #include "ci/compilerInterface.hpp"
+ #include "compiler/compilerDirectives.hpp"
  
  class AbstractCompiler : public CHeapObj<mtCompiler> {
   private:
    volatile int _num_compiler_threads;
  

*** 93,105 ****
--- 94,107 ----
    //
    // 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* directive) {
      return is_intrinsic_supported(method) &&
             !vmIntrinsics::is_disabled_by_flags(method, compilation_context);
+            !directive->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'.

*** 127,137 ****
--- 129,139 ----
    bool is_initialized()           { return _compiler_state == initialized; }
    bool is_failed     ()           { return _compiler_state == failed;}
    void set_state     (int state);
    void set_shut_down ()           { set_state(shut_down); }
    // Compilation entry point for methods
!   virtual void compile_method(ciEnv* env, ciMethod* target, int entry_bci, DirectiveSet* directive) {
      ShouldNotReachHere();
    }
  
  
    // Print compilation timers and statistics