--- old/src/share/vm/ci/ciEnv.hpp	2015-09-25 16:23:20.234913972 +0200
+++ new/src/share/vm/ci/ciEnv.hpp	2015-09-25 16:23:20.078913978 +0200
@@ -32,9 +32,11 @@
 #include "code/dependencies.hpp"
 #include "code/exceptionHandlerTable.hpp"
 #include "compiler/oopMap.hpp"
+#include "compiler/compilerDirectives.hpp"
 #include "runtime/thread.hpp"
 
 class CompileTask;
+class DirectiveSet;
 
 // ciEnv
 //
@@ -56,7 +58,6 @@
   Dependencies*    _dependencies;
   const char*      _failure_reason;
   int              _compilable;
-  bool             _break_at_compile;
   int              _num_inlined_bytecodes;
   CompileTask*     _task;           // faster access to CompilerThread::task
   CompileLog*      _log;            // faster access to CompilerThread::log
@@ -332,9 +333,6 @@
     }
   }
 
-  bool break_at_compile() { return _break_at_compile; }
-  void set_break_at_compile(bool z) { _break_at_compile = z; }
-
   // Cache Jvmti state
   void  cache_jvmti_state();
   bool  jvmti_state_changed() const;
@@ -352,6 +350,7 @@
   // The compiler task which has created this env.
   // May be useful to find out compile_id, comp_level, etc.
   CompileTask* task() { return _task; }
+
   // Handy forwards to the task:
   int comp_level();   // task()->comp_level()
   uint compile_id();  // task()->compile_id()
@@ -367,9 +366,9 @@
                        ExceptionHandlerTable*    handler_table,
                        ImplicitExceptionTable*   inc_table,
                        AbstractCompiler*         compiler,
-                       int                       comp_level,
                        bool                      has_unsafe_access,
                        bool                      has_wide_vectors,
+                       DirectiveSet*             dirset,
                        RTMState                  rtm_state = NoRTM);
 
 
@@ -464,6 +463,11 @@
   void dump_replay_data(outputStream* out);
   void dump_replay_data_unsafe(outputStream* out);
   void dump_compile_data(outputStream* out);
+
+  // Compilation directives
+  bool should_inline(ciMethod* inlinee);
+  bool should_not_inline(ciMethod* inlinee);
+
 };
 
 #endif // SHARE_VM_CI_CIENV_HPP