8242152: SA does not include StackMapTables when dumping .class files #14556

quadhier · 2023-06-20T11:31:40Z

This patch adds StackMapTable for the class files generated by clhsdb's buildreplayjars command. This bug manifests itself during my diagnosing JDK-8309751 and needs to be fixed first.

I have run jtreg test tier1-3 of release build on x86 linux finding only one failure in tier2 caused by JDK-8309214. jtreg:test/hotspot/jtreg/serviceability and jtreg:test/jdk/sun/tools/ also passed.

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed (2 reviews required, with at least 1 Reviewer, 1 Author)

Issue

JDK-8242152: SA does not include StackMapTables when dumping .class files (Bug - P3)

Reviewers

Chris Plummer (@plummercj - Reviewer)
Serguei Spitsyn (@sspitsyn - Reviewer) ⚠️ Review applies to f2d2340d

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14556

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-06-20T11:32:39Z

👋 Welcome back quadhier! 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 · 2023-06-20T11:34:15Z

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

hotspot-gc
serviceability

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.

quadhier · 2023-06-20T11:35:25Z

/label remove hotspot-gc

openjdk · 2023-06-20T11:35:52Z

@quadhier
The hotspot-gc label was successfully removed.

mlbridge · 2023-06-20T11:40:16Z

Webrevs

ashu-mehra · 2023-06-20T14:02:35Z

@quadhier you beat me to this! Changes look good.

On another note since you mentioned JDK-8309751 I should let you know I have a fix for it and am planning to open a PR soon. My bad that I didn't assign that issue to myself before starting working on it.

quadhier · 2023-06-20T14:09:24Z

On another note since you mentioned JDK-8309751 I should let you know I have a fix for it and am planning to open a PR soon.

Good news! Never mind and thanks for your notice 😄.

plummercj

I made a couple of minor suggestions. Otherwise it looks good.

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstMethod.java

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java

openjdk · 2023-06-21T20:28:45Z

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

8242152: SA does not include StackMapTables when dumping .class files

Reviewed-by: cjplummer, sspitsyn

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

3661cde: 8309853: StructuredTaskScope.join description improvements
ac44ef1: 8310586: ProblemList java/lang/ScopedValue/StressStackOverflow.java#default with virtual threads on linux-all
3be50da: 8310512: Cleanup indentation in jfc files
f286e5a: 8310575: no @since for StandardDoclet
16a34e8: 8310384: Add hooks for custom image creation
226c6a0: 8309883: no @since info in com.sun.tools.javac package-info.java, Main.java
fd1163d: 8310332: Fix -Wconversion warnings in MethodData
72501cf: 8310379: Relax prerequisites for java.base-jmod target
59c6c0e: 8310335: JFR: Modernize collections and switch statements
826dcb5: 8264899: C1: -XX:AbortVMOnException does not work if all methods in the call stack are compiled with C1 and there are no exception handlers
... and 22 more: https://git.openjdk.org/jdk/compare/4ca548fe74419dc9e110489e3d2d3adf695ef37f...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@plummercj, @sspitsyn) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

sspitsyn

This looks good in general.
I've posted one nit about formatting.
What test coverage does this update have?

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java

quadhier · 2023-06-22T02:55:47Z

Thank @plummercj and @sspitsyn for your reviews!

What test coverage does this update have?

AFAICS, there are two jtreg tests for class dump — one is test/hotspot/jtreg/serviceability/sa/ClhsdbDumpclass.java and another is test/hotspot/jtreg/serviceability/sa/TestClassDump.java. The former invoke javap on the generated class file to see if it is valid class file while the later directly "invoke" sun.jvm.hotspot.tools.jcore.ClassDump to see if it runs without exception.

Maybe we could add a validation in ClhsdbDumpclass.java to ensure that the generated class file contains some StackMapTables? (As the class under validation LingeredApp should has StackMapTables for some methods.)

quadhier · 2023-06-22T02:58:13Z

/reviewers 2

openjdk · 2023-06-22T02:58:40Z

@quadhier
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).

sspitsyn · 2023-06-22T03:28:18Z

Maybe we could add a validation in ClhsdbDumpclass.java to ensure that the generated class file contains some StackMapTables? (As the class under validation LingeredApp should has StackMapTables for some methods.)

