--- a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java	Fri May 12 13:14:25 2017 -0700
+++ b/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java	Fri May 12 13:56:13 2017 -0700
@@ -246,14 +246,16 @@
         return structuredGraph;
     }
 
-    protected Suites createSuites() {
-        Suites ret = backend.getSuites().getDefaultSuites(options).copy();
-        return ret;
+    protected OptionValues getOptions() {
+        return options;
     }
 
-    protected LIRSuites createLIRSuites() {
-        LIRSuites ret = backend.getSuites().getDefaultLIRSuites(options).copy();
-        return ret;
+    protected Suites createSuites(OptionValues opts) {
+        return backend.getSuites().getDefaultSuites(opts).copy();
+    }
+
+    protected LIRSuites createLIRSuites(OptionValues opts) {
+        return backend.getSuites().getDefaultLIRSuites(opts).copy();
     }
 
     protected Backend getBackend() {
@@ -323,7 +325,7 @@
         assert !graph.isFrozen();
         ResolvedJavaMethod installedCodeOwner = graph.method();
         request = new Request<>(graph, installedCodeOwner, getProviders(), getBackend(), getDefaultGraphBuilderSuite(), OptimisticOptimizations.ALL,
-                        graph.getProfilingInfo(), createSuites(), createLIRSuites(), new CompilationResult(), CompilationResultBuilderFactory.Default);
+                        graph.getProfilingInfo(), createSuites(getOptions()), createLIRSuites(getOptions()), new CompilationResult(), CompilationResultBuilderFactory.Default);
     }
 
     /**