8251354: Shenandoah: Fix jdk/jfr/tool/TestPrintJSON.java test failure

Reviewed-by: clanger, stuefe

Author: rkennke

make/hotspot/gensrc/GensrcJfr.gmk

@@ -57,15 +57,11 @@ JFR_SRCDIR := $(TOPDIR)/src/hotspot/share/jfr/metadata
 METADATA_XML := $(JFR_SRCDIR)/metadata.xml
 METADATA_XSD := $(JFR_SRCDIR)/metadata.xsd
 
-ifeq ($(call check-jvm-feature, shenandoahgc), true)
-  METADATA_SHENANDOAH_XML := $(JFR_SRCDIR)/metadata-shenandoah.xml
-endif
-
-$(JFR_OUTPUTDIR)/jfrEventClasses.hpp: $(METADATA_XSD) \
-    $(BUILD_JFR_TOOLS) $(METADATA_XML) $(METADATA_SHENANDOAH_XML)
+$(JFR_OUTPUTDIR)/jfrEventClasses.hpp: $(METADATA_XML) $(METADATA_XSD) \
+    $(BUILD_JFR_TOOLS)
 	$(call LogInfo, Generating $(@F))
 	$(call MakeDir, $(@D))
-	$(call ExecuteWithLog, $@, $(TOOL_JFR_GEN) $(METADATA_XSD) $(JFR_OUTPUTDIR) $(METADATA_XML) $(METADATA_SHENANDOAH_XML) )
+	$(call ExecuteWithLog, $@, $(TOOL_JFR_GEN) $(METADATA_XML) $(METADATA_XSD) $(JFR_OUTPUTDIR))
 	test -f $@
 
 TARGETS += $(JFR_OUTPUTDIR)/jfrEventClasses.hpp

make/src/classes/build/tools/jfr/GenerateJfrFiles.java

@@ -28,20 +28,18 @@
 public class GenerateJfrFiles {
 
     public static void main(String... args) throws Exception {
-        if (args.length < 3) {
+        if (args.length != 3) {
             System.err.println("Incorrect number of command line arguments.");
             System.err.println("Usage:");
-            System.err.println("java GenerateJfrFiles[.java] <path-to-metadata.xsd> <output-directory> <path-to-metadata.xml> [<path-to-metadata.xml> ...]");
+            System.err.println("java GenerateJfrFiles[.java] <path-to-metadata.xml> <path-to-metadata.xsd> <output-directory>");
             System.exit(1);
         }
         try {
-            File metadataSchema = new File(args[0]);
-            File outputDirectory = new File(args[1]);
-            File[] metadataXml = new File[args.length - 2];
-            for (int i = 2; i < args.length; i++) {
-              metadataXml[i - 2] = new File(args[i]);
-            }
-            Metadata metadata = new Metadata(metadataSchema, metadataXml);
+            File metadataXml = new File(args[0]);
+            File metadataSchema = new File(args[1]);
+            File outputDirectory = new File(args[2]);
+
+            Metadata metadata = new Metadata(metadataXml, metadataSchema);
             metadata.verify();
             metadata.wireUpTypes();
 
@@ -77,14 +75,12 @@ static class TypeElement {
     static class Metadata {
         final Map<String, TypeElement> types = new LinkedHashMap<>();
         final Map<String, XmlType> xmlTypes = new HashMap<>();
-        Metadata(File metadataSchema, File[] metadataXml) throws ParserConfigurationException, SAXException, FileNotFoundException, IOException {
+        Metadata(File metadataXml, File metadataSchema) throws ParserConfigurationException, SAXException, FileNotFoundException, IOException {
             SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
             SAXParserFactory factory = SAXParserFactory.newInstance();
             factory.setSchema(schemaFactory.newSchema(metadataSchema));
             SAXParser sp = factory.newSAXParser();
-            for (File file : metadataXml) {
-              sp.parse(file, new MetadataHandler(this));
-            }
+            sp.parse(metadataXml, new MetadataHandler(this));
         }
 
         List<EventElement> getEvents() {