--- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp Wed Aug 23 10:25:25 2017 +0200
+++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp Wed Aug 23 14:52:55 2017 -0400
@@ -491,7 +491,6 @@
}
#ifdef ASSERT
assert(exception.not_null(), "NULL exceptions should be handled by throw_exception");
- assert(exception->is_oop(), "just checking");
// Check that exception is a subclass of Throwable, otherwise we have a VerifyError
if (!(exception->is_a(SystemDictionary::Throwable_klass()))) {
if (ExitVMOnVerifyError) vm_exit(-1);
@@ -676,7 +675,6 @@
Atomic::inc(BiasedLocking::slow_path_entry_count_addr());
}
Handle h_obj(thread, obj);
- assert(h_obj()->is_oop(), "must be NULL or an object");
if (UseBiasedLocking) {
// Retry fast entry if bias is revoked to avoid unnecessary inflation
ObjectSynchronizer::fast_enter(h_obj, lock->lock(), true, CHECK);
@@ -701,7 +699,7 @@
EXCEPTION_MARK;
oop obj = lock->obj();
- assert(obj->is_oop(), "must be NULL or an object");
+ assert(oopDesc::is_oop(obj), "must be NULL or an object");
if (UseFastLocking) {
// When using fast locking, the compiled code has already tried the fast case
ObjectSynchronizer::slow_exit(obj, lock->lock(), THREAD);