archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8191333: Zero variant broken after 8189941

Browse source 
Reviewed-by: rehn, coleenp
This commit is contained in:
John Paul Adrian Glaubitz 2017-11-15 16:03:56 +01:00
parent 09a9ab8f41
commit 09dca4ba54
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/hotspot/cpu/zero/cppInterpreter_zero.cpp
View file

@ -379,7 +379,7 @@ int CppInterpreter::native_entry(Method* method, intptr_t UNUSED, TRAPS) {
// Handle safepoint operations, pending suspend requests, // Handle safepoint operations, pending suspend requests,
// and pending asynchronous exceptions. // and pending asynchronous exceptions.
if (SafepointSynchronize::do_call_back() || if (SafepointMechanism::poll(thread) ||
thread->has_special_condition_for_native_trans()) { thread->has_special_condition_for_native_trans()) {
JavaThread::check_special_condition_for_native_trans(thread); JavaThread::check_special_condition_for_native_trans(thread);
CHECK_UNHANDLED_OOPS_ONLY(thread->clear_unhandled_oops()); CHECK_UNHANDLED_OOPS_ONLY(thread->clear_unhandled_oops());
@ -511,7 +511,7 @@ int CppInterpreter::accessor_entry(Method* method, intptr_t UNUSED, TRAPS) {
intptr_t *locals = stack->sp(); intptr_t *locals = stack->sp();
// Drop into the slow path if we need a safepoint check // Drop into the slow path if we need a safepoint check
if (SafepointSynchronize::do_call_back()) { if (SafepointMechanism::poll(THREAD)) {
return normal_entry(method, 0, THREAD); return normal_entry(method, 0, THREAD);
} }
@ -643,7 +643,7 @@ int CppInterpreter::empty_entry(Method* method, intptr_t UNUSED, TRAPS) {
ZeroStack *stack = thread->zero_stack(); ZeroStack *stack = thread->zero_stack();
// Drop into the slow path if we need a safepoint check // Drop into the slow path if we need a safepoint check
if (SafepointSynchronize::do_call_back()) { if (SafepointMechanism::poll(THREAD)) {
return normal_entry(method, 0, THREAD); return normal_entry(method, 0, THREAD);
} }

10
src/hotspot/share/interpreter/bytecodeInterpreter.cpp
View file

@ -99,12 +99,10 @@
in relation to a safepoint. in relation to a safepoint.
*/ */
#define SAFEPOINT \ #define SAFEPOINT \
if ( SafepointSynchronize::is_synchronizing()) { \ { \
{ \ /* zap freed handles rather than GC'ing them */ \
/* zap freed handles rather than GC'ing them */ \ HandleMarkCleaner __hmc(THREAD); \
HandleMarkCleaner __hmc(THREAD); \ CALL_VM(SafepointMechanism::block_if_requested(THREAD), handle_exception); \
} \
CALL_VM(SafepointSynchronize::block(THREAD), handle_exception); \
} }
/* /*