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

8147433: PrintNMethods no longer works with JVMCI

Browse Source 
Reviewed-by: kvn, twisti
This commit is contained in:
Tom Rodriguez 2016-01-18 11:07:40 -08:00
parent 40164313e3
commit 75901ea0cb
6 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hotspot/src/share/vm/c1/c1_Compilation.cpp
View File

@ -420,8 +420,7 @@ void Compilation::install_code(int frame_size) {
implicit_exception_table(), implicit_exception_table(),
compiler(), compiler(),
has_unsafe_access(), has_unsafe_access(),
SharedRuntime::is_wide_vector(max_vector_size()), SharedRuntime::is_wide_vector(max_vector_size())
directive()
); );
} }

1
hotspot/src/share/vm/c1/c1_Compilation.hpp
View File

@ -28,6 +28,7 @@
#include "ci/ciEnv.hpp" #include "ci/ciEnv.hpp"
#include "ci/ciMethodData.hpp" #include "ci/ciMethodData.hpp"
#include "code/exceptionHandlerTable.hpp" #include "code/exceptionHandlerTable.hpp"
#include "compiler/compilerDirectives.hpp"
#include "memory/resourceArea.hpp" #include "memory/resourceArea.hpp"
#include "runtime/deoptimization.hpp" #include "runtime/deoptimization.hpp"

7
hotspot/src/share/vm/ci/ciEnv.cpp
View File

@ -38,7 +38,6 @@
#include "code/scopeDesc.hpp" #include "code/scopeDesc.hpp"
#include "compiler/compileBroker.hpp" #include "compiler/compileBroker.hpp"
#include "compiler/compileLog.hpp" #include "compiler/compileLog.hpp"
#include "compiler/compilerDirectives.hpp"
#include "compiler/disassembler.hpp" #include "compiler/disassembler.hpp"
#include "gc/shared/collectedHeap.inline.hpp" #include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/linkResolver.hpp" #include "interpreter/linkResolver.hpp"
@ -959,7 +958,6 @@ void ciEnv::register_method(ciMethod* target,
AbstractCompiler* compiler, AbstractCompiler* compiler,
bool has_unsafe_access, bool has_unsafe_access,
bool has_wide_vectors, bool has_wide_vectors,
DirectiveSet* directives,
RTMState rtm_state) { RTMState rtm_state) {
VM_ENTRY_MARK; VM_ENTRY_MARK;
nmethod* nm = NULL; nmethod* nm = NULL;
@ -1041,11 +1039,6 @@ void ciEnv::register_method(ciMethod* target,
code_buffer->free_blob(); code_buffer->free_blob();
if (nm != NULL) { 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_unsafe_access(has_unsafe_access);
nm->set_has_wide_vectors(has_wide_vectors); nm->set_has_wide_vectors(has_wide_vectors);
#if INCLUDE_RTM_OPT #if INCLUDE_RTM_OPT

3
hotspot/src/share/vm/ci/ciEnv.hpp
View File

@ -32,11 +32,9 @@
#include "code/dependencies.hpp" #include "code/dependencies.hpp"
#include "code/exceptionHandlerTable.hpp" #include "code/exceptionHandlerTable.hpp"
#include "compiler/oopMap.hpp" #include "compiler/oopMap.hpp"
#include "compiler/compilerDirectives.hpp"
#include "runtime/thread.hpp" #include "runtime/thread.hpp"
class CompileTask; class CompileTask;
class DirectiveSet;
// ciEnv // ciEnv
// //
@ -372,7 +370,6 @@ public:
AbstractCompiler* compiler, AbstractCompiler* compiler,
bool has_unsafe_access, bool has_unsafe_access,
bool has_wide_vectors, bool has_wide_vectors,
DirectiveSet* directives,
RTMState rtm_state = NoRTM); RTMState rtm_state = NoRTM);

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

@ -1884,7 +1884,6 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) {
post_compile(thread, task, event, !ci_env.failing(), &ci_env); post_compile(thread, task, event, !ci_env.failing(), &ci_env);
} }
DirectivesStack::release(directive);
pop_jni_handle_block(); pop_jni_handle_block();
methodHandle method(thread, task->method()); methodHandle method(thread, task->method());
@ -1893,6 +1892,15 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) {
collect_statistics(thread, time, task); 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) { if (PrintCompilation && PrintCompilation2) {
tty->print("%7d ", (int) tty->time_stamp().milliseconds()); // print timestamp tty->print("%7d ", (int) tty->time_stamp().milliseconds()); // print timestamp
tty->print("%4d ", compile_id); // print compilation number tty->print("%4d ", compile_id); // print compilation number

1
hotspot/src/share/vm/opto/compile.cpp
View File

@ -934,7 +934,6 @@ Compile::Compile( ciEnv* ci_env, C2Compiler* compiler, ciMethod* target, int osr
compiler, compiler,
has_unsafe_access(), has_unsafe_access(),
SharedRuntime::is_wide_vector(max_vector_size()), SharedRuntime::is_wide_vector(max_vector_size()),
_directive,
rtm_state() rtm_state()
); );