OpenJDK / jdk / jdk12
changeset 35576:1f1cca67a48e
8147433: PrintNMethods no longer works with JVMCI
Reviewed-by: kvn, twisti
| author | never |
|---|---|
| date | Mon, 18 Jan 2016 11:07:40 -0800 |
| parents | 92432f74992f |
| children | 42e8dcd11c7e |
| files | hotspot/src/share/vm/c1/c1_Compilation.cpp hotspot/src/share/vm/c1/c1_Compilation.hpp hotspot/src/share/vm/ci/ciEnv.cpp hotspot/src/share/vm/ci/ciEnv.hpp hotspot/src/share/vm/compiler/compileBroker.cpp hotspot/src/share/vm/opto/compile.cpp |
| diffstat | 6 files changed, 11 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/share/vm/c1/c1_Compilation.cpp Mon Jan 18 11:02:42 2016 +0100 +++ b/hotspot/src/share/vm/c1/c1_Compilation.cpp Mon Jan 18 11:07:40 2016 -0800 @@ -420,8 +420,7 @@ implicit_exception_table(), compiler(), has_unsafe_access(), - SharedRuntime::is_wide_vector(max_vector_size()), - directive() + SharedRuntime::is_wide_vector(max_vector_size()) ); }
--- a/hotspot/src/share/vm/c1/c1_Compilation.hpp Mon Jan 18 11:02:42 2016 +0100 +++ b/hotspot/src/share/vm/c1/c1_Compilation.hpp Mon Jan 18 11:07:40 2016 -0800 @@ -28,6 +28,7 @@ #include "ci/ciEnv.hpp" #include "ci/ciMethodData.hpp" #include "code/exceptionHandlerTable.hpp" +#include "compiler/compilerDirectives.hpp" #include "memory/resourceArea.hpp" #include "runtime/deoptimization.hpp"
--- a/hotspot/src/share/vm/ci/ciEnv.cpp Mon Jan 18 11:02:42 2016 +0100 +++ b/hotspot/src/share/vm/ci/ciEnv.cpp Mon Jan 18 11:07:40 2016 -0800 @@ -38,7 +38,6 @@ #include "code/scopeDesc.hpp" #include "compiler/compileBroker.hpp" #include "compiler/compileLog.hpp" -#include "compiler/compilerDirectives.hpp" #include "compiler/disassembler.hpp" #include "gc/shared/collectedHeap.inline.hpp" #include "interpreter/linkResolver.hpp" @@ -959,7 +958,6 @@ AbstractCompiler* compiler, bool has_unsafe_access, bool has_wide_vectors, - DirectiveSet* directives, RTMState rtm_state) { VM_ENTRY_MARK; nmethod* nm = NULL; @@ -1041,11 +1039,6 @@ code_buffer->free_blob(); if (nm != NULL) { - bool printnmethods = directives->PrintAssemblyOption || directives->PrintNMethodsOption; - if (printnmethods || PrintDebugInfo || PrintRelocations || PrintDependencies || PrintExceptionHandlers) { - nm->print_nmethod(printnmethods); - } - nm->set_has_unsafe_access(has_unsafe_access); nm->set_has_wide_vectors(has_wide_vectors); #if INCLUDE_RTM_OPT
--- a/hotspot/src/share/vm/ci/ciEnv.hpp Mon Jan 18 11:02:42 2016 +0100 +++ b/hotspot/src/share/vm/ci/ciEnv.hpp Mon Jan 18 11:07:40 2016 -0800 @@ -32,11 +32,9 @@ #include "code/dependencies.hpp" #include "code/exceptionHandlerTable.hpp" #include "compiler/oopMap.hpp" -#include "compiler/compilerDirectives.hpp" #include "runtime/thread.hpp" class CompileTask; -class DirectiveSet; // ciEnv // @@ -372,7 +370,6 @@ AbstractCompiler* compiler, bool has_unsafe_access, bool has_wide_vectors, - DirectiveSet* directives, RTMState rtm_state = NoRTM);
--- a/hotspot/src/share/vm/compiler/compileBroker.cpp Mon Jan 18 11:02:42 2016 +0100 +++ b/hotspot/src/share/vm/compiler/compileBroker.cpp Mon Jan 18 11:07:40 2016 -0800 @@ -1884,7 +1884,6 @@ post_compile(thread, task, event, !ci_env.failing(), &ci_env); } - DirectivesStack::release(directive); pop_jni_handle_block(); methodHandle method(thread, task->method()); @@ -1893,6 +1892,15 @@ collect_statistics(thread, time, task); + bool printnmethods = directive->PrintAssemblyOption || directive->PrintNMethodsOption; + if (printnmethods || PrintDebugInfo || PrintRelocations || PrintDependencies || PrintExceptionHandlers) { + nmethod* nm = task->code(); + if (nm != NULL) { + nm->print_nmethod(printnmethods); + } + } + DirectivesStack::release(directive); + if (PrintCompilation && PrintCompilation2) { tty->print("%7d ", (int) tty->time_stamp().milliseconds()); // print timestamp tty->print("%4d ", compile_id); // print compilation number