Minor cleanups

Author: Jatin Bhateja

src/hotspot/cpu/aarch64/vm_version_aarch64.cpp

@@ -702,7 +702,7 @@ void VM_Version::print_platform_virtualization_info(outputStream* st) {
 #endif
 }
 
-void VM_Version::pre_initialize(void) {}
+void VM_Version::pre_initialize() {}
 
 void VM_Version::initialize_cpu_information(void) {
   // do nothing if cpu info has been initialized

src/hotspot/cpu/arm/vm_version_arm_32.cpp

@@ -353,7 +353,7 @@ void VM_Version::initialize() {
   _is_initialized = true;
 }
 
-void VM_Version::pre_initialize(void) {}
+void VM_Version::pre_initialize() {}
 
 void VM_Version::initialize_cpu_information(void) {
   // do nothing if cpu info has been initialized

src/hotspot/share/runtime/abstract_vm_version.hpp

@@ -57,8 +57,6 @@ class Abstract_VM_Version: AllStatic {
   // CPU feature flags, can be affected by VM settings.
   static uint64_t _features;
 
-  // Extra CPU feature flags used when all 64 bits of _features are exhausted for
-  // on a given target, currently only used for x86_64, can be affected by VM settings.
   static const char* _features_string;
 
   // Original CPU feature flags, not affected by VM settings.

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIBackendFactory.java

@@ -58,7 +58,6 @@ static <CPUFeatureType extends Enum<CPUFeatureType>> EnumSet<CPUFeatureType> con
                     Class<CPUFeatureType> enumType,
                     Map<String, Long> constants,
                     long features,
-                    long extra_features,
                     Map<String, String> renaming) {
         EnumSet<CPUFeatureType> outFeatures = EnumSet.noneOf(enumType);
         List<String> missing = new ArrayList<>();
@@ -76,17 +75,6 @@ static <CPUFeatureType extends Enum<CPUFeatureType>> EnumSet<CPUFeatureType> con
                     missing.add(name);
                 }
             }
-            if (key.startsWith("VM_Version::EXTRA_CPU_")) {
-                String name = key.substring("VM_Version::EXTRA_CPU_".length());
-                try {
-                    CPUFeatureType feature = Enum.valueOf(enumType, renaming.getOrDefault(name, name));
-                    if ((extra_features & bitMask) != 0) {
-                        outFeatures.add(feature);
-                    }
-                } catch (IllegalArgumentException iae) {
-                    missing.add(name);
-                }
-            }
         }
         if (!missing.isEmpty()) {
             throw new JVMCIError("Missing CPU feature constants: %s", missing);

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java

@@ -49,7 +49,7 @@ public class AArch64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFac
     private static EnumSet<AArch64.CPUFeature> computeFeatures(AArch64HotSpotVMConfig config) {
         // Configure the feature set using the HotSpot flag settings.
         Map<String, Long> constants = config.getStore().getConstants();
-        return HotSpotJVMCIBackendFactory.convertFeatures(CPUFeature.class, constants, config.vmVersionFeatures, 0L, emptyMap());
+        return HotSpotJVMCIBackendFactory.convertFeatures(CPUFeature.class, constants, config.vmVersionFeatures, emptyMap());
     }
 
     private static EnumSet<AArch64.Flag> computeFlags(AArch64HotSpotVMConfig config) {

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/riscv64/RISCV64HotSpotJVMCIBackendFactory.java

@@ -49,7 +49,7 @@ public class RISCV64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFac
     private static EnumSet<RISCV64.CPUFeature> computeFeatures(RISCV64HotSpotVMConfig config) {
         // Configure the feature set using the HotSpot flag settings.
         Map<String, Long> constants = config.getStore().getConstants();
-        return HotSpotJVMCIBackendFactory.convertFeatures(CPUFeature.class, constants, config.vmVersionFeatures, 0L, emptyMap());
+        return HotSpotJVMCIBackendFactory.convertFeatures(CPUFeature.class, constants, config.vmVersionFeatures, emptyMap());
     }
 
     private static EnumSet<RISCV64.Flag> computeFlags(RISCV64HotSpotVMConfig config) {