[jdk11u-dev] Integrated: 8250810: Push missing parts of JDK-8248817

[Reka Kovacs]

On Mon, 23 Aug 2021 07:49:47 GMT, Reka Kovacs <github.com+25946952+rnkovacs at openjdk.org> wrote:

> This is a refactoring patch with no functional change. It didn't apply cleanly. Differences to the original commit:
> 
> In `thread_windows_x86.cpp`:
> - Some removed lines were simpler on tip because of [JDK-8248240](https://github.com/openjdk/jdk/commit/a6e794b3e85d28537bf740d9d7e68339707d38e1#diff-d4111d540c34b1e0f4acac1e92877ce458b29d70126ccb113b439261a503ed95).
> 
> In `os_windows.cpp`:
> - The block around L2461 is no longer present on tip, that and a bit of the next block can be simplified.
> - The conditions on L2539 ([JDK-8234372](https://github.com/openjdk/jdk/commit/4e4d1f2b4dad61b4c4590f1d3a956b9ad86ff74c#diff-84938e7dfe64805a850b8a729495117a972a474622fff12bb97ee45cbc2184f2)) and L2549 ([JDK-8213199](https://github.com/openjdk/jdk/commit/7c3f2b06f13e3d28b74193d8acac4478e8c12bdb#diff-84938e7dfe64805a850b8a729495117a972a474622fff12bb97ee45cbc2184f2)) (original line numbers) are different on tip. We actually didn't touch those, they only show up colored in the diff because of the whitespace changes.
> - The surrounding code is different around L2586 because of [JDK-8191278](https://github.com/openjdk/jdk/commit/aedbb7580334cb9131f547845f9b7aa3916ddf4b#diff-84938e7dfe64805a850b8a729495117a972a474622fff12bb97ee45cbc2184f2), but the changes are the same.

This pull request has now been integrated.

Changeset: ddc3288b
Author:    Reka Kovacs <rekakovacs at microsoft.com>
Committer: Christoph Langer <clanger at openjdk.org>
URL:       https://git.openjdk.java.net/jdk11u-dev/commit/ddc3288b8cde25001244fee81896c98b1237affc
Stats:     76 lines in 2 files changed: 6 ins; 33 del; 37 mod

8250810: Push missing parts of JDK-8248817

Push changes from JDK-8248817 that were accidentally excluded from the commit.

Co-authored-by: Ludovic Henry <luhenry at openjdk.org>
Co-authored-by: Bernhard Urban-Forster <burban at openjdk.org>
Reviewed-by: aph, mdoerr
Backport-of: a4eaf9536c272862b5ec856bf263679be09bddc9

-------------

PR: https://git.openjdk.java.net/jdk11u-dev/pull/274