graal-compiler: src/share/vm/graal/graalEnv.cpp comparison

comparison src/share/vm/graal/graalEnv.cpp @ 19487:fb38e004503c

moved creation of String for detailed dependency failure message outside of no safepoint region

author	Doug Simon <doug.simon@oracle.com>
date	Wed, 18 Feb 2015 21:55:31 +0100
parents	dd8989d5547f
children	29916dcee0b8

comparison

equal deleted inserted replaced

-:b53645225e48
+:fb38e004503c
 }
 // ------------------------------------------------------------------
 // Check for changes to the system dictionary during compilation
 // class loads, evolution, breakpoints
-bool GraalEnv::check_for_system_dictionary_modification(Dependencies* dependencies, Handle compiled_code, GraalEnv* env, TRAPS) {
+bool GraalEnv::check_for_system_dictionary_modification(Dependencies* dependencies, Handle compiled_code, GraalEnv* env, char** failure_detail) {
 // If JVMTI capabilities were enabled during compile, the compilation is invalidated.
 if (env != NULL) {
 if (!env->_jvmti_can_hotswap_or_post_breakpoint && JvmtiExport::can_hotswap_or_post_breakpoint()) {
-Handle message = java_lang_String::create_from_str("Hotswapping or breakpointing was enabled during compilation", THREAD);
+*failure_detail = (char*) "Hotswapping or breakpointing was enabled during compilation";
-HotSpotCompiledNmethod::set_installationFailureMessage(compiled_code, message());
 return false;
 }
 }
 // Dependencies must be checked when the system dictionary changes
 }
 for (Dependencies::DepStream deps(dependencies); deps.next(); ) {
 Klass* witness = deps.check_dependency();
 if (witness != NULL) {
-ResourceMark rm;
+// Use a fixed size buffer to prevent the string stream from
-stringStream st;
+// resizing in the context of an inner resource mark.
+char* buffer = NEW_RESOURCE_ARRAY(char, O_BUFLEN);
+stringStream st(buffer, O_BUFLEN);
 deps.print_dependency(witness, true, &st);
-Handle message = java_lang_String::create_from_str(st.as_string(), THREAD);
+*failure_detail = st.as_string();
-HotSpotCompiledNmethod::set_installationFailureMessage(compiled_code, message());
 return false;
 }
 if (LogCompilation) {
 deps.log_dependency();
 }
 Handle speculation_log) {
 GRAAL_EXCEPTION_CONTEXT;
 NMethodSweeper::possibly_sweep();
 nm = NULL;
 int comp_level = CompLevel_full_optimization;
+char* failure_detail = NULL;
+GraalEnv::CodeInstallResult result;
 {
 // To prevent compile queue updates.
 MutexLocker locker(MethodCompileQueue_lock, THREAD);
 // Prevent SystemDictionary::add_to_hierarchy from running
 // Encode the dependencies now, so we can check them right away.
 dependencies->encode_content_bytes();
 // Check for {class loads, evolution, breakpoints} during compilation
-if (!check_for_system_dictionary_modification(dependencies, compiled_code, env, THREAD)) {
+if (!check_for_system_dictionary_modification(dependencies, compiled_code, env, &failure_detail)) {
 // While not a true deoptimization, it is a preemptive decompile.
 MethodData* mdp = method()->method_data();
 if (mdp != NULL) {
 mdp->inc_decompile_count();
 if (mdp->decompile_count() > (uint)PerMethodRecompilationCutoff) {
 // All buffers in the CodeBuffer are allocated in the CodeCache.
 // If the code buffer is created on each compile attempt
 // as in C2, then it must be freed.
 //code_buffer->free_blob();
-return GraalEnv::dependencies_failed;
+result = GraalEnv::dependencies_failed;
-}
-ImplicitExceptionTable implicit_tbl;
-nm =  nmethod::new_nmethod(method,
-compile_id,
-entry_bci,
-offsets,
-orig_pc_offset,
-debug_info, dependencies, code_buffer,
-frame_words, oop_map_set,
-handler_table, &implicit_tbl,
-compiler, comp_level, installed_code, speculation_log);
-// Free codeBlobs
-//code_buffer->free_blob();
-if (nm == NULL) {
-// The CodeCache is full.  Print out warning and disable compilation.
-{
-MutexUnlocker ml(Compile_lock);
-MutexUnlocker locker(MethodCompileQueue_lock);
-CompileBroker::handle_full_code_cache();
-}
 } else {
-nm->set_has_unsafe_access(has_unsafe_access);
+ImplicitExceptionTable implicit_tbl;
+nm =  nmethod::new_nmethod(method,
-// Record successful registration.
+compile_id,
-// (Put nm into the task handle *before* publishing to the Java heap.)
+entry_bci,
-CompileTask* task = env == NULL ? NULL : env->task();
+offsets,
-if (task != NULL)  task->set_code(nm);
+orig_pc_offset,
+debug_info, dependencies, code_buffer,
-if (installed_code->is_a(HotSpotNmethod::klass()) && HotSpotNmethod::isDefault(installed_code())) {
+frame_words, oop_map_set,
-if (entry_bci == InvocationEntryBci) {
+handler_table, &implicit_tbl,
-if (TieredCompilation) {
+compiler, comp_level, installed_code, speculation_log);
-// If there is an old version we're done with it
-nmethod* old = method->code();
+// Free codeBlobs
-if (TraceMethodReplacement && old != NULL) {
+//code_buffer->free_blob();
+if (nm == NULL) {
+// The CodeCache is full.  Print out warning and disable compilation.
+{
+MutexUnlocker ml(Compile_lock);
+MutexUnlocker locker(MethodCompileQueue_lock);
+CompileBroker::handle_full_code_cache();
+}
+} else {
+nm->set_has_unsafe_access(has_unsafe_access);
+// Record successful registration.
+// (Put nm into the task handle *before* publishing to the Java heap.)
+CompileTask* task = env == NULL ? NULL : env->task();
+if (task != NULL)  task->set_code(nm);
+if (installed_code->is_a(HotSpotNmethod::klass()) && HotSpotNmethod::isDefault(installed_code())) {
+if (entry_bci == InvocationEntryBci) {
+if (TieredCompilation) {
+// If there is an old version we're done with it
+nmethod* old = method->code();
+if (TraceMethodReplacement && old != NULL) {
+ResourceMark rm;
+char *method_name = method->name_and_sig_as_C_string();
+tty->print_cr("Replacing method %s", method_name);
+}
+if (old != NULL ) {
+old->make_not_entrant();
+}
+}
+if (TraceNMethodInstalls) {
 ResourceMark rm;
 char *method_name = method->name_and_sig_as_C_string();
-tty->print_cr("Replacing method %s", method_name);
+ttyLocker ttyl;
+tty->print_cr("Installing method (%d) %s [entry point: %p]",
+comp_level,
+method_name, nm->entry_point());
 }
-if (old != NULL ) {
+// Allow the code to be executed
-old->make_not_entrant();
+method->set_code(method, nm);
+} else {
+if (TraceNMethodInstalls ) {
+ResourceMark rm;
+char *method_name = method->name_and_sig_as_C_string();
+ttyLocker ttyl;
+tty->print_cr("Installing osr method (%d) %s @ %d",
+comp_level,
+method_name,
+entry_bci);
 }
+InstanceKlass::cast(method->method_holder())->add_osr_nmethod(nm);
 }
-if (TraceNMethodInstalls) {
-ResourceMark rm;
-char *method_name = method->name_and_sig_as_C_string();
-ttyLocker ttyl;
-tty->print_cr("Installing method (%d) %s [entry point: %p]",
-comp_level,
-method_name, nm->entry_point());
-}
-// Allow the code to be executed
-method->set_code(method, nm);
-} else {
-if (TraceNMethodInstalls ) {
-ResourceMark rm;
-char *method_name = method->name_and_sig_as_C_string();
-ttyLocker ttyl;
-tty->print_cr("Installing osr method (%d) %s @ %d",
-comp_level,
-method_name,
-entry_bci);
-}
-InstanceKlass::cast(method->method_holder())->add_osr_nmethod(nm);
 }
 }
-}
+result = nm != NULL ? GraalEnv::ok :GraalEnv::cache_full;
 }
+}
+// String creation must be done outside lock
+if (failure_detail != NULL) {
+// A failure to allocate the string is silently ignored.
+Handle message = java_lang_String::create_from_str(failure_detail, THREAD);
+HotSpotCompiledNmethod::set_installationFailureMessage(compiled_code, message());
+}
 // JVMTI -- compiled method notification (must be done outside lock)
 if (nm != NULL) {
 nm->post_compiled_method_load_event();
-return GraalEnv::ok;
+}
-}
+return result;
-return GraalEnv::cache_full;
+}
-}

Mercurial > hg > graal-compiler

comparison src/share/vm/graal/graalEnv.cpp @ 19487:fb38e004503c