--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/profiling/MoveProfilingPhase.java	2017-03-20 17:40:08.000000000 -0700
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/profiling/MoveProfilingPhase.java	2017-03-20 17:40:08.000000000 -0700
@@ -37,8 +37,8 @@
 import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase;
 import org.graalvm.compiler.lir.profiling.MoveProfiler.MoveStatistics;
 import org.graalvm.compiler.options.Option;
+import org.graalvm.compiler.options.OptionKey;
 import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValue;
 
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.JavaConstant;
@@ -54,7 +54,7 @@
     public static class Options {
         // @formatter:off
         @Option(help = "Enable dynamic move profiling per method.", type = OptionType.Debug)
-        public static final OptionValue<Boolean> LIRDynMoveProfilMethod = new OptionValue<>(false);
+        public static final OptionKey<Boolean> LIRDynMoveProfileMethod = new OptionKey<>(false);
         // @formatter:on
     }
 
@@ -121,7 +121,7 @@
             int size = names.size();
             if (size > 0) { // Don't pollute LIR when nothing has to be done
                 assert size > 0 && size == groups.size() && size == increments.size();
-                List<LIRInstruction> instructions = lirGenRes.getLIR().getLIRforBlock(block);
+                ArrayList<LIRInstruction> instructions = lirGenRes.getLIR().getLIRforBlock(block);
                 LIRInstruction inst = diagnosticLirGenTool.createMultiBenchmarkCounter(names.toArray(new String[size]), groups.toArray(new String[size]),
                                 increments.toArray(new Value[size]));
                 assert inst != null;
@@ -139,7 +139,7 @@
         }
 
         protected String createGroupName() {
-            if (Options.LIRDynMoveProfilMethod.getValue()) {
+            if (Options.LIRDynMoveProfileMethod.getValue(lirGenRes.getLIR().getOptions())) {
                 return new StringBuilder('"').append(MOVE_OPERATIONS).append(':').append(lirGenRes.getCompilationUnitName()).append('"').toString();
             }
             return MOVE_OPERATIONS;