Rename the option to ImageHeapMetadataDumpFileName; make sure to specify that the feature refers to the image heap specifically.

Author: Andrija Kolic

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java

@@ -1370,10 +1370,10 @@ public Boolean getValue(OptionValues values) {
     @Option(help = "Create a heap dump and exit.")//
     public static final RuntimeOptionKey<Boolean> DumpHeapAndExit = new RuntimeOptionKey<>(false, Immutable);
 
-    @Option(help = "Name of a csv file into which heap metadata should be dumped. " +
+    @Option(help = "Name of a csv file into which image heap metadata should be dumped. " +
                     "This csv file will be located in the same directory as the image. " +
                     "If this option is an empty string, the metadata will not be dumped.") //
-    public static final HostedOptionKey<String> HeapMetadataDumpFileName = new HostedOptionKey<>("");
+    public static final HostedOptionKey<String> ImageHeapMetadataDumpFileName = new HostedOptionKey<>("");
 
     @Option(help = "Print some VM information and exit.")//
     public static final RuntimeOptionKey<Boolean> PrintVMInfoAndExit = new RuntimeOptionKey<>(false, Immutable);

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeap.java

@@ -799,10 +799,10 @@ public ObjectInfo addLateToImageHeap(Object object, Object reason) {
     }
 
     /**
-     * Dumps metadata for every object in the heap.
+     * Dumps metadata for every object in the image heap.
      */
     public void dumpMetadata() {
-        String metadataFileName = SubstrateOptions.HeapMetadataDumpFileName.getValue();
+        String metadataFileName = SubstrateOptions.ImageHeapMetadataDumpFileName.getValue();
         if (metadataFileName == null || metadataFileName.isEmpty()) {
             // Do not dump metadata if the file name isn't set
             return;
@@ -812,7 +812,7 @@ public void dumpMetadata() {
         File metadataFile = metadataFilePath.toFile();
         String metadataDir = metadataFile.getParent();
         if (!new File(metadataDir).exists()) {
-            throw VMError.shouldNotReachHere("Heap metadata directory does not exist: " + metadataDir);
+            throw VMError.shouldNotReachHere("Image heap metadata directory does not exist: " + metadataDir);
         }
 
         try (FileWriter metadataOut = new FileWriter(metadataFile);
@@ -823,7 +823,7 @@ public void dumpMetadata() {
                 metadataBw.write(csvLine);
             }
         } catch (IOException ex) {
-            throw new RuntimeException("Failed to dump heap metadata to " + metadataFile, ex);
+            throw new RuntimeException("Failed to dump image heap metadata to " + metadataFile, ex);
         }
     }