8264732: Clean up LinkResolver::vtable_index_of_interface_method() #3346

iwanowww · 2021-04-05T18:01:15Z

Turn resolved_method parameter into raw Method*.

Testing:

hs-tier1 - hs-tier6

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8264732: Clean up LinkResolver::vtable_index_of_interface_method()

Reviewers

Lois Foltan (@lfoltan - Reviewer) ⚠️ Review applies to 89e0b67
Coleen Phillimore (@coleenp - Reviewer) ⚠️ Review applies to a2bf479
David Holmes (@dholmes-ora - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3346/head:pull/3346
$ git checkout pull/3346

Update a local copy of the PR:
$ git checkout pull/3346
$ git pull https://git.openjdk.java.net/jdk pull/3346/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3346

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3346.diff

bridgekeeper · 2021-04-05T18:02:25Z

👋 Welcome back vlivanov! 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 · 2021-04-05T18:04:01Z

@iwanowww
The hotspot-runtime label was successfully added.

mlbridge · 2021-04-05T18:12:37Z

Webrevs

lfoltan

Looks good to me.
Lois

openjdk · 2021-04-05T18:35:13Z

@iwanowww This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8264732: Clean up LinkResolver::vtable_index_of_interface_method()

Reviewed-by: lfoltan, coleenp, dholmes

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 18 new commits pushed to the master branch:

57f1e7d: 8264696: Multi-catch clause causes compiler exception because it uses the package-private supertype
3d2b4cc: 8264864: Multiple byte tag not supported by ASN.1 encoding
ccefa5e: 8261625: Add Elements.isAutomaticModule(ModuleElement)
8a23580: 8264428: Cleanup usages of StringBuffer in java.desktop
308f679: 8264454: Jaxp unit test from open jdk needs to be improved
5bd6c74: 8236127: Use value of --icon CLI option to set icon for exe installers
81d35e4: 8264063: Outer Safepoint poll load should not reference the head of inner strip mined loop.
04fa1ed: 8264848: [macos] libjvm.dylib linker warning due to macOS version mismatch
214d6e2: 8263506: Make sun.net.httpserver.UnmodifiableHeaders unmodifiable
af13c64: 8264711: More runtime TRAPS cleanups
... and 8 more: https://git.openjdk.java.net/jdk/compare/6e2b82a45f2f86c45fe62dcc6cf5cb979b8a5366...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

coleenp · 2021-04-05T19:09:21Z

src/hotspot/share/jvmci/jvmciCompilerToVM.cpp

@@ -728,7 +728,7 @@ C2V_END

 C2V_VMENTRY_0(jint, getVtableIndexForInterfaceMethod, (JNIEnv* env, jobject, jobject jvmci_type, jobject jvmci_method))
  Klass* klass = JVMCIENV->asKlass(jvmci_type);
-  methodHandle method(THREAD, JVMCIENV->asMethod(jvmci_method));
+  Method* method = JVMCIENV->asMethod(jvmci_method);


The reason that resolved_method was a methodHandle is in case of redefinition, we need to know if code is referring to this version of the method so that it's not deallocated. It's enough for one of the callers to create a methodHandle but passing the methodHandle will guarantee it. I'm not sure why you needed to make this change.

I refactored getVtableIndexForInterfaceMethod and kept the handle in place while dereferencing it when passing into vtable_index_of_interface_method. Does it look better now?

Ok, this is fine. Be careful if you have new callers for this function.

dholmes-ora

Seems quite reasonable - though unsure of the motivation.

Do we need a NoSafepointVerifier in LinkResolver::vtable_index_of_interface_method to ensure the raw Method* remains valid?

Thanks,
David

openjdk · 2021-04-07T21:40:50Z

@iwanowww this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8264732.vtable_index_of_interface_method
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

iwanowww · 2021-04-07T21:44:42Z

Thinking more about it, methodHandle does look more natural than a raw Method* on LinkResolver.

What do you think about leaving LinkResolver as it is now and move vtable_index_of_interface_method implementation to InstanceKlass instead?

coleenp · 2021-04-07T23:00:46Z

src/hotspot/share/oops/instanceKlass.cpp

+
+  // First check in default method array
+  if (!intf_method->is_abstract() && this->default_methods() != NULL) {
+    int index = InstanceKlass::find_method_index(this->default_methods(),


Yes, please, this looks a lot better! Then linkResolver can deal with methodHandle consistently so it doesn't go away with redefinition, and this function is nice here with the other like functions.
It doesn't need InstanceKlass:: before find_method_index, or the this->'s.

It doesn't need InstanceKlass:: before find_method_index, or the this->'s.

Fixed. It looked clearer to me to explicitly refer to this.

dholmes-ora

Refactoring looks good.

I second Coleen's comment about unnecessary classname qualification and use of this->

Thanks,
David

iwanowww · 2021-04-08T10:31:13Z

Thanks for the reviews, Lois, Coleen, and David.

iwanowww · 2021-04-09T11:34:50Z

/integrate

openjdk · 2021-04-09T11:36:44Z

@iwanowww Since your change was applied there have been 28 commits pushed to the master branch:

b3782ea: 8264918: [JVMCI] getVtableIndexForInterfaceMethod doesn't check that type and method are related
f7a6c63: 8259822: [PPC64] Support the prefixed instruction format added in POWER10
a45733f: 8264779: Fix doclint warnings in java/nio
3e57924: 8264885: Fix the code style of macro in aarch64_neon_ad.m4
051c117: 8264923: PNGImageWriter.write_zTXt throws Exception with a typo
1c6b113: 8264513: Cleanup CardTableBarrierSetC2::post_barrier
666fd62: 8264881: Remove the old development option MemProfiling
951f277: 8264874: Build interim-langtools for HotSpot only if Graal is enabled
719f95e: 8260693: Provide the support for specifying a signer in keytool -genkeypair
77b1673: 8256245: AArch64: Implement Base64 decoding intrinsic
... and 18 more: https://git.openjdk.java.net/jdk/compare/6e2b82a45f2f86c45fe62dcc6cf5cb979b8a5366...master

Your commit was automatically rebased without conflicts.

Pushed as commit 33fa855.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

LinkResolver::vtable_index_of_interface_method

89e0b67

openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Apr 5, 2021

iwanowww marked this pull request as ready for review April 5, 2021 18:06

openjdk bot added the rfr Pull request is ready for review label Apr 5, 2021

lfoltan approved these changes Apr 5, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Apr 5, 2021

coleenp reviewed Apr 5, 2021

View reviewed changes

Revert jvmciCompilerToVM.cpp change.

a2bf479

coleenp approved these changes Apr 6, 2021

View reviewed changes

dholmes-ora approved these changes Apr 7, 2021

View reviewed changes

iwanowww and others added 2 commits April 8, 2021 00:36

Move itable_index_of_interface_method() implementation to InstanceKlass

9dfc943

Merge branch 'master' into 8264732.vtable_index_of_interface_method

b6737c1

openjdk bot added merge-conflict Pull request has merge conflict with target branch ready Pull request is ready to be integrated and removed ready Pull request is ready to be integrated merge-conflict Pull request has merge conflict with target branch labels Apr 7, 2021

coleenp reviewed Apr 7, 2021

View reviewed changes

dholmes-ora approved these changes Apr 8, 2021

View reviewed changes

InstanceKlass::method_at_itable_or_null() cleanups

b5aaf41

iwanowww mentioned this pull request Apr 8, 2021

8264918: [JVMCI] getVtableIndexForInterfaceMethod doesn't check that type and method are related #3396

Closed

4 tasks

dholmes-ora approved these changes Apr 8, 2021

View reviewed changes

openjdk bot closed this Apr 9, 2021

openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 9, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8264732: Clean up LinkResolver::vtable_index_of_interface_method() #3346

8264732: Clean up LinkResolver::vtable_index_of_interface_method() #3346

iwanowww commented Apr 5, 2021 •

edited by openjdk bot

Loading

bridgekeeper bot commented Apr 5, 2021

openjdk bot commented Apr 5, 2021

mlbridge bot commented Apr 5, 2021 •

edited

Loading

lfoltan left a comment

openjdk bot commented Apr 5, 2021 •

edited

Loading

coleenp Apr 5, 2021

iwanowww Apr 6, 2021

coleenp Apr 6, 2021

dholmes-ora left a comment

openjdk bot commented Apr 7, 2021

iwanowww commented Apr 7, 2021

coleenp Apr 7, 2021

iwanowww Apr 8, 2021

dholmes-ora left a comment

iwanowww commented Apr 8, 2021

iwanowww commented Apr 9, 2021

openjdk bot commented Apr 9, 2021

8264732: Clean up LinkResolver::vtable_index_of_interface_method() #3346

8264732: Clean up LinkResolver::vtable_index_of_interface_method() #3346

Conversation

iwanowww commented Apr 5, 2021 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Apr 5, 2021

openjdk bot commented Apr 5, 2021

mlbridge bot commented Apr 5, 2021 • edited Loading

Webrevs

lfoltan left a comment

Choose a reason for hiding this comment

openjdk bot commented Apr 5, 2021 • edited Loading

coleenp Apr 5, 2021

Choose a reason for hiding this comment

iwanowww Apr 6, 2021

Choose a reason for hiding this comment

coleenp Apr 6, 2021

Choose a reason for hiding this comment

dholmes-ora left a comment

Choose a reason for hiding this comment

openjdk bot commented Apr 7, 2021

iwanowww commented Apr 7, 2021

coleenp Apr 7, 2021

Choose a reason for hiding this comment

iwanowww Apr 8, 2021

Choose a reason for hiding this comment

dholmes-ora left a comment

Choose a reason for hiding this comment

iwanowww commented Apr 8, 2021

iwanowww commented Apr 9, 2021

openjdk bot commented Apr 9, 2021

iwanowww commented Apr 5, 2021 •

edited by openjdk bot

Loading

mlbridge bot commented Apr 5, 2021 •

edited

Loading

openjdk bot commented Apr 5, 2021 •

edited

Loading