Skip to content

Conversation

@rkennke
Copy link
Contributor

@rkennke rkennke commented Apr 12, 2022

In LibraryCallKit::get_state_from_digest_object() we call array_element_address() with T_INT, even though the input array might also be T_BYTE or T_LONG. This doesn't currently matter much: array elements always start at the same offset regardless of the element type. In Lilliput I'm trying to tighten the start of array elements though, and this causes problems because I can do smaller alignments for T_BYTE and T_INT, but not for T_LONG.

See also: openjdk/lilliput#41

Let's just use the correct type in array_element_address().

Testing:

  • tier1
  • jdk_security (includes relevant cipher tests)

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8284760: Correct type/array element offset in LibraryCallKit::get_state_from_digest_object()

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/8208/head:pull/8208
$ git checkout pull/8208

Update a local copy of the PR:
$ git checkout pull/8208
$ git pull https://git.openjdk.java.net/jdk pull/8208/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8208

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/8208.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 12, 2022

👋 Welcome back rkennke! 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 openjdk bot added the rfr Pull request is ready for review label Apr 12, 2022
@openjdk
Copy link

openjdk bot commented Apr 12, 2022

@rkennke 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.

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Apr 12, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 12, 2022

Webrevs

Copy link
Contributor

@rwestrel rwestrel left a comment

Choose a reason for hiding this comment

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

Looks reasonable to me.

@openjdk
Copy link

openjdk bot commented Apr 13, 2022

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

8284760: Correct type/array element offset in LibraryCallKit::get_state_from_digest_object()

Reviewed-by: roland, kvn

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 21 new commits pushed to 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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 13, 2022
Copy link
Contributor

@vnkozlov vnkozlov 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. Let me test it before approval.

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Testing passed.

@rkennke
Copy link
Contributor Author

rkennke commented Apr 14, 2022

Testing passed.

Thank you, Vladimir!

/integrate

@openjdk
Copy link

openjdk bot commented Apr 14, 2022

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

  • c3938ec: 8159694: HiDPI, Unity, java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java
  • 23c6817: 6626492: Event time in future part 2, now on X
  • 2241a05: 8284578: Relax InterpreterCodelet stub alignment
  • bf85b00: 8284564: Extend VectorAPI validation tests for SHIFTs and ROTATE operations with constant shift values.
  • bf1c3ef: 8284775: Simplify String.substring(_, length()) calls
  • 249d54f: 8284673: Collapse identical catch branches in java.management
  • c7755b8: 8283094: Add Ideal transformation: x + (con - y) -> (x - y) + con
  • e245f9d: 8284274: Error reporting crashes because missing ResourceMarks
  • 8ee2944: 8284754: print more interesting env variables in hs_err and VM.info
  • 70251b0: 8194946: Regression automated Test 'javax/swing/JFileChooser/6738668/bug6738668.java' fails
  • ... and 15 more: https://git.openjdk.java.net/jdk/compare/4ce3cf12bff025441f658e1857e92486b5d73ee6...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 14, 2022
@openjdk openjdk bot closed this Apr 14, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 14, 2022
@rkennke rkennke deleted the JDK-8284760 branch April 14, 2022 09:31
@openjdk
Copy link

openjdk bot commented Apr 14, 2022

@rkennke Pushed as commit 2ba5cc4.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants