Merge pull request #11767 from babsingh/disable_vhguards

Disable VAR_HANDLE_GUARDS optimization in OpenJ9
eclipse-openj9 · Jan 27, 2021 · 914eae4 · 914eae4
2 parents 091d2c3 + 828c277
commit 914eae4
Showing 1 changed file with 9 additions and 0 deletions.
diff --git 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;