@@ -726,44 +726,15 @@ private boolean checkNullAllocationStubs() {
726726
727727 // Checkstyle: resume
728728
729- private static void checkForMissingRequiredValue (HotSpotMarkId markId , boolean required ) {
730- if (!markId .isAvailable () && required ) {
731- GraalHotSpotVMConfigAccess .reportError ("Unsupported Mark " + markId );
732- }
733- }
734-
735729 private void populateMarkConstants () {
736730 Map <String , Long > constants = getStore ().getConstants ();
737731 for (HotSpotMarkId markId : HotSpotMarkId .values ()) {
738- Integer value = null ;
739732 String key = "CodeInstaller::" + markId .name ();
740733 Long result = constants .get (key );
741- if (result != null ) {
742- value = result .intValue ();
743- }
744- markId .setValue (value );
745- switch (markId ) {
746- case FRAME_COMPLETE :
747- checkForMissingRequiredValue (markId , true );
748- break ;
749- case DEOPT_MH_HANDLER_ENTRY :
750- checkForMissingRequiredValue (markId , true );
751- break ;
752- case NARROW_KLASS_BASE_ADDRESS :
753- case CRC_TABLE_ADDRESS :
754- case NARROW_OOP_BASE_ADDRESS :
755- case LOG_OF_HEAP_REGION_GRAIN_BYTES :
756- checkForMissingRequiredValue (markId , true );
757- break ;
758- case VERIFY_OOPS :
759- case VERIFY_OOP_BITS :
760- case VERIFY_OOP_MASK :
761- case VERIFY_OOP_COUNT_ADDRESS :
762- checkForMissingRequiredValue (markId , true );
763- break ;
764- default :
765- checkForMissingRequiredValue (markId , true );
734+ if (result == null ) {
735+ GraalHotSpotVMConfigAccess .reportError ("Unsupported Mark " + markId );
766736 }
737+ markId .setValue (result .intValue ());
767738 }
768739 }
769740
0 commit comments