src/hotspot/share/runtime/arguments.cpp

*** 2081,2104 ****
      if ((UseNUMAInterleaving && !FLAG_IS_DEFAULT(UseNUMAInterleaving)) || (UseNUMA && !FLAG_IS_DEFAULT(UseNUMA))) {
        log_warning(arguments) ("NUMA support for Heap depends on the file system when AllocateHeapAt option is used.\n");
      }
    }
  
!   // FIXME
!   //if (LP64_ONLY(false &&) !FLAG_IS_DEFAULT(ValueTypePassFieldsAsArgs)) {
!   if (!FLAG_IS_DEFAULT(ValueTypePassFieldsAsArgs)) {
      FLAG_SET_CMDLINE(bool, ValueTypePassFieldsAsArgs, false);
      warning("ValueTypePassFieldsAsArgs is not supported on this platform");
    }
  
!   // FIXME
!   //if (LP64_ONLY(false &&) !FLAG_IS_DEFAULT(ValueTypeReturnedAsFields)) {
!   if (!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");
      }
--- 2081,2106 ----
      if ((UseNUMAInterleaving && !FLAG_IS_DEFAULT(UseNUMAInterleaving)) || (UseNUMA && !FLAG_IS_DEFAULT(UseNUMA))) {
        log_warning(arguments) ("NUMA support for Heap depends on the file system when AllocateHeapAt option is used.\n");
      }
    }
  
!   if (LP64_ONLY(false &&) !FLAG_IS_DEFAULT(ValueTypePassFieldsAsArgs)) {
      FLAG_SET_CMDLINE(bool, ValueTypePassFieldsAsArgs, false);
      warning("ValueTypePassFieldsAsArgs is not supported on this platform");
    }
  
!   if (LP64_ONLY(false &&) !FLAG_IS_DEFAULT(ValueTypeReturnedAsFields)) {
      FLAG_SET_CMDLINE(bool, ValueTypeReturnedAsFields, false);
      warning("ValueTypeReturnedAsFields is not supported on this platform");
    }
  
+   if (NullableValueTypes) {
+     // Disable calling convention if value types are always nullable
+     FLAG_SET_CMDLINE(bool, ValueTypePassFieldsAsArgs, false);
+     FLAG_SET_CMDLINE(bool, ValueTypeReturnedAsFields, false);
+   }
+ 
    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");
      }