Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: eclipse-openj9/openj9
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2d0e38eaaab8727d813c608960cf357103c5f27d
Choose a base ref
..
head repository: eclipse-openj9/openj9
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a0489793a5a4f22c388c3c418ac7eb6167f55191
Choose a head ref
Showing with 2 additions and 3 deletions.
  1. +2 −3 runtime/jvmti/jvmtiStartup.c
5 changes: 2 additions & 3 deletions runtime/jvmti/jvmtiStartup.c
View file
Original file line number Diff line number Diff line change
@@ -473,8 +473,7 @@ IDATA J9VMDllMain(J9JavaVM *vm, IDATA stage, void *reserved)
/* The isDebugEventOrFlagEnabled calculation matches a part of J9::Options::isFSDNeeded()
* in compiler/control/J9Options.cpp.
*/
BOOLEAN isDebugEventOrFlagEnabled =
J9_EVENT_IS_HOOKED_OR_RESERVED(vm->hookInterface, J9HOOK_VM_BREAKPOINT)
BOOLEAN isDebugEventOrFlagEnabled = J9_EVENT_IS_HOOKED_OR_RESERVED(vm->hookInterface, J9HOOK_VM_BREAKPOINT)
|| J9_EVENT_IS_HOOKED_OR_RESERVED(vm->hookInterface, J9HOOK_VM_FRAME_POP)
|| J9_EVENT_IS_HOOKED_OR_RESERVED(vm->hookInterface, J9HOOK_VM_FRAME_POPPED)
|| J9_EVENT_IS_HOOKED_OR_RESERVED(vm->hookInterface, J9HOOK_VM_GET_FIELD)
@@ -492,7 +491,7 @@ IDATA J9VMDllMain(J9JavaVM *vm, IDATA stage, void *reserved)
BOOLEAN isDebugOnRestoreEnabled = !isDebugEventOrFlagEnabled
&& J9_ARE_ALL_BITS_SET(vm->checkpointState.flags, J9VM_CRIU_SUPPORT_DEBUG_ON_RESTORE)
&& vmFuncs->isCRaCorCRIUSupportEnabled(vm);

if (isDebugOnRestoreEnabled) {
J9HookInterface ** vmHook = vmFuncs->getVMHookInterface(vm);
if ((*vmHook)->J9HookRegisterWithCallSite(vmHook, J9HOOK_TAG_AGENT_ID | J9HOOK_VM_PREPARING_FOR_RESTORE, jvmtiHookVMRestoreCRIUInit, OMR_GET_CALLSITE(), jvmtiData, J9HOOK_AGENTID_FIRST)) {