Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/thread.cpp @ 23404:3ef45d0a6d77
Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
author | Roland Schatz <roland.schatz@oracle.com> |
---|---|
date | Tue, 24 May 2016 13:51:28 +0200 |
parents | 24505bf61633 |
children | b5f3a471e646 |
comparison
equal
deleted
inserted
replaced
23403:5342deb9bf53 | 23404:3ef45d0a6d77 |
---|---|
3306 #ifndef PRODUCT | 3306 #ifndef PRODUCT |
3307 _ideal_graph_printer = NULL; | 3307 _ideal_graph_printer = NULL; |
3308 #endif | 3308 #endif |
3309 } | 3309 } |
3310 | 3310 |
3311 #ifdef COMPILERJVMCI | 3311 #if INCLUDE_JVMCI |
3312 bool CompilerThread::can_call_java() const { | 3312 bool CompilerThread::can_call_java() const { |
3313 return _compiler != NULL && _compiler->is_jvmci(); | 3313 return _compiler != NULL && _compiler->is_jvmci(); |
3314 } | 3314 } |
3315 #endif | 3315 #endif // INCLUDE_JVMCI |
3316 | 3316 |
3317 void CompilerThread::oops_do(OopClosure* f, CLDClosure* cld_f, CodeBlobClosure* cf) { | 3317 void CompilerThread::oops_do(OopClosure* f, CLDClosure* cld_f, CodeBlobClosure* cf) { |
3318 JavaThread::oops_do(f, cld_f, cf); | 3318 JavaThread::oops_do(f, cld_f, cf); |
3319 if (_scanned_nmethod != NULL && cf != NULL) { | 3319 if (_scanned_nmethod != NULL && cf != NULL) { |
3320 // Safepoints can occur when the sweeper is scanning an nmethod so | 3320 // Safepoints can occur when the sweeper is scanning an nmethod so |
3708 if (CleanChunkPoolAsync) { | 3708 if (CleanChunkPoolAsync) { |
3709 Chunk::start_chunk_pool_cleaner_task(); | 3709 Chunk::start_chunk_pool_cleaner_task(); |
3710 } | 3710 } |
3711 | 3711 |
3712 // initialize compiler(s) | 3712 // initialize compiler(s) |
3713 #if defined(COMPILER1) || defined(COMPILER2) || defined(SHARK) || defined(COMPILERJVMCI) | 3713 #if defined(COMPILER1) || defined(COMPILER2) || defined(SHARK) || INCLUDE_JVMCI |
3714 CompileBroker::compilation_init(THREAD); | 3714 CompileBroker::compilation_init(THREAD); |
3715 if (HAS_PENDING_EXCEPTION) { | 3715 if (HAS_PENDING_EXCEPTION) { |
3716 vm_exit_during_initialization(Handle(THREAD, PENDING_EXCEPTION)); | 3716 vm_exit_during_initialization(Handle(THREAD, PENDING_EXCEPTION)); |
3717 } | 3717 } |
3718 #endif | 3718 #endif |