8311301: MethodExitTest may fail with stack buffer overrun

[djelinski]

Please review this test-only fix that fixes the size of variables that are used in methods that expect a pointer.

On Windows, type long is 32 bits, pointers are 64 bits large. The method GetThreadLocalStorage writes a pointer (64 bits) to the address given by its parameter, which overflows a long. The code generated by VS compiler ignores this, but the code generated by clang crashes the test.

No new tests. MethodExitTest continues to pass on supported platforms, and passes on clang+win with this fix.

---

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-8311301: MethodExitTest may fail with stack buffer overrun (Bug - P4)

Reviewers

• Kevin Walls (@kevinjwalls - Committer) ⚠️ Review applies to 0b537cb1
• David Holmes (@dholmes-ora - Reviewer)
• Chris Plummer (@plummercj - Reviewer)
• Serguei Spitsyn (@sspitsyn - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14770

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

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

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

• serviceability

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]

Webrevs

• 01: Full - Incremental (e3a71308)
• 00: Full (0b537cb1)

[kevinjwalls]

Looks good to me. 8-)

[dholmes-ora]

Why not type them void* as expected by the API, and then you can also drop the casts?

Thanks.

[djelinski]

The diff to intptr_t was an order of magnitude smaller. But I agree, the code looks better without the casts.

[openjdk]

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

8311301: MethodExitTest may fail with stack buffer overrun

Reviewed-by: kevinw, dholmes, 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 26 new commits pushed to the master branch:

• 0741cd3: 8311264: JavaDoc index comparator is not transitive
• edb2be1: 8311279: TestStressIGVNAndCCP.java failed with different IGVN traces for the same seed
• d072c40: 8311183: Remove unused mapping test files
• 66d2736: 8307526: [JFR] Better handling of tampered JFR repository
• 0616648: 8311035: CDS should not use dump time JVM narrow Klass encoding to pre-compute Klass ids
• 6eba096: 8310999: Add @SInCE info in jdk.jsobject files
• 6ebb0e3: 8311023: assert(false) failed: EA: missing memory path
• 2cffef2: 8311290: Improve java.lang.ref.Cleaner rendered documentation
• 22e17c2: 8311180: Remove unused unneeded definitions from globalDefinitions
• cf82e31: 8311077: Fix -Wconversion warnings in jvmti code
• ... and 16 more: https://git.openjdk.org/jdk/compare/8e0ca8e05c0dcf201b2ede87620c6cde79e7d550...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]

Looks good.
Thanks,
Serguei

[dholmes-ora]

Looks good albeit more extensive than I had envisaged.

Thanks.

[dholmes-ora]

Was this necessitated by the change to void*? If so I had not expected that.

[djelinski]

I guess I could have changed the logging code to use "%d", (int)(intptr_t)tls_data and call it a day, but it would be ugly.

[djelinski]

Thanks for the reviews!

/integrate

[openjdk]

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

• 0741cd3: 8311264: JavaDoc index comparator is not transitive
• edb2be1: 8311279: TestStressIGVNAndCCP.java failed with different IGVN traces for the same seed
• d072c40: 8311183: Remove unused mapping test files
• 66d2736: 8307526: [JFR] Better handling of tampered JFR repository
• 0616648: 8311035: CDS should not use dump time JVM narrow Klass encoding to pre-compute Klass ids
• 6eba096: 8310999: Add @SInCE info in jdk.jsobject files
• 6ebb0e3: 8311023: assert(false) failed: EA: missing memory path
• 2cffef2: 8311290: Improve java.lang.ref.Cleaner rendered documentation
• 22e17c2: 8311180: Remove unused unneeded definitions from globalDefinitions
• cf82e31: 8311077: Fix -Wconversion warnings in jvmti code
• ... and 16 more: https://git.openjdk.org/jdk/compare/8e0ca8e05c0dcf201b2ede87620c6cde79e7d550...master

Your commit was automatically rebased without conflicts.

[openjdk]

@djelinski Pushed as commit 3d813ae.

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