--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ArrayStoreExceptionStub.java	2017-03-20 17:39:05.000000000 -0700
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ArrayStoreExceptionStub.java	2017-03-20 17:39:05.000000000 -0700
@@ -29,6 +29,7 @@
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
 import org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil;
 import org.graalvm.compiler.hotspot.word.KlassPointer;
+import org.graalvm.compiler.options.OptionValues;
 
 import jdk.vm.ci.code.Register;
 
@@ -36,8 +37,8 @@
  */
 public class ArrayStoreExceptionStub extends CreateExceptionStub {
 
-    public ArrayStoreExceptionStub(HotSpotProviders providers, HotSpotForeignCallLinkage linkage) {
-        super("createArrayStoreException", providers, linkage);
+    public ArrayStoreExceptionStub(OptionValues options, HotSpotProviders providers, HotSpotForeignCallLinkage linkage) {
+        super("createArrayStoreException", options, providers, linkage);
     }
 
     @Override
@@ -47,7 +48,7 @@
     }
 
     @Snippet
-    private static Object createArrayStoreException(Object object, @ConstantParameter Register threadRegister) {
+    private static Object createArrayStoreException(@Snippet.NonNullParameter Object object, @ConstantParameter Register threadRegister) {
         KlassPointer klass = HotSpotReplacementsUtil.loadHub(object);
         return createException(threadRegister, ArrayStoreException.class, klass);
     }