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

8307160: Fix AWT/2D/A11Y to support the permissive- flag on the Microsoft Visual C compiler #18584

Closed
wants to merge 2 commits into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Apr 2, 2024

This is a retake on #15096.

I tried to fix the remaining issues in that PR, but could not push them. In the end, it seemed easier to create a new branch in my own personal fork.

The majority of the work in this PR has been done by @TheShermanTanker. I have stepped in and fixed the remaining comments, reverted some additional unneeded changed code, and also tried to minimize code duplication in awt_PrintJob.cpp.


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-8307160: Fix AWT/2D/A11Y to support the permissive- flag on the Microsoft Visual C compiler (Enhancement - P4)

Reviewers

Contributors

  • Magnus Ihse Bursie <ihse@openjdk.org>

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18584

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 2, 2024

👋 Welcome back ihse! 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 Apr 2, 2024

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

8307160: Fix AWT/2D/A11Y to support the permissive- flag on the Microsoft Visual C compiler

Co-authored-by: Magnus Ihse Bursie <ihse@openjdk.org>
Reviewed-by: jwaters, prr

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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
Copy link

openjdk bot commented Apr 2, 2024

@magicus The following labels will be automatically applied to this pull request:

  • build
  • client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added build build-dev@openjdk.org client client-libs-dev@openjdk.org labels Apr 2, 2024
@magicus magicus changed the title 307160: Fix AWT/2D/A11Y to support the permissive- flag on the Microsoft Visual C compiler 8307160: Fix AWT/2D/A11Y to support the permissive- flag on the Microsoft Visual C compiler Apr 2, 2024
@magicus
Copy link
Member Author

magicus commented Apr 2, 2024

/author set @TheShermanTanker
/contributor add ihse

@openjdk
Copy link

openjdk bot commented Apr 2, 2024

@magicus
Setting overriding author to Julian Waters <jwaters@openjdk.org>. When this pull request is integrated, the overriding author will be used in the commit.

@openjdk
Copy link

openjdk bot commented Apr 2, 2024

@magicus
Contributor Magnus Ihse Bursie <ihse@openjdk.org> successfully added.

@magicus magicus marked this pull request as ready for review April 3, 2024 00:03
@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 3, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 3, 2024

Webrevs

Copy link
Contributor

@TheShermanTanker TheShermanTanker 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. Thanks for taking this up for me! In the future I hope @prrace will change his mind and allow the use of C++ Libraries in awt (awt already depends on the C++ Standard Library on Windows, verifiable if you run dumpbin -DEPENDENTS on it), because I have a change in mind relying on RAII that would look much cleaner and neater

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 4, 2024
@magicus
Copy link
Member Author

magicus commented Apr 5, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Apr 5, 2024

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

  • 8efe569: 8328747: WrongMethodTypeException with pattern matching on switch on sealed classes
  • 71d48bc: 8329655: Cleanup KlassObj and klassOop names after the PermGen removal
  • b71acc7: 8329089: Empty immutable list throws the wrong exception type for remove(first | last) operations
  • 1131bb7: 8329261: G1: interpreter post-barrier x86 code asserts index size of wrong buffer
  • 6bc6392: 8329201: C2: Replace TypeInterfaces::intersection_with() + eq() with contains()
  • 9da5170: 8327978: C2 SuperWord: Fix compilation time regression in dependency graph traversal after JDK-8325651
  • c1cfb43: 8329109: Threads::print_on() tries to print CPU time for terminated GC threads
  • 5860a48: 8329624: Add visitors for preview language features
  • 0b01144: 8329720: Gtest failure printing markword after JDK-8325303
  • 34f7974: 8325303: Replace markWord.is_neutral() with markWord.is_unlocked()
  • ... and 1 more: https://git.openjdk.org/jdk/compare/e1183ac044f803bf0d4ccfebc2b1cd5b33294c7a...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 5, 2024

@magicus Pushed as commit 8bc1867.

💡 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
build build-dev@openjdk.org client client-libs-dev@openjdk.org integrated Pull request has been integrated
3 participants