Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix JITServer init bug #7599

Merged
merged 2 commits into from Oct 28, 2019
Merged

Fix JITServer init bug #7599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a662b2
Fix JITServer init bug
harryyu1994 Oct 25, 2019
a17d6f6
Replace J9_CLASS_FROM_CP with getClassFromCP API
harryyu1994 Oct 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions runtime/compiler/control/HookedByTheJit.cpp
View file
Open in desktop
Expand Up @@ -7167,13 +7167,13 @@ int32_t setUpHooks(J9JavaVM * javaVM, J9JITConfig * jitConfig, TR_FrontEnd * vm)
// free `statsThreadObj` and set the corresponding jitConfig field to NULL
}
}
}

// Give the JIT a chance to do stuff after the VM is initialized
if ((*vmHooks)->J9HookRegisterWithCallSite(vmHooks, J9HOOK_VM_INITIALIZED, jitHookVMInitialized, OMR_GET_CALLSITE(), NULL))
{
j9tty_printf(PORTLIB, "Error: Unable to install J9HOOK_VM_INITIALIZED\n");
return -1;
// Give the JIT a chance to do stuff after the VM is initialized
if ((*vmHooks)->J9HookRegisterWithCallSite(vmHooks, J9HOOK_VM_INITIALIZED, jitHookVMInitialized, OMR_GET_CALLSITE(), NULL))
{
j9tty_printf(PORTLIB, "Error: Unable to install J9HOOK_VM_INITIALIZED\n");
return -1;
}
}
#endif // JITSERVER_SUPPORT

Expand Down
2 changes: 1 addition & 1 deletion runtime/compiler/runtime/SymbolValidationManager.cpp
View file
Open in desktop
Expand Up @@ -722,7 +722,7 @@ TR::SymbolValidationManager::addDefiningClassFromCPRecord(TR_OpaqueClassBlock *c
bool
TR::SymbolValidationManager::addStaticClassFromCPRecord(TR_OpaqueClassBlock *clazz, J9ConstantPool *constantPoolOfBeholder, uint32_t cpIndex)
{
TR_OpaqueClassBlock *beholder = reinterpret_cast<TR_OpaqueClassBlock *>(J9_CLASS_FROM_CP(constantPoolOfBeholder));
TR_OpaqueClassBlock *beholder = _fej9->getClassFromCP(constantPoolOfBeholder);
SVM_ASSERT_ALREADY_VALIDATED(this, beholder);
if (skipFieldRefClassRecord(clazz, beholder, cpIndex))
return true;
Expand Down