Print third-party heap version in -Xinternalversion and error report. (#14)

qinsoon · k-sareen · commit 80f39691ce5c · 2023-02-14T01:55:56.000Z
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
@@ -64,6 +64,9 @@
 #if INCLUDE_JFR
 #include "jfr/jfr.hpp"
 #endif
+#ifdef INCLUDE_THIRD_PARTY_HEAP
+#include THIRD_PARTY_HEAP_FILE(thirdPartyHeap.hpp)
+#endif
 
 #define DEFAULT_JAVA_LAUNCHER  "generic"
 
@@ -2705,6 +2708,11 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, bool* patch_m
     } else if (match_option(option, "-Xinternalversion")) {
       jio_fprintf(defaultStream::output_stream(), "%s\n",
                   VM_Version::internal_vm_info_string());
+      #ifdef INCLUDE_THIRD_PARTY_HEAP
+      jio_fprintf(defaultStream::output_stream(), "%s\n",
+                  ThirdPartyHeap::version());
+      #endif
+
       vm_exit(0);
 #ifndef PRODUCT
     // -Xprintflags
diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp
@@ -55,6 +55,9 @@
 #if INCLUDE_JFR
 #include "jfr/jfr.hpp"
 #endif
+#ifdef INCLUDE_THIRD_PARTY_HEAP
+#include THIRD_PARTY_HEAP_FILE(thirdPartyHeap.hpp)
+#endif
 
 #ifndef PRODUCT
 #include <signal.h>
@@ -1031,6 +1034,9 @@ void VMError::report(outputStream* st, bool _verbose) {
 
      if (_verbose) {
        st->print_cr("vm_info: %s", Abstract_VM_Version::internal_vm_info_string());
+       #ifdef INCLUDE_THIRD_PARTY_HEAP
+       st->print_cr("heap_info: %s", ThirdPartyHeap::version());
+       #endif
        st->cr();
      }
 
