--- old/src/share/vm/ci/ciEnv.hpp	2016-01-22 13:53:33.417288490 +0100
+++ new/src/share/vm/ci/ciEnv.hpp	2016-01-22 13:53:33.313288486 +0100
@@ -31,6 +31,7 @@
 #include "code/debugInfoRec.hpp"
 #include "code/dependencies.hpp"
 #include "code/exceptionHandlerTable.hpp"
+#include "compiler/compilerDirectives.hpp"
 #include "compiler/oopMap.hpp"
 #include "runtime/thread.hpp"
 
@@ -61,6 +62,7 @@
   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;
@@ -294,7 +296,7 @@
     MethodCompilable_never
   };
 
-  ciEnv(CompileTask* task, int system_dictionary_modification_counter);
+  ciEnv(CompileTask* task, int system_dictionary_modification_counter, DirectiveSet* set);
   // Used only during initialization of the ci
   ciEnv(Arena* arena);
   ~ciEnv();
@@ -352,6 +354,7 @@
   // 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()