Mercurial > hg > graal-compiler
comparison src/share/vm/compiler/compileBroker.cpp @ 12356:359f7e70ae7f
Reduce HotSpot diff and fix previous merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 15:41:33 +0200 |
parents | cefad50507d8 |
children | f6c511451e4a |
comparison
equal
deleted
inserted
replaced
12355:cefad50507d8 | 12356:359f7e70ae7f |
---|---|
765 | 765 |
766 #ifndef SHARK | 766 #ifndef SHARK |
767 // Set the interface to the current compiler(s). | 767 // Set the interface to the current compiler(s). |
768 int c1_count = CompilationPolicy::policy()->compiler_count(CompLevel_simple); | 768 int c1_count = CompilationPolicy::policy()->compiler_count(CompLevel_simple); |
769 int c2_count = CompilationPolicy::policy()->compiler_count(CompLevel_full_optimization); | 769 int c2_count = CompilationPolicy::policy()->compiler_count(CompLevel_full_optimization); |
770 | |
771 #ifdef GRAAL | 770 #ifdef GRAAL |
772 GraalCompiler* graal = new GraalCompiler(); | 771 GraalCompiler* graal = new GraalCompiler(); |
773 #endif | 772 #endif |
774 | 773 #ifdef GRAALVM |
775 #if defined(GRAALVM) | |
776 _compilers[0] = graal; | 774 _compilers[0] = graal; |
777 c1_count = 0; | 775 c1_count = 0; |
778 c2_count = 0; | 776 c2_count = 0; |
779 #elif defined(COMPILER1) | 777 #else // GRAALVM |
778 #ifdef COMPILER1 | |
780 if (c1_count > 0) { | 779 if (c1_count > 0) { |
781 _compilers[0] = new Compiler(); | 780 _compilers[0] = new Compiler(); |
782 } | 781 } |
783 #endif // COMPILER1 | 782 #endif // COMPILER1 |
784 | 783 |
785 #ifdef COMPILER2 | 784 #ifdef COMPILER2 |
786 if (c2_count > 0) { | 785 if (c2_count > 0) { |
787 _compilers[1] = new C2Compiler(); | 786 _compilers[1] = new C2Compiler(); |
788 } | 787 } |
789 #endif // COMPILER2 | 788 #endif // COMPILER2 |
790 | 789 #endif // GRAALVM |
791 #else // SHARK | 790 #else // SHARK |
792 int c1_count = 0; | 791 int c1_count = 0; |
793 int c2_count = 1; | 792 int c2_count = 1; |
794 | 793 |
795 _compilers[1] = new SharkCompiler(); | 794 _compilers[1] = new SharkCompiler(); |
1052 for (int i=0; i<num_threads; i++) { | 1051 for (int i=0; i<num_threads; i++) { |
1053 if (_method_threads->at(i)->task() != NULL) { | 1052 if (_method_threads->at(i)->task() != NULL) { |
1054 return false; | 1053 return false; |
1055 } | 1054 } |
1056 } | 1055 } |
1057 } | 1056 |
1058 // No pending or active compilations. | 1057 // No pending or active compilations. |
1059 return true; | 1058 return true; |
1059 } | |
1060 } | 1060 } |
1061 | 1061 |
1062 | 1062 |
1063 // ------------------------------------------------------------------ | 1063 // ------------------------------------------------------------------ |
1064 // CompileBroker::compile_method | 1064 // CompileBroker::compile_method |