*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java	Mon Mar 20 17:38:05 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java	Mon Mar 20 17:38:05 2017

*** 32,41 ****
--- 32,42 ----
  import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider;
  import org.graalvm.compiler.nodes.calc.FixedBinaryNode;
  import org.graalvm.compiler.nodes.calc.FloatConvertNode;
  import org.graalvm.compiler.nodes.calc.RemNode;
  import org.graalvm.compiler.nodes.spi.LoweringTool;
+ import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.replacements.aarch64.AArch64FloatArithmeticSnippets;
  import org.graalvm.compiler.replacements.aarch64.AArch64IntegerArithmeticSnippets;
  
  import jdk.vm.ci.code.TargetDescription;
  import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider;

*** 50,63 ****
--- 51,64 ----
                      HotSpotConstantReflectionProvider constantReflection, TargetDescription target) {
          super(runtime, metaAccess, foreignCalls, registers, constantReflection, target);
      }
  
      @Override
!     public void initialize(OptionValues options, HotSpotProviders providers, GraalHotSpotVMConfig config) {
!         integerArithmeticSnippets = new AArch64IntegerArithmeticSnippets(options, providers, providers.getSnippetReflection(), providers.getCodeCache().getTarget());
!         floatArithmeticSnippets = new AArch64FloatArithmeticSnippets(providers, providers.getSnippetReflection(), providers.getCodeCache().getTarget());
!         super.initialize(providers, config);
!         floatArithmeticSnippets = new AArch64FloatArithmeticSnippets(options, providers, providers.getSnippetReflection(), providers.getCodeCache().getTarget());
!         super.initialize(options, providers, config);
      }
  
      @Override
      public void lower(Node n, LoweringTool tool) {
          if (n instanceof FixedBinaryNode) {