8358107: Rollback JDK-8357299 changeset

[mrserb]

The patch for JDK-8357299 does not completely fix the regression it was intended to address. Instead of bailing out on overflow, it introduces additional logic around src and clip, which might lead to attempts to draw invalid source pixels.

A test case demonstrating the issue is attached to JDK-8358103(passed on jdk22 failed on latest openjdk/jdk).

There are some unresolved discussions related to that patch, see PR. I believe it would be better to bail out early in case of overflow than risk incorrect calculations.

Therefore, I propose reverting JDK-8357299 until a proper fix is available. This approach would also simplify backports, since only the patch for JDK-8358103 would need to be backported

@prsadhuk, @prrace please take a look

---

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-8358107: Rollback JDK-8357299 changeset (Bug - P3)

Reviewers

• Prasanta Sadhukhan (@prsadhuk - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25537

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

Using diff file

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

Using Webrev

Link to Webrev Comment

[bridgekeeper]

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

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

8358107: Rollback JDK-8357299 changeset

Reviewed-by: psadhukhan

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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.

[openjdk]

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

• client

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

• 00: Full (6fc24595)

[prsadhuk]

A test case demonstrating the issue is attached to JDK-8358103(passed on jdk22 failed on latest openjdk/jdk).

I believe this new testcase is also failing with jdk24.0.1 too where UNSAFE_TO_ADD macro was added for overflow check and caused JDK-8357299 issue so both testcase is failing with jdk24.0.1 and with current fix, the older BrokenBounds.java testcase will pass in jdk25
but if you feel the earlier bailout is better than this, then it's ok.

[mrserb]

/integrate

[openjdk]

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

• 5ad02c9: 8355004: Apply java.io.Serial annotations in java.compiler
• 2926435: 8341346: Add support for exporting TLS Keying Material
• 0df8c96: 8353686: Optimize Math.cbrt for x86 64 bit platforms
• ... and 21 more: https://git.openjdk.org/jdk/compare/20005511e3612d6a5f12fa83066f02c88c628e8b...master

Your commit was automatically rebased without conflicts.

[openjdk]

@mrserb Pushed as commit d9d00d3.

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