Skip to content

Conversation

missa-prime
Copy link
Contributor

@missa-prime missa-prime commented Aug 4, 2025

This change corrects the stub id type declaration for x86_64 sinh that wasn't properly matched with the other intrinsic udpates.


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-8364666: Tier1 builds broken by JDK-8360559 (Bug - P1)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 26629

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 4, 2025

👋 Welcome back missa! 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
Copy link

openjdk bot commented Aug 4, 2025

@missa-prime 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:

8364666: Tier1 builds broken by JDK-8360559

Reviewed-by: sviswanathan

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 1 new commit pushed to the master branch:

  • dc4d9b4: 8362898: Remove finalize() methods from javax.imageio TIFF classes

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 (@sviswa7) 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).

@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 4, 2025
@openjdk
Copy link

openjdk bot commented Aug 4, 2025

@missa-prime The following label will be automatically applied to this pull request:

  • hotspot-compiler

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
Copy link

mlbridge bot commented Aug 4, 2025

Webrevs

@dholmes-ora
Copy link
Member

@missa-prime the issue JDK-8364666: is being used to backout[1] your original change due to the build breakage. A redo issue should be created and you can then apply this fix there. The fact your change does not even build indicates it also cannot have been tested and so is not ready to be integrated.

[1] https://openjdk.org/guide/#backing-out-a-change

Copy link

@sviswa7 sviswa7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 4, 2025
@dcubed-ojdk
Copy link
Member

linux-x64-debug-nopch has PASSED with @missa-prime's fix, but obviously there are many more build to go...

According to the PR for the original fix: #26152
That PR passed X64 builds in GHA. So what happened here? Was a change made
after the original testing passed?

@sviswa7
Copy link

sviswa7 commented Aug 4, 2025

linux-x64-debug-nopch has PASSED with @missa-prime's fix, but obviously there are many more build to go...

According to the PR for the original fix: #26152 That PR passed X64 builds in GHA. So what happened here? Was a change made after the original testing passed?

No, the type was changed on the tip due to another PR (JDK-8360707). Looks like that is what caused the issue.

@dcubed-ojdk
Copy link
Member

@sviswa7 so what we have here is an indirect merge collision that caused a build breakage?

@sviswa7
Copy link

sviswa7 commented Aug 4, 2025

@sviswa7 so what we have here is an indirect merge collision that caused a build breakage?

Yes, unfortunately.

@dcubed-ojdk
Copy link
Member

@missa-prime - can you please do an "/integrate delegate" so that other folks can integrate your fix if that's the way we decide to go (and all the builds pass)?

@missa-prime
Copy link
Contributor Author

missa-prime commented Aug 4, 2025

/integrate delegate

@openjdk openjdk bot added the delegated May be integrated by another Committer label Aug 4, 2025
@openjdk
Copy link

openjdk bot commented Aug 4, 2025

@missa-prime Integration of this pull request has been delegated and may be completed by any project committer using the /integrate pull request command.

@dcubed-ojdk
Copy link
Member

@missa-prime - Thanks for delegation. One windows-x64 build is still running. There's linux-x64 docs build still scheduled, but I don't think that one was affected.

@dcubed-ojdk
Copy link
Member

The Linux doc build did not run in the original failing Mach5 job sets due to a failed dependency so I should probably wait for that one just to be sure.

@dcubed-ojdk
Copy link
Member

It's taking forever for the linux-x64 build task to get scheduled. I'm going to take a risk and go ahead and integrate this one-line fix.

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 4, 2025
@openjdk
Copy link

openjdk bot commented Aug 4, 2025

@dcubed-ojdk
Your change (at version 8dad841) is now ready to be sponsored by a Committer.

@dcubed-ojdk
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 4, 2025

Going to push as commit f96b6bc.
Since your change was applied there has been 1 commit pushed to the master branch:

  • dc4d9b4: 8362898: Remove finalize() methods from javax.imageio TIFF classes

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 4, 2025
@openjdk openjdk bot closed this Aug 4, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 4, 2025
@openjdk openjdk bot removed delegated May be integrated by another Committer sponsor Pull request is ready to be sponsored labels Aug 4, 2025
@openjdk
Copy link

openjdk bot commented Aug 4, 2025

@dcubed-ojdk @missa-prime Pushed as commit f96b6bc.

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

@missa-prime missa-prime deleted the user/missa-prime/sinh branch August 4, 2025 21:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-compiler [email protected] integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants