[crac] RFR: Merge jdk:jdk-25+22 [v2]

[duke]

On Thu, 17 Jul 2025 10:09:35 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-live...
>
> Dmitry Cherepanov has updated the pull request incrementally with one additional commit since the last revision:
> 
>   cleanup

@dimitryc 
Your change (at version 31023e21e6af689f4e9ea7e74197a772a58a7e48) is now ready to be sponsored by a Committer.

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

PR Comment: https://git.openjdk.org/crac/pull/244#issuecomment-3083584021