[crac] RFR: Merge jdk:jdk-24+27

[Anton Kozlov]

On Wed, 22 Jan 2025 11:13:13 GMT, Dmitry Cherepanov <dcherepanov at openjdk.org> wrote:

> Merge jdk:jdk-24+27
> 
> Attached output of `git log -1 --remerge-diff`
> 
> [remerge-diff.txt](https://github.com/user-attachments/files/18504606/remerge-diff.txt)

May I suggest to supply output of


echo -e '<details>\n\n<summary>Conflicts</summary>\n\n```diff'
git -c merge.conflictstyle=diff3 show --diff-merges=remerge $1
echo -e '```\n\n</details>'


The merge conflict resolution is a bit easier to review with 3-way diff and syntax highlighting.

<details>

<summary>Conflicts</summary>


commit 35995f21abcc869e3f299762e4b6c3b0248f37b9
Merge: e1f8f3534b1 85fedbf6680
Author: Dmitry Cherepanov <dcherepanov at azul.com>
Date:   Wed Jan 22 15:02:16 2025 +0400

    Merge jdk:jdk-24+27

diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
remerge CONFLICT (content): Merge conflict in src/hotspot/share/classfile/vmSymbols.hpp
index 272b3c84a64..1456138b4f2 100644
--- a/src/hotspot/share/classfile/vmSymbols.hpp
+++ b/src/hotspot/share/classfile/vmSymbols.hpp
@@ -739,17 +739,11 @@ class SerializeClosure;
   template(toFileURL_signature,                             "(Ljava/lang/String;)Ljava/net/URL;")                 \
   template(url_array_classloader_void_signature,            "([Ljava/net/URL;Ljava/lang/ClassLoader;)V")          \
                                                                                                                   \
-<<<<<<< e1f8f3534b1 (Merge jdk:jdk-24+26)
   template(jdk_internal_crac_mirror_Core,          "jdk/internal/crac/mirror/Core")                               \
   template(checkpointRestoreInternal_name,         "checkpointRestoreInternal")                                   \
   template(checkpointRestoreInternal_signature,    "(J)Ljava/lang/String;")                                       \
                                                                                                                   \
-  /* Thread.dump_to_file jcmd */                                                                                  \
-||||||| 8485cb1ca1f
-  /* Thread.dump_to_file jcmd */                                                                                  \
-=======
   /* jcmd Thread.dump_to_file */                                                                                  \
->>>>>>> 85fedbf6680 (8344607: Link Time Optimization - basic support for clang)
   template(jdk_internal_vm_ThreadDumper,           "jdk/internal/vm/ThreadDumper")                                \
   template(dumpThreads_name,                       "dumpThreads")                                                 \
   template(dumpThreadsToJson_name,                 "dumpThreadsToJson")                                           \
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
remerge CONFLICT (content): Merge conflict in src/hotspot/share/runtime/arguments.cpp
index 1967de217ba..86ea6a63106 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -2183,7 +2183,6 @@ jint Arguments::parse_xss(const JavaVMOption* option, const char* tail, intx* ou
   return JNI_OK;
 }
 
-<<<<<<< e1f8f3534b1 (Merge jdk:jdk-24+26)
 bool Arguments::is_restore_option_set(const JavaVMInitArgs* args) {
   const char* tail;
   // iterate over arguments
@@ -2249,12 +2248,7 @@ bool Arguments::parse_options_for_restore(const JavaVMInitArgs* args) {
   return true;
 }
 
-jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, bool* patch_mod_javabase, JVMFlagOrigin origin) {
-||||||| 8485cb1ca1f
-jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, bool* patch_mod_javabase, JVMFlagOrigin origin) {
-=======
 jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, JVMFlagOrigin origin) {
->>>>>>> 85fedbf6680 (8344607: Link Time Optimization - basic support for clang)
   // For match_option to return remaining or value part of option string
   const char* tail;
 
diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
remerge CONFLICT (content): Merge conflict in src/java.base/share/classes/module-info.java
index 29e3d443905..130a560e29b 100644
--- a/src/java.base/share/classes/module-info.java
+++ b/src/java.base/share/classes/module-info.java
@@ -175,16 +175,12 @@ module java.base {
         jdk.net,
         jdk.sctp,
         jdk.crypto.cryptoki;
-<<<<<<< e1f8f3534b1 (Merge jdk:jdk-24+26)
     exports jdk.internal.crac to
         java.rmi,
         jdk.management.agent,
         jdk.sctp;
-||||||| 8485cb1ca1f
-=======
     exports jdk.internal.classfile.components to
         jdk.jfr;
->>>>>>> 85fedbf6680 (8344607: Link Time Optimization - basic support for clang)
     exports jdk.internal.foreign to
         jdk.incubator.vector;
     exports jdk.internal.event to


</details>

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

PR Comment: https://git.openjdk.org/crac/pull/188#issuecomment-2607041903
PR Comment: https://git.openjdk.org/crac/pull/188#issuecomment-2607042398