It'd be nice to add if it is not hard to do.
Thank you for the update and answer.

quadhier · 2023-06-22T03:51:40Z

A simple check has been added. For optional attributes like StackMapTable, a comprehensive check would involve comparing the original class file with the generated one. However, I believe that this deserves another PR.

FYI, jtreg:test/hotspot/jtreg/serviceability still passes.

quadhier · 2023-06-22T03:53:56Z

/integrate

openjdk · 2023-06-22T03:55:31Z

@quadhier
Your change (at version d28b785) is now ready to be sponsored by a Committer.

sspitsyn · 2023-06-22T06:43:52Z

/sponsor

openjdk · 2023-06-22T06:45:21Z

Going to push as commit 8e04702.
Since your change was applied there have been 33 commits pushed to the master branch:

3bc475e: 8309909: remove test nsk.jvmti test objmonusage006 from ProblemList-Virtual.txt
3661cde: 8309853: StructuredTaskScope.join description improvements
ac44ef1: 8310586: ProblemList java/lang/ScopedValue/StressStackOverflow.java#default with virtual threads on linux-all
3be50da: 8310512: Cleanup indentation in jfc files
f286e5a: 8310575: no @since for StandardDoclet
16a34e8: 8310384: Add hooks for custom image creation
226c6a0: 8309883: no @since info in com.sun.tools.javac package-info.java, Main.java
fd1163d: 8310332: Fix -Wconversion warnings in MethodData
72501cf: 8310379: Relax prerequisites for java.base-jmod target
59c6c0e: 8310335: JFR: Modernize collections and switch statements
... and 23 more: https://git.openjdk.org/jdk/compare/4ca548fe74419dc9e110489e3d2d3adf695ef37f...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-06-22T06:45:27Z

@sspitsyn @quadhier Pushed as commit 8e04702.

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

quadhier · 2023-06-22T07:24:36Z

On no. CI shows that my added test statement passes on Linux but fails on Windows. This is sort of wierd. Shouldn't class file format be platform agnostic? I'd take a look at it.

dholmes-ora · 2023-06-22T07:35:39Z

We see a tier1 failure on Linux-x64-debug running serviceability/sa/ClhsdbDumpclass.java

ava.lang.RuntimeException: Test ERROR java.lang.RuntimeException: 'StackMapTable:' missing from stdout/stderr
	at ClhsdbDumpclass.main(ClhsdbDumpclass.java:97)
	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
	at com.sun.javatest.regtest.agent.MainActionHelper$AgentVMRunnable.run(MainActionHelper.java:333)
	at java.base/java.lang.Thread.run(Thread.java:1570)
Caused by: java.lang.RuntimeException: 'StackMapTable:' missing from stdout/stderr
	at jdk.test.lib.process.OutputAnalyzer.shouldContain(OutputAnalyzer.java:221)
	at ClhsdbDumpclass.main(ClhsdbDumpclass.java:92)
	... 4 more

dholmes-ora · 2023-06-22T07:38:21Z

What output is the test looking for i.e why is supposed to be writing it? If it is the if (DEBUG) debugMessage(...) calls they are not enabled.

quadhier · 2023-06-22T07:39:45Z

My fault. Thanks for your reporting, David. I will look into this immediately. I didn't find that maybe because I run tests on Linux using release build.

dholmes-ora · 2023-06-22T07:41:49Z

I've filed https://bugs.openjdk.org/browse/JDK-8310618

quadhier · 2023-06-22T07:45:32Z

What output is the test looking for i.e why is supposed to be writing it? If it is the if (DEBUG) debugMessage(...) calls they are not enabled.

It is looking for StackMapTable info in the javap output.

quadhier · 2023-06-22T07:47:09Z

I've filed https://bugs.openjdk.org/browse/JDK-8310618

Thanks, David! Sorry for any inconvenience casued by that.

kevinjwalls · 2023-06-22T08:59:42Z

I see the failure too. javap needs "-v" to show the StackMap info, I see that on linux release and debug builds.

quadhier · 2023-06-22T09:01:37Z

I see the failure too. javap needs "-v" to show the StackMap info, I see that on linux release and debug builds.

Exactly! @kevinjwalls. And a situation similar to this one happen again. Thanks for your investigation. I would fix it ASAP.

