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.

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

OpenJ9 JIT changes to support OMR FrontEnd base class refactoring #20571

Merged
merged 1 commit into from
Dec 2, 2024

Conversation

0xdaryl
Copy link
Contributor

@0xdaryl 0xdaryl commented Nov 12, 2024

Breaking dependence on eclipse-omr/omr#7540 due to file changes.

@0xdaryl
Copy link
Contributor Author

0xdaryl commented Nov 13, 2024

Jenkins test sanity.functional,sanity.openjdk xlinux,plinux,zlinux,alinux jdk21 depends eclipse-omr/omr#7540

This was tested internally across platform, but just doing a quick sniff test here in the PR prior to review.

@0xdaryl
Copy link
Contributor Author

0xdaryl commented Nov 13, 2024

Z OpenJDK failure appears to be #17955.

@0xdaryl 0xdaryl marked this pull request as ready for review November 13, 2024 19:22
@0xdaryl
Copy link
Contributor Author

0xdaryl commented Nov 13, 2024

@mstoodle : I'd appreciate a review from you on this

@dsouzai : I'd like a review from you too, and ask that you drive the eventual coordinated merge when it is ready.

Copy link
Contributor

@dsouzai dsouzai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look fine given the OMR changes it depends on.

@0xdaryl
Copy link
Contributor Author

0xdaryl commented Nov 28, 2024

Jenkins test sanity.functional xlinux,plinux,zlinux,alinux jdk21 depends eclipse-omr/omr#7540

@0xdaryl
Copy link
Contributor Author

0xdaryl commented Nov 29, 2024

@dsouzai : The subset of sanity acceptance testing passed, as well as an internal build on SDK8 that included 32-bit testing. Could you merge the two PRs if you are satisfied please?

Copy link
Contributor

@mstoodle mstoodle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm! Thanks @0xdaryl !

#include "codegen/CodeGenerator.hpp"
#if defined(J9VM_OPT_JITSERVER)
#include "control/CompilationRuntime.hpp"
#include "control/CompilationThread.hpp"
#include "runtime/JITClientSession.hpp"
#endif /* defined(J9VM_OPT_JITSERVER) */

// This is a workaround to avoid J9_PROJECT_SPECIFIC macros in x/env/OMRCPU.cpp
// Without this definition, we get an undefined symbol of JITConfig::instance() at runtime
TR::JitConfig * TR::JitConfig::instance() { return NULL; }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one always annoyed me. Glad to see we're finally getting rid of it :) .

@dsouzai dsouzai merged commit 25be1e9 into eclipse-openj9:master Dec 2, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants