8336275: Move common Method and Constructor fields to Executable #20188

liach · 2024-07-16T03:45:36Z

Move fields common to Method and Field to executable, which simplifies implementation. Removed useless transient modifiers as Method and Field were never serializable.

Note to core-libs reviewers: Please review the associated CSR on trivial removal of abstract modifier as well.

Progress

Change requires CSR request JDK-8336657 to be approved
Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed (2 reviews required, with at least 2 Reviewers)

Issues

JDK-8336275: Move common Method and Constructor fields to Executable (Enhancement - P4)
JDK-8336657: Remove abstract modifier on some Executable methods (CSR)

Reviewers

David Holmes (@dholmes-ora - Reviewer) 🔄 Re-review required (review applies to 184e8a4e)
Joe Darcy (@jddarcy - Reviewer) 🔄 Re-review required (review applies to 184e8a4e)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/20188/head:pull/20188
$ git checkout pull/20188

Update a local copy of the PR:
$ git checkout pull/20188
$ git pull https://git.openjdk.org/jdk.git pull/20188/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 20188

View PR using the GUI difftool:
$ git pr show -t 20188

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/20188.diff

Webrev

Link to Webrev Comment

bridgekeeper · 2024-07-16T03:46:07Z

👋 Welcome back liach! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2024-07-16T03:46:33Z

@liach This change is no longer ready for integration - check the PR body for details.

openjdk · 2024-07-16T03:47:07Z

@liach The following labels will be automatically applied to this pull request:

core-libs
hotspot

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

mlbridge · 2024-07-16T03:50:16Z

Webrevs

dholmes-ora · 2024-07-16T21:55:02Z

Move fields common to Method and Field to executable

s/Field/Constructor

I was a bit confused about executable fields for a moment. :)

dholmes-ora

Hotspot changes look good. Core-libs do too but I will leave that for libs folk to approve

src/java.base/share/classes/java/lang/reflect/Executable.java

src/java.base/share/classes/java/lang/reflect/Method.java

dholmes-ora · 2024-07-16T22:26:38Z

/reviewers 2

openjdk · 2024-07-16T22:27:44Z

@dholmes-ora
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 1 Reviewer, 1 Author).

liach · 2024-07-17T02:58:41Z

/reviewers 2 reviewer

openjdk · 2024-07-17T02:59:49Z

@liach
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 2 Reviewers).

liach · 2024-07-17T16:15:18Z

Just noted that I removed some abstract flags from Executable methods, which requires a CSR archive entry.

…executable-inline

bridgekeeper · 2024-08-14T16:16:47Z

@liach This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

jddarcy

Catching up on reviews, core libs changes look fine. Since Executable is sealed with Constructor and Executable on its permits lists, moving methods up and down the hierarchy (as long as there are concrete methods on Constructor and Method) is fine.

liach · 2024-08-20T04:11:51Z

Can anyone review the associated csr?

…executable-inline

coleenp · 2024-08-21T16:38:40Z

src/hotspot/share/classfile/javaClasses.cpp

+Handle java_lang_reflect_Constructor::create(TRAPS) {
+ assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
+ Klass* k = vmClasses::reflect_Constructor_klass();
+ InstanceKlass* ik = InstanceKlass::cast(k);


This doesn't need a cast because vmClasses returns InstanceKlass.

coleenp · 2024-08-21T16:40:49Z

src/hotspot/share/classfile/javaClasses.cpp

+#define METHOD_FIELDS_DO(macro) \
+ macro(_name_offset, k, vmSymbols::name_name(), string_signature, false); \
+ macro(_returnType_offset, k, vmSymbols::returnType_name(), class_signature, false); \
+ macro(_annotation_default_offset, k, vmSymbols::annotation_default_name(), byte_array_signature, false);


Can you re-align these since you modified them?

coleenp · 2024-08-21T16:41:37Z

src/hotspot/share/classfile/javaClasses.cpp

-
-void java_lang_reflect_Constructor::set_parameter_types(oop constructor, oop value) {
- constructor->obj_field_put(_parameterTypes_offset, value);
+ Klass* klass = vmClasses::reflect_Method_klass();


This also does not need a cast, vmClasses::reflect_Method_klass() returns an InstanceKlass.

coleenp

The hotspot code looks okay, but I have a couple of small cleanup requests in the changes.

liach · 2024-09-06T16:08:48Z

The new model here may no longer be valid now that deconstructors and patterns are being added. May revisit only if we are sure of the new model of deconstructors.

Inline some common ctor + method fields to executable

dbe59a5

openjdk bot added the rfr Pull request is ready for review label Jul 16, 2024

openjdk bot added hotspot [email protected] core-libs [email protected] labels Jul 16, 2024

dholmes-ora approved these changes Jul 16, 2024

View reviewed changes

src/java.base/share/classes/java/lang/reflect/Executable.java Outdated Show resolved Hide resolved

src/java.base/share/classes/java/lang/reflect/Method.java Outdated Show resolved Hide resolved

openjdk bot added the ready Pull request is ready to be integrated label Jul 16, 2024

openjdk bot removed the ready Pull request is ready to be integrated label Jul 16, 2024

Redundant transient; Update the comments to be more accurate

184e8a4

dholmes-ora approved these changes Jul 17, 2024

View reviewed changes

openjdk bot added the csr Pull request needs approved CSR before integration label Jul 17, 2024

Merge branch 'master' of https://github.com/openjdk/jdk into feature/…

b874292

…executable-inline

jddarcy approved these changes Aug 20, 2024

View reviewed changes

liach added 2 commits August 21, 2024 09:59

Merge branch 'master' of https://github.com/openjdk/jdk into feature/…

b93339f

…executable-inline

Fix after merge

9993a5d

coleenp reviewed Aug 21, 2024

View reviewed changes

coleenp suggested changes Aug 21, 2024

View reviewed changes

liach closed this Sep 6, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8336275: Move common Method and Constructor fields to Executable #20188

8336275: Move common Method and Constructor fields to Executable #20188

liach commented Jul 16, 2024 •

edited by openjdk bot

Loading

bridgekeeper bot commented Jul 16, 2024

openjdk bot commented Jul 16, 2024 •

edited

Loading

openjdk bot commented Jul 16, 2024

mlbridge bot commented Jul 16, 2024 •

edited

Loading

dholmes-ora commented Jul 16, 2024

dholmes-ora left a comment

dholmes-ora commented Jul 16, 2024

openjdk bot commented Jul 16, 2024

liach commented Jul 17, 2024

openjdk bot commented Jul 17, 2024

liach commented Jul 17, 2024

bridgekeeper bot commented Aug 14, 2024

jddarcy left a comment

liach commented Aug 20, 2024

coleenp Aug 21, 2024

coleenp Aug 21, 2024

coleenp Aug 21, 2024

coleenp left a comment

liach commented Sep 6, 2024

8336275: Move common Method and Constructor fields to Executable #20188

8336275: Move common Method and Constructor fields to Executable #20188

Conversation

liach commented Jul 16, 2024 • edited by openjdk bot Loading

Progress

Issues

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Jul 16, 2024

openjdk bot commented Jul 16, 2024 • edited Loading

openjdk bot commented Jul 16, 2024

mlbridge bot commented Jul 16, 2024 • edited Loading

Webrevs

dholmes-ora commented Jul 16, 2024

dholmes-ora left a comment

Choose a reason for hiding this comment

dholmes-ora commented Jul 16, 2024

openjdk bot commented Jul 16, 2024

liach commented Jul 17, 2024

openjdk bot commented Jul 17, 2024

liach commented Jul 17, 2024

bridgekeeper bot commented Aug 14, 2024

jddarcy left a comment

Choose a reason for hiding this comment

liach commented Aug 20, 2024

coleenp Aug 21, 2024

Choose a reason for hiding this comment

coleenp Aug 21, 2024

Choose a reason for hiding this comment

coleenp Aug 21, 2024

Choose a reason for hiding this comment

coleenp left a comment

Choose a reason for hiding this comment

liach commented Sep 6, 2024

liach commented Jul 16, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Jul 16, 2024 •

edited

Loading

mlbridge bot commented Jul 16, 2024 •

edited

Loading