From f7b1ce457a3ebffb1e677ff9168c2f6cf15c631e Mon Sep 17 00:00:00 2001 From: Jamsheed Mohammed C M Date: Tue, 22 Sep 2020 06:26:32 +0000 Subject: [PATCH] 8253447: Remove buggy code introduced by 8249451 Reviewed-by: iveresov, eosterlund --- src/hotspot/share/runtime/deoptimization.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp index 827e3416e8f..8c850cda39c 100644 --- a/src/hotspot/share/runtime/deoptimization.cpp +++ b/src/hotspot/share/runtime/deoptimization.cpp @@ -528,8 +528,8 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread } #endif - if ((thread->has_pending_exception() || thread->frames_to_pop_failed_realloc() > 0) && exec_mode != Unpack_uncommon_trap) { - assert(thread->has_pending_exception(), "should have thrown OOME/Async"); + if (thread->frames_to_pop_failed_realloc() > 0 && exec_mode != Unpack_uncommon_trap) { + assert(thread->has_pending_exception(), "should have thrown OOME"); thread->set_exception_oop(thread->pending_exception()); thread->clear_pending_exception(); exec_mode = Unpack_exception;