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

8317257: RISC-V: llvm build broken #15965

Closed
wants to merge 2 commits into from

Conversation

VladimirKempik
Copy link

@VladimirKempik VladimirKempik commented Sep 28, 2023

Please review this small fix to make hotspot compilable with clang on risc-v.
It supposed to fix next error:

/home/user/openjdk/jdk/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp:1518:10: error: call to member function 'null_check' is ambiguous
      __ null_check(obj);
      ~~~^~~~~~~~~~
/home/user/openjdk/jdk/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp:238:16: note: candidate function
  virtual void null_check(Register reg, int offset = -1);
               ^
/home/user/openjdk/jdk/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.hpp:109:8: note: candidate function
  void null_check(Register r, Label *Lnull = nullptr) { MacroAssembler::null_check(r); }
       ^
1 error generated.

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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15965

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 28, 2023

👋 Welcome back vkempik! 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 Sep 28, 2023
@openjdk
Copy link

openjdk bot commented Sep 28, 2023

@VladimirKempik 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 Sep 28, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 28, 2023

Webrevs

@RealFYang
Copy link
Member

RealFYang commented Sep 28, 2023

I see this was once introduced by https://bugs.openjdk.org/browse/JDK-8278479.
Maybe align with aarch64 by calling: __ null_check(obj, -1); directly?

@VladimirKempik
Copy link
Author

Thanks for taking a look, also fixed some static_assert being without message, it's c++17 only feature according to clang error

Copy link
Member

@RealFYang RealFYang left a comment

Choose a reason for hiding this comment

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

Updated change LGTM. Thanks.

@openjdk
Copy link

openjdk bot commented Sep 29, 2023

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

8317257: RISC-V: llvm build broken

Reviewed-by: fyang

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

  • 355811a: 8316559: Refactor some util/Calendar tests to JUnit
  • ecb5e8a: 8317264: Pattern.Bound has static fields that should be static final.
  • f2c221d: 8317119: Remove unused imports in the java.util.stream package
  • 09dad0e: 8313810: BoxLayout uses
    instead of list for layout options
  • 73a47f0: 4622866: javax.swing.text.Document.remove(int, int) has a misleading picture
  • cfcbfc6: 8316879: RegionMatches1Tests fails if CompactStrings are disabled after JDK-8302163
  • ca5eee2: 8316445: Mark com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java as vm.flagless
  • 060db1b: 8315031: YoungPLABSize and OldPLABSize not aligned by ObjectAlignmentInBytes
  • 3481a48: 8316974: ListFormat creation is unsuccessful for some of the supported Locales
  • 29348b3: 8316894: make test TEST="jtreg:test/jdk/..." fails on AIX
  • ... and 1 more: https://git.openjdk.org/jdk/compare/fc98998627443d6e73ac70661f47f48b30525712...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 Sep 29, 2023
@VladimirKempik
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Sep 29, 2023

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

  • 0259da9: 8301686: TLS 1.3 handshake fails if server_name doesn't match resuming session
  • 355811a: 8316559: Refactor some util/Calendar tests to JUnit
  • ecb5e8a: 8317264: Pattern.Bound has static fields that should be static final.
  • f2c221d: 8317119: Remove unused imports in the java.util.stream package
  • 09dad0e: 8313810: BoxLayout uses
    instead of list for layout options
  • 73a47f0: 4622866: javax.swing.text.Document.remove(int, int) has a misleading picture
  • cfcbfc6: 8316879: RegionMatches1Tests fails if CompactStrings are disabled after JDK-8302163
  • ca5eee2: 8316445: Mark com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java as vm.flagless
  • 060db1b: 8315031: YoungPLABSize and OldPLABSize not aligned by ObjectAlignmentInBytes
  • 3481a48: 8316974: ListFormat creation is unsuccessful for some of the supported Locales
  • ... and 2 more: https://git.openjdk.org/jdk/compare/fc98998627443d6e73ac70661f47f48b30525712...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 29, 2023

@VladimirKempik Pushed as commit bd7bb67.

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

@VladimirKempik VladimirKempik deleted the JDK-8317257 branch September 29, 2023 06:45
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
2 participants