src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ArraySubstitutions.java

rev 56282 : [mq]: graal

*** 1,7 ****
  /*
!  * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 27,36 ****
--- 27,37 ----
  import java.lang.reflect.Array;
  
  import org.graalvm.compiler.api.replacements.ClassSubstitution;
  import org.graalvm.compiler.api.replacements.MethodSubstitution;
  import org.graalvm.compiler.nodes.DeoptimizeNode;
+ import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
  import org.graalvm.compiler.nodes.java.ArrayLengthNode;
  
  import jdk.vm.ci.meta.DeoptimizationAction;
  import jdk.vm.ci.meta.DeoptimizationReason;
  
*** 42,52 ****
  @ClassSubstitution(Array.class)
  public class ArraySubstitutions {
  
      @MethodSubstitution
      public static int getLength(Object array) {
!         if (!array.getClass().isArray()) {
              DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint);
          }
          return ArrayLengthNode.arrayLength(array);
      }
  
--- 43,53 ----
  @ClassSubstitution(Array.class)
  public class ArraySubstitutions {
  
      @MethodSubstitution
      public static int getLength(Object array) {
!         if (BranchProbabilityNode.probability(BranchProbabilityNode.DEOPT_PROBABILITY, !array.getClass().isArray())) {
              DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint);
          }
          return ArrayLengthNode.arrayLength(array);
      }