# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1412327435 -7200
# Node ID 95b879bdce67faa998d687e2d09b416e962ad30f
# Parent  3c39e028b9315fc7742f1d779cab2a9d3ff24bf7
mx: added -XX:-UseGraalClassLoader to JMH executions

diff -r 3c39e028b931 -r 95b879bdce67 mx/mx_graal.py
--- a/mx/mx_graal.py	Thu Oct 02 08:43:58 2014 -0700
+++ b/mx/mx_graal.py	Fri Oct 03 11:10:35 2014 +0200
@@ -1857,7 +1857,7 @@
                 buildOutput.append(x)
         env = os.environ.copy()
         env['JAVA_HOME'] = _jdk(vmToCheck='server')
-        env['MAVEN_OPTS'] = '-server'
+        env['MAVEN_OPTS'] = '-server -XX:-UseGraalClassLoader'
         mx.log("Building benchmarks...")
         cmd = ['mvn']
         if args.settings:
@@ -1883,6 +1883,8 @@
         mx.abort(1)
 
     vmArgs, benchmarksAndJsons = _extract_VM_args(args)
+    if '-XX:-UseGraalClassLoader' not in vmArgs:
+        vmArgs = ['-XX:-UseGraalClassLoader'] + vmArgs
 
     benchmarks = [b for b in benchmarksAndJsons if not b.startswith('{')]
     jmhArgJsons = [b for b in benchmarksAndJsons if b.startswith('{')]