stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Christian Thalinger 2015-12-15 01:20:08 +01:00
commit 3db39e91be
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hotspot/src/share/vm/code/dependencies.cpp
View File

@ -346,7 +346,6 @@ void Dependencies::assert_common_2(DepType dept,
} }
} }
} else { } else {
assert(dep_implicit_context_arg(dept) == 0, "sanity");
if (note_dep_seen(dept, x0) && note_dep_seen(dept, x1)) { if (note_dep_seen(dept, x0) && note_dep_seen(dept, x1)) {
// look in this bucket for redundant assertions // look in this bucket for redundant assertions
const int stride = 2; const int stride = 2;

14
hotspot/src/share/vm/compiler/compileBroker.cpp
View File

@ -56,6 +56,7 @@
#if INCLUDE_JVMCI #if INCLUDE_JVMCI
#include "jvmci/jvmciCompiler.hpp" #include "jvmci/jvmciCompiler.hpp"
#include "jvmci/jvmciRuntime.hpp" #include "jvmci/jvmciRuntime.hpp"
#include "jvmci/jvmciJavaClasses.hpp"
#include "runtime/vframe.hpp" #include "runtime/vframe.hpp"
#endif #endif
#ifdef COMPILER2 #ifdef COMPILER2
@ -498,7 +499,7 @@ CompilerCounters::CompilerCounters() {
// CompileBroker::compilation_init // CompileBroker::compilation_init
// //
// Initialize the Compilation object // Initialize the Compilation object
void CompileBroker::compilation_init() { void CompileBroker::compilation_init(TRAPS) {
_last_method_compiled[0] = '\0'; _last_method_compiled[0] = '\0';
// No need to initialize compilation system if we do not use it. // No need to initialize compilation system if we do not use it.
@ -529,6 +530,17 @@ void CompileBroker::compilation_init() {
} else { } else {
c1_count = JVMCIHostThreads; c1_count = JVMCIHostThreads;
} }
if (!UseInterpreter) {
// Force initialization of JVMCI compiler otherwise JVMCI
// compilations will not block until JVMCI is initialized
ResourceMark rm;
TempNewSymbol getCompiler = SymbolTable::new_symbol("getCompiler", CHECK);
TempNewSymbol sig = SymbolTable::new_symbol("()Ljdk/vm/ci/runtime/JVMCICompiler;", CHECK);
Handle jvmciRuntime = JVMCIRuntime::get_HotSpotJVMCIRuntime(CHECK);
JavaValue result(T_OBJECT);
JavaCalls::call_virtual(&result, jvmciRuntime, HotSpotJVMCIRuntime::klass(), getCompiler, sig, CHECK);
}
} }
} }
#endif // INCLUDE_JVMCI #endif // INCLUDE_JVMCI

2
hotspot/src/share/vm/compiler/compileBroker.hpp
View File

@ -276,7 +276,7 @@ public:
CompileQueue *q = compile_queue(comp_level); CompileQueue *q = compile_queue(comp_level);
return q != NULL ? q->size() : 0; return q != NULL ? q->size() : 0;
} }
static void compilation_init(); static void compilation_init(TRAPS);
static void init_compiler_thread_log(); static void init_compiler_thread_log();
static nmethod* compile_method(const methodHandle& method, static nmethod* compile_method(const methodHandle& method,
int osr_bci, int osr_bci,

2
hotspot/src/share/vm/runtime/thread.cpp
View File

@ -3628,7 +3628,7 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
// initialize compiler(s) // initialize compiler(s)
#if defined(COMPILER1) || defined(COMPILER2) || defined(SHARK) || INCLUDE_JVMCI #if defined(COMPILER1) || defined(COMPILER2) || defined(SHARK) || INCLUDE_JVMCI
CompileBroker::compilation_init(); CompileBroker::compilation_init(CHECK_JNI_ERR);
#endif #endif
// Pre-initialize some JSR292 core classes to avoid deadlock during class loading. // Pre-initialize some JSR292 core classes to avoid deadlock during class loading.