# HG changeset patch # User mgronlun # Date 1371722031 -7200 # Node ID b3cd8b58b79886fc1533d7cf0db7fa60e4f300f0 # Parent b9f4c4ec0f50cac4ebef00630d2cf5479c9c66ec 8016735: Remove superfluous EnableInvokeDynamic warning from UnlockDiagnosticVMOptions check Reviewed-by: sla, dholmes diff -r b9f4c4ec0f50 -r b3cd8b58b798 src/share/vm/runtime/globals.cpp --- a/src/share/vm/runtime/globals.cpp Wed Jun 19 20:51:39 2013 -0700 +++ b/src/share/vm/runtime/globals.cpp Thu Jun 20 11:53:51 2013 +0200 @@ -73,12 +73,6 @@ strcmp(kind, "{C2 diagnostic}") == 0 || strcmp(kind, "{ARCH diagnostic}") == 0 || strcmp(kind, "{Shark diagnostic}") == 0) { - if (strcmp(name, "EnableInvokeDynamic") == 0 && UnlockExperimentalVMOptions && !UnlockDiagnosticVMOptions) { - // transitional logic to allow tests to run until they are changed - static int warned; - if (++warned == 1) warning("Use -XX:+UnlockDiagnosticVMOptions before EnableInvokeDynamic flag"); - return true; - } return UnlockDiagnosticVMOptions; } else if (strcmp(kind, "{experimental}") == 0 || strcmp(kind, "{C2 experimental}") == 0 ||