src/hotspot/share/runtime/arguments.cpp

@@ -2119,40 +2119,10 @@
   if (AMD64_ONLY(false &&) !FLAG_IS_DEFAULT(ValueTypeReturnedAsFields)) {
     FLAG_SET_CMDLINE(ValueTypeReturnedAsFields, false);
     warning("ValueTypeReturnedAsFields is not supported on this platform");
   }
 
-  if (EnableValhalla) {
-    if (!TieredCompilation) {
-      if (!FLAG_IS_DEFAULT(EnableValhallaC1) && EnableValhallaC1) {
-        warning("EnableValhallaC1 is disabled because TieredCompilation is disabled");
-      }
-      FLAG_SET_CMDLINE(EnableValhallaC1, false);
-      if (!FLAG_IS_DEFAULT(TieredStopAtLevel) && TieredStopAtLevel != 4) {
-        warning("TieredStopAtLevel is reset to 4 because TieredCompilation is disabled");
-      }
-      FLAG_SET_CMDLINE(TieredStopAtLevel, 4);
-    }
-    if (!EnableValhallaC1) {
-      // C1 support for value types is incomplete. Don't use it by default.
-      if (!FLAG_IS_DEFAULT(TieredCompilation) && TieredCompilation) {
-        warning("TieredCompilation disabled because value types are not fully supported by C1");
-      }
-      FLAG_SET_CMDLINE(TieredCompilation, false);
-    } else {
-      /*
-        TEMP: to run the valuetype tests with C1, you need to use the following command-line:
-
-        cd test/hotspot/jtreg/compiler/valhalla/valuetypes
-        jtreg \
-            -javaoption:-XX:+EnableValhallaC1 \
-            -javaoption:-XX:TieredStopAtLevel=1 \
-            .
-
-      */
-    }
-  }
   return status;
 }
 
 bool Arguments::is_bad_option(const JavaVMOption* option, jboolean ignore,
   const char* option_type) {