From ef0d0a7092df7b3ce098fb25860fb839fd34c944 Mon Sep 17 00:00:00 2001 From: Axel Boldt-Christmas Date: Wed, 1 Feb 2023 09:47:15 +0000 Subject: [PATCH] 8301402: os::print_location gets is_global_handle assert Reviewed-by: coleenp, dholmes --- src/hotspot/share/runtime/jniHandles.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/hotspot/share/runtime/jniHandles.cpp b/src/hotspot/share/runtime/jniHandles.cpp index 29c57bb1ac9..bf7f0bc300d 100644 --- a/src/hotspot/share/runtime/jniHandles.cpp +++ b/src/hotspot/share/runtime/jniHandles.cpp @@ -242,15 +242,13 @@ bool JNIHandles::is_frame_handle(JavaThread* thr, jobject handle) { bool JNIHandles::is_global_handle(jobject handle) { assert(handle != nullptr, "precondition"); - assert(!is_global_tagged(handle) || is_storage_handle(global_handles(), global_ptr(handle)), "invalid storage"); - return is_global_tagged(handle); + return is_global_tagged(handle) && is_storage_handle(global_handles(), global_ptr(handle)); } bool JNIHandles::is_weak_global_handle(jobject handle) { assert(handle != nullptr, "precondition"); - assert(!is_weak_global_tagged(handle) || is_storage_handle(weak_global_handles(), weak_global_ptr(handle)), "invalid storage"); - return is_weak_global_tagged(handle); + return is_weak_global_tagged(handle) && is_storage_handle(weak_global_handles(), weak_global_ptr(handle)); } // We assume this is called at a safepoint: no lock is needed.