*** old/src/share/vm/compiler/compileTask.cpp	Fri Sep 25 16:23:21 2015
--- new/src/share/vm/compiler/compileTask.cpp	Fri Sep 25 16:23:21 2015

*** 24,33 ****
--- 24,34 ----
  
  #include "precompiled.hpp"
  #include "compiler/compileTask.hpp"
  #include "compiler/compileLog.hpp"
  #include "compiler/compileBroker.hpp"
+ #include "compiler/compilerDirectives.hpp"
  
  CompileTask*  CompileTask::_task_free_list = NULL;
  #ifdef ASSERT
  int CompileTask::_num_allocated_tasks = 0;
  #endif

*** 347,356 ****
--- 348,370 ----
    }
    log->mark_file_end();
  }
  
  // ------------------------------------------------------------------
+ // CompileTask::check_break_at_flags
+ bool CompileTask::check_break_at_flags() {
+   int compile_id = this->_compile_id;
+   bool is_osr = (_osr_bci != CompileBroker::standard_entry_bci);
+ 
+   if (CICountOSR && is_osr && (compile_id == CIBreakAtOSR)) {
+     return true;
+   } else {
+     return (compile_id == CIBreakAt);
+   }
+ }
+ 
+ // ------------------------------------------------------------------
  // CompileTask::print_inlining
  void CompileTask::print_inlining_inner(outputStream* st, ciMethod* method, int inline_level, int bci, const char* msg) {
    //         1234567
    st->print("        ");     // print timestamp
    //         1234