Mercurial > hg > graal-compiler
diff src/share/vm/compiler/compileBroker.cpp @ 1692:d2ede61b7a12
6976186: integrate Shark HotSpot changes
Summary: Shark is a JIT compiler for Zero that uses the LLVM compiler infrastructure.
Reviewed-by: kvn, twisti
Contributed-by: Gary Benson <gbenson@redhat.com>
| author | twisti |
|---|---|
| date | Wed, 11 Aug 2010 05:51:21 -0700 |
| parents | e9ff18c4ace7 |
| children | a62d332029cf |
line wrap: on
line diff
--- a/src/share/vm/compiler/compileBroker.cpp Wed Aug 11 01:17:27 2010 -0700 +++ b/src/share/vm/compiler/compileBroker.cpp Wed Aug 11 05:51:21 2010 -0700 @@ -568,6 +568,14 @@ #endif #endif // COMPILER2 +#ifdef SHARK +#if defined(COMPILER1) || defined(COMPILER2) +#error "Can't use COMPILER1 or COMPILER2 with shark" +#endif + _compilers[0] = new SharkCompiler(); + _compilers[1] = _compilers[0]; +#endif + // Initialize the CompileTask free list _task_free_list = NULL;