Mercurial > hg > graal-compiler
diff src/share/vm/compiler/compileBroker.cpp @ 2447:e863062e521d
7032458: Zero and Shark fixes
Reviewed-by: twisti
Contributed-by: Gary Benson <gbenson@redhat.com>
| author | twisti |
|---|---|
| date | Mon, 04 Apr 2011 03:02:00 -0700 |
| parents | 3d58a4983660 |
| children | dbccacb79c63 |
line wrap: on
line diff
--- a/src/share/vm/compiler/compileBroker.cpp Sun Apr 03 12:00:54 2011 +0200 +++ b/src/share/vm/compiler/compileBroker.cpp Mon Apr 04 03:02:00 2011 -0700 @@ -847,9 +847,9 @@ // Initialize the compilation queue void CompileBroker::init_compiler_threads(int c1_compiler_count, int c2_compiler_count) { EXCEPTION_MARK; -#ifndef ZERO +#if !defined(ZERO) && !defined(SHARK) assert(c2_compiler_count > 0 || c1_compiler_count > 0, "No compilers?"); -#endif // !ZERO +#endif // !ZERO && !SHARK if (c2_compiler_count > 0) { _c2_method_queue = new CompileQueue("C2MethodQueue", MethodCompileQueue_lock); } @@ -1118,7 +1118,7 @@ assert(!HAS_PENDING_EXCEPTION, "No exception should be present"); // some prerequisites that are compiler specific - if (compiler(comp_level)->is_c2()) { + if (compiler(comp_level)->is_c2() || compiler(comp_level)->is_shark()) { method->constants()->resolve_string_constants(CHECK_0); // Resolve all classes seen in the signature of the method // we are compiling.