dcubed-ojdk · 2023-06-22T13:44:53Z

Folks the GHA for this PR reported a failure in serviceability/sa/ClhsdbDumpclass
on windows-x64 so that should have been a red flag that something was amiss.

The actual integration reported failures on windows-x64, linux-aarch64 and linux-x64
in Mach5 Tier1. Mach5 Tier3 reports a total of 14 failures on the same three platforms.
Mach5 Tier4 reports 3 failures so far on the same three platforms.

quadhier · 2023-06-22T13:48:35Z

Hi, @dcubed-ojdk, yes, sorry for that. And it should have been fixed in this PR #14612.

Add StackMapTable for the class file generated by jhsdb

7b8a246

openjdk bot added the rfr Pull request is ready for review label Jun 20, 2023

openjdk bot added serviceability serviceability-dev@openjdk.org hotspot-gc hotspot-gc-dev@openjdk.org labels Jun 20, 2023

openjdk bot removed the hotspot-gc hotspot-gc-dev@openjdk.org label Jun 20, 2023

plummercj approved these changes Jun 21, 2023

View reviewed changes

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstMethod.java Outdated Show resolved Hide resolved

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java Outdated Show resolved Hide resolved

openjdk bot added the ready Pull request is ready to be integrated label Jun 21, 2023

sspitsyn reviewed Jun 21, 2023

View reviewed changes

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java Outdated Show resolved Hide resolved

Fix some code format issues

f2d2340

openjdk bot removed the ready Pull request is ready to be integrated label Jun 22, 2023

sspitsyn approved these changes Jun 22, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jun 22, 2023

Add a simple check

d28b785

openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 22, 2023

plummercj approved these changes Jun 22, 2023

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jun 22, 2023

openjdk bot closed this Jun 22, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Jun 22, 2023

ashu-mehra mentioned this pull request Jun 22, 2023

8309979: BootstrapMethods attribute is missing in class files recreated by SA #14495

Closed

3 tasks

wkia mentioned this pull request Sep 4, 2023

8315648: Add test for JDK-8309979 changes #15561

Closed

3 tasks

8242152: SA does not include StackMapTables when dumping .class files #14556

8242152: SA does not include StackMapTables when dumping .class files #14556

Uh oh!

Conversation

quadhier commented Jun 20, 2023 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Jun 20, 2023

Uh oh!

openjdk bot commented Jun 20, 2023

Uh oh!

quadhier commented Jun 20, 2023

Uh oh!

openjdk bot commented Jun 20, 2023

Uh oh!

mlbridge bot commented Jun 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

ashu-mehra commented Jun 20, 2023

Uh oh!

quadhier commented Jun 20, 2023

Uh oh!

plummercj left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

openjdk bot commented Jun 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sspitsyn left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

quadhier commented Jun 22, 2023

Uh oh!

quadhier commented Jun 22, 2023

Uh oh!

openjdk bot commented Jun 22, 2023

Uh oh!

sspitsyn commented Jun 22, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

quadhier commented Jun 22, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

quadhier commented Jun 22, 2023

Uh oh!

openjdk bot commented Jun 22, 2023

Uh oh!

sspitsyn commented Jun 22, 2023

Uh oh!

openjdk bot commented Jun 22, 2023

Uh oh!

openjdk bot commented Jun 22, 2023

Uh oh!

quadhier commented Jun 22, 2023

Uh oh!

dholmes-ora commented Jun 22, 2023

Uh oh!

dholmes-ora commented Jun 22, 2023

Uh oh!

quadhier commented Jun 22, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dholmes-ora commented Jun 22, 2023

Uh oh!

quadhier commented Jun 22, 2023

Uh oh!

quadhier commented Jun 22, 2023

Uh oh!

kevinjwalls commented Jun 22, 2023

Uh oh!

quadhier commented Jun 22, 2023

quadhier commented Jun 20, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Jun 20, 2023 •

edited

Loading

openjdk bot commented Jun 21, 2023 •

edited

Loading

sspitsyn commented Jun 22, 2023 •

edited

Loading

quadhier commented Jun 22, 2023 •

edited

Loading

quadhier commented Jun 22, 2023 •

edited

Loading

quadhier commented Jun 22, 2023 •

edited

Loading