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

8258839: Remove JVM option ExitVMOnVerifyError

Browse Source 
Reviewed-by: iignatyev, dcubed, coleenp
This commit is contained in:
Harold Seigel 2020-12-23 20:49:36 +00:00
parent cd94606c0c
commit fda0943419
4 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hotspot/share/c1/c1_Runtime1.cpp
View File

@ -530,14 +530,10 @@ JRT_ENTRY_NO_ASYNC(static address, exception_handler_for_pc_helper(JavaThread* t
assert(exception_frame.is_deoptimized_frame(), "must be deopted"); assert(exception_frame.is_deoptimized_frame(), "must be deopted");
pc = exception_frame.pc(); pc = exception_frame.pc();
} }
#ifdef ASSERT
assert(exception.not_null(), "NULL exceptions should be handled by throw_exception"); assert(exception.not_null(), "NULL exceptions should be handled by throw_exception");
// Check that exception is a subclass of Throwable, otherwise we have a VerifyError // Check that exception is a subclass of Throwable
if (!(exception->is_a(SystemDictionary::Throwable_klass()))) { assert(exception->is_a(SystemDictionary::Throwable_klass()),
if (ExitVMOnVerifyError) vm_exit(-1); "Exception not subclass of Throwable");
ShouldNotReachHere();
}
#endif
// debugging support // debugging support
// tracing // tracing

10
src/hotspot/share/interpreter/interpreterRuntime.cpp
View File

@ -490,14 +490,10 @@ JRT_ENTRY(address, InterpreterRuntime::exception_handler_for_exception(JavaThrea
should_repeat = false; should_repeat = false;
// assertions // assertions
#ifdef ASSERT
assert(h_exception.not_null(), "NULL exceptions should be handled by athrow"); assert(h_exception.not_null(), "NULL exceptions should be handled by athrow");
// Check that exception is a subclass of Throwable, otherwise we have a VerifyError // Check that exception is a subclass of Throwable.
if (!(h_exception->is_a(SystemDictionary::Throwable_klass()))) { assert(h_exception->is_a(SystemDictionary::Throwable_klass()),
if (ExitVMOnVerifyError) vm_exit(-1); "Exception not subclass of Throwable");
ShouldNotReachHere();
}
#endif
// tracing // tracing
if (log_is_enabled(Info, exceptions)) { if (log_is_enabled(Info, exceptions)) {

10
src/hotspot/share/jvmci/jvmciRuntime.cpp
View File

@ -257,15 +257,11 @@ JRT_ENTRY_NO_ASYNC(static address, exception_handler_for_pc_helper(JavaThread* t
assert(exception_frame.is_deoptimized_frame(), "must be deopted"); assert(exception_frame.is_deoptimized_frame(), "must be deopted");
pc = exception_frame.pc(); pc = exception_frame.pc();
} }
#ifdef ASSERT
assert(exception.not_null(), "NULL exceptions should be handled by throw_exception"); assert(exception.not_null(), "NULL exceptions should be handled by throw_exception");
assert(oopDesc::is_oop(exception()), "just checking"); assert(oopDesc::is_oop(exception()), "just checking");
// Check that exception is a subclass of Throwable, otherwise we have a VerifyError // Check that exception is a subclass of Throwable
if (!(exception->is_a(SystemDictionary::Throwable_klass()))) { assert(exception->is_a(SystemDictionary::Throwable_klass()),
if (ExitVMOnVerifyError) vm_exit(-1); "Exception not subclass of Throwable");
ShouldNotReachHere();
}
#endif
// debugging support // debugging support
// tracing // tracing

4
src/hotspot/share/runtime/globals.hpp
View File

@ -1143,10 +1143,6 @@ const intx ObjectAlignmentInBytes = 8;
notproduct(bool, PrintSymbolTableSizeHistogram, false, \ notproduct(bool, PrintSymbolTableSizeHistogram, false, \
"print histogram of the symbol table") \ "print histogram of the symbol table") \
\ \
notproduct(bool, ExitVMOnVerifyError, false, \
"standard exit from VM if bytecode verify error " \
"(only in debug mode)") \
\
product(ccstr, AbortVMOnException, NULL, DIAGNOSTIC, \ product(ccstr, AbortVMOnException, NULL, DIAGNOSTIC, \
"Call fatal if this exception is thrown. Example: " \ "Call fatal if this exception is thrown. Example: " \
"java -XX:AbortVMOnException=java.lang.NullPointerException Foo") \ "java -XX:AbortVMOnException=java.lang.NullPointerException Foo") \