*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/NewObjectSnippets.java	Mon Jun 26 15:43:51 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/NewObjectSnippets.java	Mon Jun 26 15:43:51 2017

*** 84,94 ****
--- 84,93 ----
  import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider;
  import org.graalvm.compiler.hotspot.nodes.DimensionsNode;
  import org.graalvm.compiler.hotspot.nodes.aot.LoadConstantIndirectlyFixedNode;
  import org.graalvm.compiler.hotspot.nodes.aot.LoadConstantIndirectlyNode;
  import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp;
  import org.graalvm.compiler.hotspot.replacements.aot.ResolveConstantSnippets;
  import org.graalvm.compiler.hotspot.word.KlassPointer;
  import org.graalvm.compiler.nodes.ConstantNode;
  import org.graalvm.compiler.nodes.DeoptimizeNode;
  import org.graalvm.compiler.nodes.PiNode;
  import org.graalvm.compiler.nodes.PrefetchAllocateNode;

*** 298,311 ****
--- 297,308 ----
  
      @Snippet
      public static Object allocateArrayPIC(KlassPointer hub, int length, Word prototypeMarkWord, @ConstantParameter int headerSize, @ConstantParameter int log2ElementSize,
                      @ConstantParameter boolean fillContents, @ConstantParameter Register threadRegister, @ConstantParameter boolean maybeUnroll, @ConstantParameter String typeContext,
                      @ConstantParameter OptionValues options, @ConstantParameter Counters counters) {
          // We need to resolve array type. While element type is guaranteed to be initialized, we
          // cannot guarantee initialization of the array class if NewArrayInstance comes from
          // canonicalization of DynamicNewArrayInstance.
          KlassPointer picHub = ResolveConstantSnippets.pureInitializeKlass(hub);
+         // Array type would be resolved by dominating resolution.
+         KlassPointer picHub = LoadConstantIndirectlyFixedNode.loadKlass(hub);
          return allocateArrayImpl(picHub, length, prototypeMarkWord, headerSize, log2ElementSize, fillContents, threadRegister, maybeUnroll, typeContext, false, options, counters);
      }
  
      @Snippet
      public static Object allocateArray(KlassPointer hub, int length, Word prototypeMarkWord, @ConstantParameter int headerSize, @ConstantParameter int log2ElementSize,

*** 417,426 ****
--- 414,424 ----
          return newArrayCall(HotSpotBackend.NEW_MULTI_ARRAY, hub, rank, dims);
      }
  
      @Snippet
      public static Object newmultiarrayPIC(KlassPointer hub, @ConstantParameter int rank, @VarargsParameter int[] dimensions) {
+         // Array type would be resolved by dominating resolution.
          KlassPointer picHub = LoadConstantIndirectlyFixedNode.loadKlass(hub);
          return newmultiarray(picHub, rank, dimensions);
      }
  
      @NodeIntrinsic(value = ForeignCallNode.class, injectedStampIsNonNull = true)