*** old/src/share/vm/compiler/compileBroker.cpp	Wed Feb 10 10:49:51 2016
--- new/src/share/vm/compiler/compileBroker.cpp	Wed Feb 10 10:49:51 2016

*** 1253,1262 ****
--- 1253,1263 ----
                   (method->is_static() ? " static" : ""));
        method->print_short_name(tty);
        tty->cr();
      }
      method->set_not_compilable(comp_level, !quietly, "excluded by CompileCommand");
+     return true;
    }
  
    return false;
  }
  

*** 1470,1480 ****
--- 1471,1483 ----
    }
  
    {
      // Must switch to native to allocate ci_env
      ThreadToNativeFromVM ttn(thread);
      ciEnv ci_env(NULL, system_dictionary_modification_counter);
+     // Matching the default directive, we currently have no method to match.
+     DirectiveSet* directive = DirectivesStack::getDefaultDirective(CompileBroker::compiler(CompLevel_full_optimization));
+     ciEnv ci_env(NULL, system_dictionary_modification_counter, directive);
      // Cache Jvmti state
      ci_env.cache_jvmti_state();
      // Cache DTrace flags
      ci_env.cache_dtrace_flags();
  

*** 1484,1493 ****
--- 1487,1497 ----
  
      if (!comp->is_shark()) {
        // Perform per-thread and global initializations
        comp->initialize();
      }
+     DirectivesStack::release(directive);
    }
  
    if (comp->is_failed()) {
      disable_compilation_forever();
      // If compiler initialization failed, no compiler thread that is specific to a

*** 1843,1853 ****
--- 1847,1857 ----
  #endif // INCLUDE_JVMCI
    {
      NoHandleMark  nhm;
      ThreadToNativeFromVM ttn(thread);
  
!     ciEnv ci_env(task, system_dictionary_modification_counter, directive);
      if (should_break) {
        ci_env.set_break_at_compile(true);
      }
      if (should_log) {
        ci_env.set_log(thread->log());

*** 1873,1883 ****
--- 1877,1887 ----
          MonitorLockerEx locker(Compilation_lock, Mutex::_no_safepoint_check_flag);
          while (WhiteBox::compilation_locked) {
            locker.wait(Mutex::_no_safepoint_check_flag);
          }
        }
-       comp->compile_method(&ci_env, target, osr_bci, directive);
      }
  
      if (!ci_env.failing() && task->code() == NULL) {
        //assert(false, "compiler should always document failure");
        // The compiler elected, without comment, not to register a result.