src/hotspot/share/runtime/arguments.cpp

*** 2349,2372 ****
    if (LP64_ONLY(false &&) !FLAG_IS_DEFAULT(ValueTypeReturnedAsFields)) {
      FLAG_SET_CMDLINE(bool, ValueTypeReturnedAsFields, false);
      warning("ValueTypeReturnedAsFields is not supported on this platform");
    }
  
!   if (EnableMVT || EnableValhalla) {
      // C1 has no support for value types
      if (!FLAG_IS_DEFAULT(TieredCompilation)) {
        warning("TieredCompilation disabled because value types are not supported by C1");
      }
      FLAG_SET_CMDLINE(bool, TieredCompilation, false);
    }
  
-   if (EnableMVT && EnableValhalla) {
-     jio_fprintf(defaultStream::error_stream(),
-         "Conflicting combination in option list: EnableMVT and EnableValhalla cannot be both enabled at the same time");
-     status = false;
-   }
- 
    return status;
  }
  
  bool Arguments::is_bad_option(const JavaVMOption* option, jboolean ignore,
    const char* option_type) {
--- 2349,2366 ----
    if (LP64_ONLY(false &&) !FLAG_IS_DEFAULT(ValueTypeReturnedAsFields)) {
      FLAG_SET_CMDLINE(bool, ValueTypeReturnedAsFields, false);
      warning("ValueTypeReturnedAsFields is not supported on this platform");
    }
  
!   if (EnableValhalla) {
      // C1 has no support for value types
      if (!FLAG_IS_DEFAULT(TieredCompilation)) {
        warning("TieredCompilation disabled because value types are not supported by C1");
      }
      FLAG_SET_CMDLINE(bool, TieredCompilation, false);
    }
  
    return status;
  }
  
  bool Arguments::is_bad_option(const JavaVMOption* option, jboolean ignore,
    const char* option_type) {
*** 3255,3269 ****
      } else if (is_bad_option(option, args->ignoreUnrecognized)) {
        return JNI_ERR;
      }
    }
  
-   if (EnableMVT) {
-     if (!create_property("valhalla.enableMVT", "true", InternalProperty)) {
-       return JNI_ENOMEM;
-     }
-   }
    if (EnableValhalla) {
      if (!create_property("valhalla.enableValhalla", "true", InternalProperty)) {
        return JNI_ENOMEM;
      }
    }
--- 3249,3258 ----
*** 3491,3505 ****
  #ifndef TIERED
    // Tiered compilation is undefined.
    UNSUPPORTED_OPTION(TieredCompilation);
  #endif
  
-   if (EnableMVT &&
-       !create_numbered_property("jdk.module.addmods", "jdk.incubator.mvt", addmods_count++)) {
-     return JNI_ENOMEM;
-   }
- 
  #if INCLUDE_JVMCI
    if (EnableJVMCI &&
        !create_numbered_property("jdk.module.addmods", "jdk.internal.vm.ci", addmods_count++)) {
      return JNI_ENOMEM;
    }
--- 3480,3489 ----
*** 4383,4393 ****
    if (UseOnStackReplacement && !UseLoopCounter) {
      warning("On-stack-replacement requires loop counters; enabling loop counters");
      FLAG_SET_DEFAULT(UseLoopCounter, true);
    }
  
!   if ((!EnableMVT && !EnableValhalla) || is_interpreter_only()) {
      // Disable calling convention optimizations if value types are not supported
      ValueTypePassFieldsAsArgs = false;
      ValueTypeReturnedAsFields = false;
    }
  
--- 4367,4377 ----
    if (UseOnStackReplacement && !UseLoopCounter) {
      warning("On-stack-replacement requires loop counters; enabling loop counters");
      FLAG_SET_DEFAULT(UseLoopCounter, true);
    }
  
!   if (!EnableValhalla || is_interpreter_only()) {
      // Disable calling convention optimizations if value types are not supported
      ValueTypePassFieldsAsArgs = false;
      ValueTypeReturnedAsFields = false;
    }