Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8294460: CodeSection::alignment checks for CodeBuffer::SECT_STUBS incorrectly #10699

Conversation

bulasevich
Copy link
Contributor

@bulasevich bulasevich commented Oct 13, 2022

This is a fix for an apparent code bug:

inline int CodeSection::alignment(int section) {
  if (section == CodeBuffer::SECT_CONSTS) {
    return (int) sizeof(jdouble);
  }
  if (section == CodeBuffer::SECT_INSTS) {
    return (int) CodeEntryAlignment;
  }
  if (CodeBuffer::SECT_STUBS) {   <--- here must be (section == CodeBuffer::SECT_STUBS) condition!
    // CodeBuffer installer expects sections to be HeapWordSize aligned
    return HeapWordSize;
  }
  ShouldNotReachHere();
  return 0;
}

Also, the section size initializer code is moved to initialize_misc() to fix the code path that works with uninitialized data.


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-8294460: CodeSection::alignment checks for CodeBuffer::SECT_STUBS incorrectly

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10699

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 13, 2022

👋 Welcome back bulasevich! 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 Oct 13, 2022

@bulasevich 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 Oct 13, 2022
@bulasevich bulasevich marked this pull request as ready for review October 20, 2022 07:12
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 20, 2022
@mlbridge
Copy link

mlbridge bot commented Oct 20, 2022

Webrevs

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

Lgtm.

@openjdk
Copy link

openjdk bot commented Oct 20, 2022

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

8294460: CodeSection::alignment checks for CodeBuffer::SECT_STUBS incorrectly

Reviewed-by: phh, 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 369 new commits pushed to the master branch:

  • 6240431: 8295697: Resolve conflicts between serviceability/jvmti and nsk/jvmti shared code
  • 1164258: 8295124: Atomic::add to pointer type may return wrong value
  • d3eba85: 8295414: [Aarch64] C2: assert(false) failed: bad AD file
  • 028e8b3: 8137022: Concurrent refinement thread adjustment and (de-)activation suboptimal
  • faa6b66: 8295715: Minimize disabled warnings in serviceability libs
  • de1e0c5: 8295719: Remove unneeded disabled warnings in jdk.sctp
  • 9612cf9: 8295529: Add link to JBS to README.md
  • b37421e: 8295564: Norwegian Nynorsk Locale is missing formatting
  • 6707bfb: 8029633: Raw inner class constructor ref should not perform diamond inference
  • 7bc9692: 8294670: Enhanced switch statements have an implicit default which does not complete normally
  • ... and 359 more: https://git.openjdk.org/jdk/compare/0b56b822436a0662170c11777ff0009b89a667eb...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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 20, 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.

Good. I will test it.

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.

My testing passed.

@bulasevich
Copy link
Contributor Author

thanks!

@bulasevich
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 21, 2022

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

  • 8b010e0: 8030616: sun/management/jmxremote/bootstrap/RmiBootstrapTest fails intermittently with cannot find a free port
  • b35922b: 8295714: GHA ::set-output is deprecated and will be removed
  • dfd2d83: 8295657: SA: Allow larger object alignments
  • a345df2: 8280131: jcmd reports "Module jdk.jfr not found." when "jdk.management.jfr" is missing
  • ef62b61: 8295703: RISC-V: Remove implicit noreg temp register arguments in MacroAssembler
  • 6240431: 8295697: Resolve conflicts between serviceability/jvmti and nsk/jvmti shared code
  • 1164258: 8295124: Atomic::add to pointer type may return wrong value
  • d3eba85: 8295414: [Aarch64] C2: assert(false) failed: bad AD file
  • 028e8b3: 8137022: Concurrent refinement thread adjustment and (de-)activation suboptimal
  • faa6b66: 8295715: Minimize disabled warnings in serviceability libs
  • ... and 364 more: https://git.openjdk.org/jdk/compare/0b56b822436a0662170c11777ff0009b89a667eb...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Oct 21, 2022
@openjdk openjdk bot closed this Oct 21, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 21, 2022
@openjdk
Copy link

openjdk bot commented Oct 21, 2022

@bulasevich Pushed as commit 5064718.

💡 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
3 participants