8268192: LambdaMetafactory with invokespecial causes VerificationError #4403

dansmithcode · 2021-06-07T23:58:44Z

Small bug fix.

Progress

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

Issue

JDK-8268192: LambdaMetafactory with invokespecial causes VerificationError

Reviewers

Paul Sandoz (@PaulSandoz - Reviewer)
Mandy Chung (@mlchung - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4403

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

Using diff file

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

bridgekeeper · 2021-06-07T23:59:25Z

👋 Welcome back dlsmith! 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-06-08T00:01:09Z

⚠️ @dansmithcode This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

openjdk · 2021-06-08T00:01:58Z

@dansmithcode The following label will be automatically applied to this pull request:

core-libs

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

mlbridge · 2021-06-08T00:06:37Z

Webrevs

01: Full - Incremental (149fb55b)
00: Full (74c346a1)

liach · 2021-06-08T02:23:09Z

src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java

+        // generating bridges in the target class)
+        useImplMethodHandle = (Modifier.isProtected(implInfo.getModifiers()) &&
+                               !VerifyAccess.isSamePackage(implClass, implInfo.getDeclaringClass())) ||
+                               implKind == H_INVOKESPECIAL;


Won't this make regular private instance method calls use condy as well, as they are invokespecial?

See this code from the AbstractValidatingLambdaMetafactory constructor:

case REF_invokeSpecial: // JDK-8172817: should use referenced class here, but we don't know what it was this.implClass = implInfo.getDeclaringClass(); this.implIsInstanceMethod = true; // Classes compiled prior to dynamic nestmate support invokes a private instance // method with REF_invokeSpecial. // // invokespecial should only be used to invoke private nestmate constructors. // The lambda proxy class will be defined as a nestmate of targetClass. // If the method to be invoked is an instance method of targetClass, then // convert to use invokevirtual or invokeinterface. if (targetClass == implClass && !implInfo.getName().equals("<init>")) { this.implKind = implClass.isInterface() ? REF_invokeInterface : REF_invokeVirtual; } else { this.implKind = REF_invokeSpecial; } break;

We turn all same-class invocations into invokevirtual. (And all <init> invocations have kind newInvokeSpecial, mentioning them here is actually useless.)

Actually, I think I'll fix up this code and the comment...

dansmithcode · 2021-06-08T00:01:15Z

src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java

+        // to pass the live implementation method handle to the proxy class
+        // to invoke directly. (javac prefers to avoid this situation by
+        // generating bridges in the target class)
+        useImplMethodHandle = (Modifier.isProtected(implInfo.getModifiers()) &&


Switched from !Modifier.isPublic to Modifier.isProtected. Access errors from the caller Lookup should already be caught by validation when the implementation is cracked. Protected and super calls are the only cases where the access from the nestmate is not equivalent.

dansmithcode · 2021-06-08T15:17:44Z

src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java

+        // generating bridges in the target class)
+        useImplMethodHandle = (Modifier.isProtected(implInfo.getModifiers()) &&
+                               !VerifyAccess.isSamePackage(implClass, implInfo.getDeclaringClass())) ||
+                               implKind == H_INVOKESPECIAL;


See this code from the AbstractValidatingLambdaMetafactory constructor:

case REF_invokeSpecial: // JDK-8172817: should use referenced class here, but we don't know what it was this.implClass = implInfo.getDeclaringClass(); this.implIsInstanceMethod = true; // Classes compiled prior to dynamic nestmate support invokes a private instance // method with REF_invokeSpecial. // // invokespecial should only be used to invoke private nestmate constructors. // The lambda proxy class will be defined as a nestmate of targetClass. // If the method to be invoked is an instance method of targetClass, then // convert to use invokevirtual or invokeinterface. if (targetClass == implClass && !implInfo.getName().equals("<init>")) { this.implKind = implClass.isInterface() ? REF_invokeInterface : REF_invokeVirtual; } else { this.implKind = REF_invokeSpecial; } break;

We turn all same-class invocations into invokevirtual. (And all <init> invocations have kind newInvokeSpecial, mentioning them here is actually useless.)

dansmithcode · 2021-06-08T15:24:35Z

src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java

+        // generating bridges in the target class)
+        useImplMethodHandle = (Modifier.isProtected(implInfo.getModifiers()) &&
+                               !VerifyAccess.isSamePackage(implClass, implInfo.getDeclaringClass())) ||
+                               implKind == H_INVOKESPECIAL;


Actually, I think I'll fix up this code and the comment...

dansmithcode · 2021-06-08T15:25:41Z

src/java.base/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java

+                // Classes compiled prior to dynamic nestmate support invoke a private instance
+                // method with REF_invokeSpecial. Newer classes use REF_invokeVirtual or
+                // REF_invokeInterface, and we can use that instruction in the lambda class.
+                if (targetClass == implClass) {


The name <init> can't appear here. It's only used by newInvokeSpecial.

openjdk · 2021-06-09T22:46:23Z

@dansmithcode 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:

8268192: LambdaMetafactory with invokespecial causes VerificationError

Reviewed-by: psandoz, mchung

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 53 new commits pushed to the master branch:

b41f3f8: 8268478: JVMCI tests failing after JDK-8268052
7ff6e7b: 8267954: Shared classes that failed to load should not be loaded again
991ca14: 8267430: GraphicsDevice.setDisplayMode(REFRESH_RATE_UNKNOWN) throws IAE: Unable to set display mode!
bf29a01: 8228343: JCMD and attach fail to work across Linux Container boundary
408e0a9: 8255148: Confusing log output: SSLSocket duplex close failed
bbd0313: 8263203: jconsole Online User Guide has wrong URL
33d34c6: 8263323: Debug Agent help output includes invalid URL
79010f2: 8266835: Add a --validate option to the jar tool
db45ff0: 8268052: [JVMCI] non-default installed code must be marked as in_use
bb3d226: 8238213: Method resolution should stop on static error
... and 43 more: https://git.openjdk.java.net/jdk/compare/fc08af58cb0571ed375a7937aac7a951ba224644...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.

mlchung

Looks good to me.

dansmithcode · 2021-06-09T23:56:59Z

/integrate

openjdk · 2021-06-09T23:58:04Z

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

b41f3f8: 8268478: JVMCI tests failing after JDK-8268052
7ff6e7b: 8267954: Shared classes that failed to load should not be loaded again
991ca14: 8267430: GraphicsDevice.setDisplayMode(REFRESH_RATE_UNKNOWN) throws IAE: Unable to set display mode!
bf29a01: 8228343: JCMD and attach fail to work across Linux Container boundary
408e0a9: 8255148: Confusing log output: SSLSocket duplex close failed
bbd0313: 8263203: jconsole Online User Guide has wrong URL
33d34c6: 8263323: Debug Agent help output includes invalid URL
79010f2: 8266835: Add a --validate option to the jar tool
db45ff0: 8268052: [JVMCI] non-default installed code must be marked as in_use
bb3d226: 8238213: Method resolution should stop on static error
... and 43 more: https://git.openjdk.java.net/jdk/compare/fc08af58cb0571ed375a7937aac7a951ba224644...master

Your commit was automatically rebased without conflicts.

Pushed as commit 58ba48b.

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

Dan Smith added 17 commits September 11, 2020 14:52

8174222: LambdaMetafactory: validate inputs and improve documentation

b56fbcb

Merge branch 'master' into 8174222

67ce6d4

Fixes from merge

7c96dee

Set useImplMethodHandle for an invokespecial call

2e8b1f8

Fix compiler errors

3a9a2b6

Comment out failing test cases, will fix separately

ceb3841

Remove use of ACC_BRIDGE

81db8e5

Merge branch '8174222' into 8268192

cf240fd

Fix accidentally commented-out parts of test

4b8d0da

Merge branch '8174222' into 8268192

19e99dc

Turn back on test case that was failing

bcffd27

Address reviewer comments

b8b4ac1

Apply renamings to LambdaProxyClassArchive

c8a432a

Fix stray renaming

9d722ed

Merge branch '8174222' into 8268192

498fa43

Merge branch 'master' into 8268192

31700aa

Fix merge markup

74c346a

openjdk bot added the rfr Pull request is ready for review label Jun 8, 2021

openjdk bot added the core-libs core-libs-dev@openjdk.org label Jun 8, 2021

liach reviewed Jun 8, 2021

View reviewed changes

Clean up validation of implKind REF_invokeSpecial

149fb55

dansmithcode commented Jun 8, 2021

View reviewed changes

PaulSandoz approved these changes Jun 9, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jun 9, 2021

mlchung approved these changes Jun 9, 2021

View reviewed changes

openjdk bot closed this Jun 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 Jun 9, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8268192: LambdaMetafactory with invokespecial causes VerificationError #4403

8268192: LambdaMetafactory with invokespecial causes VerificationError #4403

dansmithcode commented Jun 7, 2021 •

edited by openjdk bot

Loading

bridgekeeper bot commented Jun 7, 2021

openjdk bot commented Jun 8, 2021

openjdk bot commented Jun 8, 2021

mlbridge bot commented Jun 8, 2021 •

edited

Loading

liach Jun 8, 2021

dansmithcode Jun 8, 2021

dansmithcode Jun 8, 2021

dansmithcode Jun 8, 2021

dansmithcode Jun 8, 2021

dansmithcode Jun 8, 2021

dansmithcode Jun 8, 2021

openjdk bot commented Jun 9, 2021 •

edited

Loading

mlchung left a comment

dansmithcode commented Jun 9, 2021

openjdk bot commented Jun 9, 2021

8268192: LambdaMetafactory with invokespecial causes VerificationError #4403

8268192: LambdaMetafactory with invokespecial causes VerificationError #4403

Conversation

dansmithcode commented Jun 7, 2021 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Jun 7, 2021

openjdk bot commented Jun 8, 2021

openjdk bot commented Jun 8, 2021

mlbridge bot commented Jun 8, 2021 • edited Loading

Webrevs

liach Jun 8, 2021

Choose a reason for hiding this comment

dansmithcode Jun 8, 2021

Choose a reason for hiding this comment

dansmithcode Jun 8, 2021

Choose a reason for hiding this comment

dansmithcode Jun 8, 2021

Choose a reason for hiding this comment

dansmithcode Jun 8, 2021

Choose a reason for hiding this comment

dansmithcode Jun 8, 2021

Choose a reason for hiding this comment

dansmithcode Jun 8, 2021

Choose a reason for hiding this comment

openjdk bot commented Jun 9, 2021 • edited Loading

mlchung left a comment

Choose a reason for hiding this comment

dansmithcode commented Jun 9, 2021

openjdk bot commented Jun 9, 2021

dansmithcode commented Jun 7, 2021 •

edited by openjdk bot

Loading

mlbridge bot commented Jun 8, 2021 •

edited

Loading

openjdk bot commented Jun 9, 2021 •

edited

Loading