hotspot/src/share/vm/compiler/compileBroker.cpp

*** 845,857 ****
  // CompileBroker::init_compiler_threads
  //
  // Initialize the compilation queue
  void CompileBroker::init_compiler_threads(int c1_compiler_count, int c2_compiler_count) {
    EXCEPTION_MARK;
! #ifndef ZERO
    assert(c2_compiler_count > 0 || c1_compiler_count > 0, "No compilers?");
! #endif // !ZERO
    if (c2_compiler_count > 0) {
      _c2_method_queue  = new CompileQueue("C2MethodQueue",  MethodCompileQueue_lock);
    }
    if (c1_compiler_count > 0) {
      _c1_method_queue  = new CompileQueue("C1MethodQueue",  MethodCompileQueue_lock);
--- 845,857 ----
  // CompileBroker::init_compiler_threads
  //
  // Initialize the compilation queue
  void CompileBroker::init_compiler_threads(int c1_compiler_count, int c2_compiler_count) {
    EXCEPTION_MARK;
! #if !defined(ZERO) && !defined(SHARK)
    assert(c2_compiler_count > 0 || c1_compiler_count > 0, "No compilers?");
! #endif // !ZERO && !SHARK
    if (c2_compiler_count > 0) {
      _c2_method_queue  = new CompileQueue("C2MethodQueue",  MethodCompileQueue_lock);
    }
    if (c1_compiler_count > 0) {
      _c1_method_queue  = new CompileQueue("C1MethodQueue",  MethodCompileQueue_lock);
*** 1116,1126 ****
      if (method->is_not_osr_compilable()) return NULL;
    }
  
    assert(!HAS_PENDING_EXCEPTION, "No exception should be present");
    // some prerequisites that are compiler specific
!   if (compiler(comp_level)->is_c2()) {
      method->constants()->resolve_string_constants(CHECK_0);
      // Resolve all classes seen in the signature of the method
      // we are compiling.
      methodOopDesc::load_signature_classes(method, CHECK_0);
    }
--- 1116,1126 ----
      if (method->is_not_osr_compilable()) return NULL;
    }
  
    assert(!HAS_PENDING_EXCEPTION, "No exception should be present");
    // some prerequisites that are compiler specific
!   if (compiler(comp_level)->is_c2() || compiler(comp_level)->is_c2()) {
      method->constants()->resolve_string_constants(CHECK_0);
      // Resolve all classes seen in the signature of the method
      // we are compiling.
      methodOopDesc::load_signature_classes(method, CHECK_0);
    }