[crac] Integrated: Merge jdk:jdk-25+22

[Dmitry Cherepanov]

On Wed, 16 Jul 2025 18:11:43 GMT, Dmitry Cherepanov <dcherepanov at openjdk.org> wrote:

> Merge with jdk-25+22
> 
> Attaching output of `--diff-merges=remerge`
> 
> <details>
> 
> <summary>jdk-25+20</summary>
> 
> 
> commit 28128cb4e515074ced2dfd4cd371bebe4cdc4dbc
> Merge: 698225b6594 953eef4f113
> Author: Dmitry Cherepanov <dcherepanov at azul.com>
> Date:   Tue Jul 15 11:33:36 2025 +0400
> 
>     Merge with jdk-25+20
> 
> diff --git a/src/hotspot/cpu/x86/globals_x86.hpp b/src/hotspot/cpu/x86/globals_x86.hpp
> remerge CONFLICT (content): Merge conflict in src/hotspot/cpu/x86/globals_x86.hpp
> index 2d380144da1..103fde55fb3 100644
> --- a/src/hotspot/cpu/x86/globals_x86.hpp
> +++ b/src/hotspot/cpu/x86/globals_x86.hpp
> @@ -192,7 +192,6 @@ define_pd_global(intx, InitArrayShortSize, 8*BytesPerLong);
>               "Turn off JVM mitigations related to Intel micro code "        \
>               "mitigations for the Intel JCC erratum")                       \
>                                                                              \
> -<<<<<<< 698225b6594 (Merge jdk:jdk-25+19)
>    product(ccstr, CPUFeatures, nullptr, "CPU feature set, "                  \
>        "use -XX:CPUFeatures=0xnumber with -XX:CRaCCheckpointTo when you "    \
>        "get an error during -XX:CRaCRestoreFrom on a different machine; "    \
> @@ -205,18 +204,16 @@ define_pd_global(intx, InitArrayShortSize, 8*BytesPerLong);
>                                                                              \
>    product(bool, IgnoreCPUFeatures, false, RESTORE_SETTABLE | EXPERIMENTAL,  \
>        "Do not refuse to run after -XX:CRaCRestoreFrom finds out some "      \
> -      "CPU features are missing")
> -
> -=======
> +      "CPU features are missing")                                           \
> +                                                                            \
>    product(int, X86ICacheSync, -1, DIAGNOSTIC,                               \
>               "Select the X86 ICache sync mechanism: -1 = auto-select; "     \
>               "0 = none (dangerous); 1 = CLFLUSH loop; 2 = CLFLUSHOPT loop; "\
>               "3 = CLWB loop; 4 = single CPUID; 5 = single SERIALIZE. "      \
>               "Explicitly selected mechanism will fail at startup if "       \
>               "hardware does not support it.")                               \
> -             range(-1, 5)                                                   \
> -                                                                            \
> ->>>>>>> 953eef4f113 (8347337: ZGC: String dedups short-lived strings)
> +             range(-1, 5)
> +
>  // end of ARCH_FLAGS
>  
>  #endif // CPU_X86_GLOBALS_X86...

This pull request has now been integrated.

Changeset: 62d50fc0
Author:    Dmitry Cherepanov <dcherepanov at openjdk.org>
Committer: Timofei Pushkin <tpushkin at openjdk.org>
URL:       https://git.openjdk.org/crac/commit/62d50fc03e9721c02b0ed9312b760c0ecb839c1e
Stats:     85719 lines in 2189 files changed: 63538 ins; 13643 del; 8538 mod

Merge jdk:jdk-25+22

Reviewed-by: tpushkin

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

PR: https://git.openjdk.org/crac/pull/244