Skip to content

Commit fda0943

Browse files
author
Harold Seigel
committed
8258839: Remove JVM option ExitVMOnVerifyError
Reviewed-by: iignatyev, dcubed, coleenp
1 parent cd94606 commit fda0943

File tree

4 files changed

+9
-25
lines changed

4 files changed

+9
-25
lines changed

src/hotspot/share/c1/c1_Runtime1.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -530,14 +530,10 @@ JRT_ENTRY_NO_ASYNC(static address, exception_handler_for_pc_helper(JavaThread* t
530530
assert(exception_frame.is_deoptimized_frame(), "must be deopted");
531531
pc = exception_frame.pc();
532532
}
533-
#ifdef ASSERT
534533
assert(exception.not_null(), "NULL exceptions should be handled by throw_exception");
535-
// Check that exception is a subclass of Throwable, otherwise we have a VerifyError
536-
if (!(exception->is_a(SystemDictionary::Throwable_klass()))) {
537-
if (ExitVMOnVerifyError) vm_exit(-1);
538-
ShouldNotReachHere();
539-
}
540-
#endif
534+
// Check that exception is a subclass of Throwable
535+
assert(exception->is_a(SystemDictionary::Throwable_klass()),
536+
"Exception not subclass of Throwable");
541537

542538
// debugging support
543539
// tracing

src/hotspot/share/interpreter/interpreterRuntime.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -490,14 +490,10 @@ JRT_ENTRY(address, InterpreterRuntime::exception_handler_for_exception(JavaThrea
490490
should_repeat = false;
491491

492492
// assertions
493-
#ifdef ASSERT
494493
assert(h_exception.not_null(), "NULL exceptions should be handled by athrow");
495-
// Check that exception is a subclass of Throwable, otherwise we have a VerifyError
496-
if (!(h_exception->is_a(SystemDictionary::Throwable_klass()))) {
497-
if (ExitVMOnVerifyError) vm_exit(-1);
498-
ShouldNotReachHere();
499-
}
500-
#endif
494+
// Check that exception is a subclass of Throwable.
495+
assert(h_exception->is_a(SystemDictionary::Throwable_klass()),
496+
"Exception not subclass of Throwable");
501497

502498
// tracing
503499
if (log_is_enabled(Info, exceptions)) {

src/hotspot/share/jvmci/jvmciRuntime.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -257,15 +257,11 @@ JRT_ENTRY_NO_ASYNC(static address, exception_handler_for_pc_helper(JavaThread* t
257257
assert(exception_frame.is_deoptimized_frame(), "must be deopted");
258258
pc = exception_frame.pc();
259259
}
260-
#ifdef ASSERT
261260
assert(exception.not_null(), "NULL exceptions should be handled by throw_exception");
262261
assert(oopDesc::is_oop(exception()), "just checking");
263-
// Check that exception is a subclass of Throwable, otherwise we have a VerifyError
264-
if (!(exception->is_a(SystemDictionary::Throwable_klass()))) {
265-
if (ExitVMOnVerifyError) vm_exit(-1);
266-
ShouldNotReachHere();
267-
}
268-
#endif
262+
// Check that exception is a subclass of Throwable
263+
assert(exception->is_a(SystemDictionary::Throwable_klass()),
264+
"Exception not subclass of Throwable");
269265

270266
// debugging support
271267
// tracing

src/hotspot/share/runtime/globals.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,10 +1143,6 @@ const intx ObjectAlignmentInBytes = 8;
11431143
notproduct(bool, PrintSymbolTableSizeHistogram, false, \
11441144
"print histogram of the symbol table") \
11451145
\
1146-
notproduct(bool, ExitVMOnVerifyError, false, \
1147-
"standard exit from VM if bytecode verify error " \
1148-
"(only in debug mode)") \
1149-
\
11501146
product(ccstr, AbortVMOnException, NULL, DIAGNOSTIC, \
11511147
"Call fatal if this exception is thrown. Example: " \
11521148
"java -XX:AbortVMOnException=java.lang.NullPointerException Foo") \

0 commit comments

Comments
 (0)