*** old/src/share/vm/ci/ciEnv.hpp	Wed Feb 10 10:49:51 2016
--- new/src/share/vm/ci/ciEnv.hpp	Wed Feb 10 10:49:51 2016

*** 29,38 ****
--- 29,39 ----
  #include "ci/ciObjectFactory.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "code/debugInfoRec.hpp"
  #include "code/dependencies.hpp"
  #include "code/exceptionHandlerTable.hpp"
+ #include "compiler/compilerDirectives.hpp"
  #include "compiler/oopMap.hpp"
  #include "runtime/thread.hpp"
  
  class CompileTask;
  

*** 59,68 ****
--- 60,70 ----
    bool             _break_at_compile;
    int              _num_inlined_bytecodes;
    CompileTask*     _task;           // faster access to CompilerThread::task
    CompileLog*      _log;            // faster access to CompilerThread::log
    void*            _compiler_data;  // compiler-specific stuff, if any
+   DirectiveSet*    _directive;
  
    char* _name_buffer;
    int   _name_buffer_len;
  
    // Cache Jvmti state

*** 292,302 ****
--- 294,304 ----
      MethodCompilable,
      MethodCompilable_not_at_tier,
      MethodCompilable_never
    };
  
!   ciEnv(CompileTask* task, int system_dictionary_modification_counter, DirectiveSet* set);
    // Used only during initialization of the ci
    ciEnv(Arena* arena);
    ~ciEnv();
  
    OopRecorder* oop_recorder() { return _oop_recorder; }

*** 350,359 ****
--- 352,362 ----
    bool  dtrace_alloc_probes()    const { return _dtrace_alloc_probes; }
  
    // The compiler task which has created this env.
    // May be useful to find out compile_id, comp_level, etc.
    CompileTask* task() { return _task; }
+   DirectiveSet* directive() { return _directive; }
  
    // Handy forwards to the task:
    int comp_level();   // task()->comp_level()
    uint compile_id();  // task()->compile_id()