Skip to content
This repository has been archived by the owner. It is now read-only.

8259560: Zero m68k: "static assertion failed: align" after JDK-8252049 #102

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Jan 11, 2021

Debian folks report that Zero m68k (and seems only that arch) fails the static assert added by JDK-8252049. It affects at least JDK 16, but would affect more releases once JDK-8252049 is backported.

/<<PKGBUILDDIR>>/src/hotspot/share/oops/methodData.hpp: In constructor 'MethodData::CompilerCounters::CompilerCounters()':
/<<PKGBUILDDIR>>/src/hotspot/share/oops/methodData.hpp:1987:55: error: static assertion failed: align
 1987 | static_assert(sizeof(_trap_hist) % HeapWordSize == 0, "align");
      |

I tried to massage the code so that oops/methodData.hpp is not touched when Zero is built (since Zero does not use compilers and related infra), but there are enough transitive dependencies to oops/methodData.hpp to make it quite messy. So instead I would just special-case it in place.


Progress

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

Issue

  • JDK-8259560: Zero m68k: "static assertion failed: align" after JDK-8252049

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk16 pull/102/head:pull/102
$ git checkout pull/102

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 11, 2021

👋 Welcome back shade! 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 Jan 11, 2021
@openjdk
Copy link

openjdk bot commented Jan 11, 2021

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

  • hotspot

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 label Jan 11, 2021
@mlbridge
Copy link

mlbridge bot commented Jan 11, 2021

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

I prefer NOT_ZERO macro usage over ifdefs, but don't insist.

Thanks,
David

@openjdk
Copy link

openjdk bot commented Jan 12, 2021

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

8259560: Zero m68k: "static assertion failed: align" after JDK-8252049

Reviewed-by: dholmes

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 4 new commits pushed to the master branch:

  • a7e5da2: 8258384: AArch64: SVE verify_ptrue fails on some tests
  • 2cb271e: 8253996: Javac error on jdk16 build 18: invalid flag: -Xdoclint:-missing
  • d60a937: 8259028: ClassCastException when using custom filesystem with wrapper FileChannel impl
  • e05f36f: 8259043: More Zero architectures need linkage with libatomic

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.

➡️ 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 Jan 12, 2021
@glaubitz
Copy link
Contributor

glaubitz commented Jan 12, 2021

I can confirm that the current PR fixes the problem for me.

@shipilev
Copy link
Member Author

shipilev commented Jan 13, 2021

/integrate

@openjdk openjdk bot closed this Jan 13, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 13, 2021
@openjdk
Copy link

openjdk bot commented Jan 13, 2021

@shipilev Since your change was applied there have been 15 commits pushed to the master branch:

  • efc36be: 8258985: Parallel WeakProcessor may use too few threads
  • 417e1d1: 8259061: C2: assert(found) failed: memory-writing node is not placed in its original loop or an ancestor of it
  • 793017d: 8259601: AArch64: Fix reinterpretX2D match rule issue
  • 15dd8f3: 8259275: JRuby crashes while resolving invokedynamic instruction
  • 1cf2378: 8259353: VectorReinterpretNode is incorrectly optimized out
  • 17b4db3: 8259636: Check for buffer backed by shared segment kicks in in unexpected places
  • 5f9cd72: 8259645: Revert JDK-8245956 JavaCompiler still uses File API instead of Path API in a specific case
  • b03880e: 8259634: MemorySegment::asByteBuffer does not respect spatial bounds
  • 8a81cf1: 8259298: broken link in Stream::toList spec
  • 67e1b63: 8259380: Correct pretouch chunk size to cap with actual page size
  • ... and 5 more: https://git.openjdk.java.net/jdk16/compare/020ec8485251698d1187204ac13321f4726e45ea...master

Your commit was automatically rebased without conflicts.

Pushed as commit a99df45.

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
hotspot integrated Pull request has been integrated
3 participants