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

Revert StringConcatFactory.java commits #213

Closed

Conversation

babsingh
Copy link
Member

  • Revert "8246632: StringConcatFactory::makeConcatWithConstants ..."
  • Revert "8246152: Improve String concat bootstrapping"

The above commits are reverted because of the MethodHandle.rebind dependency which can't be supported in OpenJ9 until OpenJ9 adopts the OpenJDK MethodHandles. rebind returns a BoundMethodHandle which is not currently supported in OpenJ9.

StringConcatFactory also introduced a dependency on MethodHandle.viewAsType, which is not currently supported in OpenJ9.

Reverting the above two commits will allow us to temporarily build JDK15 with OpenJ9.

Once OpenJ9 adopts the OpenJDK MethodHandles, the above reverts can be undone.

Fixes: eclipse-openj9/openj9#9771

Signed-off-by: Babneet Singh [email protected]

babsingh added 2 commits June 16, 2020 14:07
…er throws NullPointerException when an unexpected constant is null"

This reverts commit 5aae88a.
@babsingh
Copy link
Member Author

fyi @DanHeidinga

@pshipton
Copy link
Member

pshipton commented Jun 19, 2020

@babsingh there are conflicts now.

@pshipton
Copy link
Member

If we merge these reverts, it may cause an ongoing effort to fix merge conflicts (revert more changes) as we get new changes from OpenJDK.

@babsingh
Copy link
Member Author

Closing. This PR being replaced with #215 (alternate, small patch fix).

@babsingh babsingh closed this Jun 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants