Skip to content

8301308: Remove version conditionalization for gcc/clang PRAGMA_DIAG_PUSH/POP#13025

Closed
TheShermanTanker wants to merge 1 commit intoopenjdk:masterfrom
TheShermanTanker:patch-2
Closed

8301308: Remove version conditionalization for gcc/clang PRAGMA_DIAG_PUSH/POP#13025
TheShermanTanker wants to merge 1 commit intoopenjdk:masterfrom
TheShermanTanker:patch-2

Conversation

@TheShermanTanker
Copy link
Contributor

@TheShermanTanker TheShermanTanker commented Mar 14, 2023

As of now we at minimum require clang 3.5 and gcc 6 to compile the Java Platform, the version checks for gcc/clang here are for whether clang is either version 4 and above, or has a minor version higher than 3.1, and for gcc either a major version higher than 4 or minor version above 4.6. Now these will always pass, so they can be removed. Also changes the macro definition location to match Visual C++ and look neater


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-8301308: Remove version conditionalization for gcc/clang PRAGMA_DIAG_PUSH/POP

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13025

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 14, 2023

👋 Welcome back jwaters! 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 Mar 14, 2023
@openjdk
Copy link

openjdk bot commented Mar 14, 2023

@TheShermanTanker 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 hotspot-dev@openjdk.org label Mar 14, 2023
@mlbridge
Copy link

mlbridge bot commented Mar 14, 2023

Webrevs

Copy link

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

@openjdk
Copy link

openjdk bot commented Mar 14, 2023

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

8301308: Remove version conditionalization for gcc/clang PRAGMA_DIAG_PUSH/POP

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

  • 065d3e0: 8304171: Fix layout of JCov instrumented bundle on Mac OS
  • cd41c69: 8303705: Field sleeper.started should be volatile JdbLockTestTarg.java
  • f5c8b68: 8301998: Update HarfBuzz to 7.0.1
  • 617c15f: 8304172: ProblemList serviceability/sa/UniqueVtableTest.java
  • f81e1de: 8303882: Refactor some iterators in jdk.compiler

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 Mar 14, 2023
Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

LGTM.

Thanks

@TheShermanTanker
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 15, 2023

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

  • e3777b0: 8270865: Print process ID with -Xlog:os
  • 349139b: 8304030: Configure call fails on AIX when using --with-gtest option.
  • 714b5f0: 8294962: Convert java.base/jdk.internal.module package to use the Classfile API to modify and write module-info.class
  • 065d3e0: 8304171: Fix layout of JCov instrumented bundle on Mac OS
  • cd41c69: 8303705: Field sleeper.started should be volatile JdbLockTestTarg.java
  • f5c8b68: 8301998: Update HarfBuzz to 7.0.1
  • 617c15f: 8304172: ProblemList serviceability/sa/UniqueVtableTest.java
  • f81e1de: 8303882: Refactor some iterators in jdk.compiler

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 15, 2023

@TheShermanTanker Pushed as commit 3d77e21.

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

@TheShermanTanker TheShermanTanker deleted the patch-2 branch March 15, 2023 13:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Development

Successfully merging this pull request may close these issues.

3 participants