*** old/src/share/vm/c1/c1_Compilation.cpp	Thu Oct  8 14:07:16 2015
--- new/src/share/vm/c1/c1_Compilation.cpp	Thu Oct  8 14:07:15 2015

*** 32,41 ****
--- 32,42 ----
  #include "c1/c1_RangeCheckElimination.hpp"
  #include "c1/c1_ValueMap.hpp"
  #include "c1/c1_ValueStack.hpp"
  #include "code/debugInfoRec.hpp"
  #include "compiler/compileLog.hpp"
+ #include "compiler/compilerDirectives.hpp"
  #include "runtime/sharedRuntime.hpp"
  
  typedef enum {
    _t_compile,
      _t_setup,

*** 415,427 ****
--- 416,428 ----
      in_bytes(frame_map()->framesize_in_bytes()) / sizeof(intptr_t),
      debug_info_recorder()->_oopmaps,
      exception_handler_table(),
      implicit_exception_table(),
      compiler(),
      _env->comp_level(),
      has_unsafe_access(),
!     SharedRuntime::is_wide_vector(max_vector_size()),
+     directive()
    );
  }
  
  
  void Compilation::compile_method() {

*** 442,452 ****
--- 443,453 ----
    if (_env->jvmti_can_hotswap_or_post_breakpoint()) {
      // We can assert evol_method because method->can_be_compiled is true.
      dependency_recorder()->assert_evol_method(method());
    }
  
!   if (method()->break_at_execute()) {
!   if (directive()->BreakAtCompileOption) {
      BREAKPOINT;
    }
  
  #ifndef PRODUCT
    if (PrintCFGToFile) {

*** 531,543 ****
--- 532,545 ----
    }
  }
  
  
  Compilation::Compilation(AbstractCompiler* compiler, ciEnv* env, ciMethod* method,
!                          int osr_bci, BufferBlob* buffer_blob, DirectiveSet* directive)
  : _compiler(compiler)
  , _env(env)
+ , _directive(directive)
  , _log(env->log())
  , _method(method)
  , _osr_bci(osr_bci)
  , _hir(NULL)
  , _max_spills(-1)

*** 584,594 ****
--- 586,595 ----
  
  Compilation::~Compilation() {
    _env->set_compiler_data(NULL);
  }
  
  
  void Compilation::add_exception_handlers_for_pco(int pco, XHandlers* exception_handlers) {
  #ifndef PRODUCT
    if (PrintExceptionHandlers && Verbose) {
      tty->print_cr("  added exception scope for pco %d", pco);
    }