Skip to content

Adjust ObjectStreamClass Cache recomputations for ClassCache#4485

Merged
graalvmbot merged 1 commit intooracle:masterfrom
galderz:t_adjust_types_17_0_4_4477
May 9, 2022
Merged

Adjust ObjectStreamClass Cache recomputations for ClassCache#4485
graalvmbot merged 1 commit intooracle:masterfrom
galderz:t_adjust_types_17_0_4_4477

Conversation

@galderz
Copy link
Contributor

@galderz galderz commented Apr 12, 2022

Closes #4477

  • Create a new conditional option to define a boundary for the old substitutions.
  • Also add a new conditional for new substitutions.
  • Use a custom recompute to create a new instance of the anonymous inner class implementations of ClassCache.

@galderz
Copy link
Contributor Author

galderz commented Apr 13, 2022

See #4477 (comment), it also affects JDK 11. I need to adjust the conditionals to take that into account.

@galderz
Copy link
Contributor Author

galderz commented Apr 13, 2022

Updated the PR to check presence/absence of java.io.ClassCache rather than rely on JDK versions.

@galderz galderz force-pushed the t_adjust_types_17_0_4_4477 branch from 8f5a31d to f4d91fa Compare April 13, 2022 11:09
* Create a new conditional option for the presence/absence
of java.io.ClassCache.
* Use a custom recompute to create a new instance of the
anonymous inner class implementations of ClassCache.
@galderz galderz force-pushed the t_adjust_types_17_0_4_4477 branch from f4d91fa to 3f0fb41 Compare April 13, 2022 12:49
Copy link
Member

@dougxc dougxc left a comment

Choose a reason for hiding this comment

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

The changes look good to me however @christianwimmer or someone else from the SVM team should also review them.

@zakkak
Copy link
Collaborator

zakkak commented May 9, 2022

Hello @christianwimmer could someone from the SVM team please review this? It's a blocker for building Mandrel with OpenJDK 17.0.4 and 11.0.16 EA releases (see graalvm#371).

@christianwimmer
Copy link

@oubidar-Abderrahim please create the usual Oracle-internal issues and PRs so that we can merge this.

@graalvmbot graalvmbot merged commit 62af7a5 into oracle:master May 9, 2022
@zakkak
Copy link
Collaborator

zakkak commented May 10, 2022

Thank you @christianwimmer and @oubidar-Abderrahim !

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.

Type mismatch in ObjectStreamClass$Caches.localDescs with native image built with latest JDK 17

5 participants