8291586: Broken links in JVMTI specification

[sspitsyn]

The Loom related spec of the extension VirtualThreadMount and VirtualThreadUnmount events in the jvmti.xml is surrounded by the elements <elide> ... </elide>, so these specs have to be ignored when the jvmti.html is generated. However the jvmti.xsl which does the XSL transformation misses to do that when the description of the JVM TI capabilities is collected.

The fix is a one-liner:

diff --git a/src/hotspot/share/prims/jvmti.xsl b/src/hotspot/share/prims/jvmti.xsl
index 5ef89f91daf..d54d2a371e6 100644
--- a/src/hotspot/share/prims/jvmti.xsl
+++ b/src/hotspot/share/prims/jvmti.xsl
@@ -1172,7 +1172,7 @@ typedef struct {
     </tr>
     <xsl:for-each select="//capabilityfield">
       <xsl:variable name="capa" select="@id"/>
-      <xsl:variable name="events" select="//event[capabilities/required/@id=$capa]"/>
+      <xsl:variable name="events" select="//event[capabilities/required/@id=$capa and not(ancestor::elide)]"/>
       <xsl:if test="count($events)">
         <tr>
           <th scope="row">

The correctness verification both the generated jvmti.html and jvmti.h was checked.
TBD: mach5 sanity builds and nsk.jvmti tests runs.

---

Progress

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

Issue

• JDK-8291586: Broken links in JVMTI specification

Reviewers

• Alan Bateman (@AlanBateman - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10153

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

Using diff file

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

[bridgekeeper]

👋 Welcome back sspitsyn! 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]

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

• hotspot
• 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.

[mlbridge]

Webrevs

• 00: Full (26824725)

[AlanBateman]

not(ancestor::elide) looks right. Looks good.

[openjdk]

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

8291586: Broken links in JVMTI specification

Reviewed-by: alanb

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

• a366e82: 7113208: Incorrect javadoc on java.net.DatagramPacket.setLength()
• ac05bc8: 8293293: Move archive heap loading code out of heapShared.cpp
• e1e6732: 8293319: [C2 cleanup] Remove unused other_path arg in Parse::adjust_map_after_if
• 5757e21: 8292385: assert(ctrl == kit.control()) failed: Control flow was added although the intrinsic bailed out
• 3993a1f: 8292067: Convert test/sun/management/jmxremote/bootstrap shell tests to java version
• 83a3408: 8293315: Add back logging for Placeholders
• b6477fd: 8293288: bootcycle build failure after JDK-8173605
• 0c6094e: 8293188: x86_64: Introduce stubGenerator_x86_64.hpp
• 2baeebb: 8293006: sun/tools/jhsdb/JStackStressTest.java fails with "UnalignedAddressException: 8baadbabe"
• da99e3e: 8289400: Improve com/sun/jdi/TestScaffold error reporting
• ... and 32 more: https://git.openjdk.org/jdk/compare/12317ef7d001f5a29c731238dc06ccfd0c97f1e6...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.

[sspitsyn]

Thank you for review, Alan!

[sspitsyn]

I'm going to integrate this fix with one review as trivial.
In fact, the fix does not change anything in the implementation and behavior.
It only results in removal of a couple of unneeded links in the JVM TI spec (jvmti.html).

[sspitsyn]

/integrate

[openjdk]

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

• 32f4dc8: 8293295: Add type check asserts to java_lang_ref_Reference accessors
• e945619: 8293088: Fix compilation with the new Visual Studio preprocessor
• 730ced9: 8292660: C2: blocks made unreachable by NeverBranch-to-Goto conversion are removed incorrectly
• 3464019: 8292899: CustomTzIDCheckDST.java testcase failed on AIX platform
• e92b9e4: 8293325: Minor improvements to macos catch_mach_exception_raise() error handling
• 767262e: 8292201: serviceability/sa/ClhsdbThreadContext.java fails with "'Thread "Common-Cleaner"' missing from stdout/stderr"
• a366e82: 7113208: Incorrect javadoc on java.net.DatagramPacket.setLength()
• ac05bc8: 8293293: Move archive heap loading code out of heapShared.cpp
• e1e6732: 8293319: [C2 cleanup] Remove unused other_path arg in Parse::adjust_map_after_if
• 5757e21: 8292385: assert(ctrl == kit.control()) failed: Control flow was added although the intrinsic bailed out
• ... and 38 more: https://git.openjdk.org/jdk/compare/12317ef7d001f5a29c731238dc06ccfd0c97f1e6...master

Your commit was automatically rebased without conflicts.

[openjdk]

@sspitsyn Pushed as commit 4067321.

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