src/share/vm/runtime/arguments.cpp

*** 2972,2996 ****
        UseCounterDecay = false;
      }
    }
  #endif // PRODUCT
  
!   if (EnableInvokeDynamic && !EnableMethodHandles) {
!     if (!FLAG_IS_DEFAULT(EnableMethodHandles)) {
!       warning("forcing EnableMethodHandles true because EnableInvokeDynamic is true");
      }
!     EnableMethodHandles = true;
    }
!   if (EnableMethodHandles && !AnonymousClasses) {
!     if (!FLAG_IS_DEFAULT(AnonymousClasses)) {
!       warning("forcing AnonymousClasses true because EnableMethodHandles is true");
      }
-     AnonymousClasses = true;
    }
!   if ((EnableMethodHandles || AnonymousClasses) && ScavengeRootsInCode == 0) {
      if (!FLAG_IS_DEFAULT(ScavengeRootsInCode)) {
!       warning("forcing ScavengeRootsInCode non-zero because EnableMethodHandles or AnonymousClasses is true");
      }
      ScavengeRootsInCode = 1;
    }
    if (!JavaObjectsInPerm && ScavengeRootsInCode == 0) {
      if (!FLAG_IS_DEFAULT(ScavengeRootsInCode)) {
--- 2972,3003 ----
        UseCounterDecay = false;
      }
    }
  #endif // PRODUCT
  
!   // Transitional
!   if (EnableMethodHandles || AnonymousClasses) {
!     if (!EnableInvokeDynamic && !FLAG_IS_DEFAULT(EnableInvokeDynamic)) {
!       warning("EnableMethodHandles and AnonymousClasses are obsolete.  Keeping EnableInvokeDynamic disabled.");
!     } else {
!       EnableInvokeDynamic = true;
!     }
    }
! 
!   // JSR 292 is not supported before 1.7
!   if (!JDK_Version::is_gte_jdk17x_version()) {
!     if (EnableInvokeDynamic) {
!       if (!FLAG_IS_DEFAULT(EnableInvokeDynamic)) {
!         warning("JSR 292 is not supported before 1.7.  Disabling support.");
        }
!       EnableInvokeDynamic = false;
      }
    }
! 
!   if (EnableInvokeDynamic && ScavengeRootsInCode == 0) {
      if (!FLAG_IS_DEFAULT(ScavengeRootsInCode)) {
!       warning("forcing ScavengeRootsInCode non-zero because EnableInvokeDynamic is true");
      }
      ScavengeRootsInCode = 1;
    }
    if (!JavaObjectsInPerm && ScavengeRootsInCode == 0) {
      if (!FLAG_IS_DEFAULT(ScavengeRootsInCode)) {