diff --git a/runtime/vm/vmprops.c b/runtime/vm/vmprops.c index 994c556ba24..cd165fd7dbd 100644 --- a/runtime/vm/vmprops.c +++ b/runtime/vm/vmprops.c @@ -959,6 +959,15 @@ initializeSystemProperties(J9JavaVM * vm) goto fail; } +#if defined(J9VM_OPT_OPENJDK_METHODHANDLE) + if (j2seVersion >= J2SE_V11) { + rc = addSystemProperty(vm, "java.lang.invoke.VarHandle.VAR_HANDLE_GUARDS", "false", J9SYSPROP_FLAG_WRITEABLE); + if (J9SYSPROP_ERROR_NONE != rc) { + goto fail; + } + } +#endif /* defined(J9VM_OPT_OPENJDK_METHODHANDLE) */ + /* If we get here all is good */ rc = J9SYSPROP_ERROR_NONE;