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

rev 56282 : [mq]: graal

*** 1,7 ****
  /*
!  * Copyright (c) 2012, 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) 2012, 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.
*** 28,37 ****
--- 28,38 ----
  import static jdk.vm.ci.meta.DeoptimizationReason.OptimizedTypeCheckViolated;
  import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.PRIMARY_SUPERS_LOCATION;
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.SECONDARY_SUPER_CACHE_LOCATION;
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.loadHubIntrinsic;
+ import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.loadHubOrNullIntrinsic;
  import static org.graalvm.compiler.hotspot.replacements.HotspotSnippetsOptions.TypeCheckMaxHints;
  import static org.graalvm.compiler.hotspot.replacements.HotspotSnippetsOptions.TypeCheckMinProfileHitProbability;
  import static org.graalvm.compiler.hotspot.replacements.TypeCheckSnippetUtils.checkSecondarySubType;
  import static org.graalvm.compiler.hotspot.replacements.TypeCheckSnippetUtils.checkUnknownSubType;
  import static org.graalvm.compiler.hotspot.replacements.TypeCheckSnippetUtils.createHints;
*** 134,149 ****
      /**
       * A test against a final type.
       */
      @Snippet
      public static Object instanceofExact(Object object, KlassPointer exactHub, Object trueValue, Object falseValue, @ConstantParameter Counters counters) {
!         if (probability(NOT_FREQUENT_PROBABILITY, object == null)) {
!             counters.isNull.inc();
!             return falseValue;
!         }
!         GuardingNode anchorNode = SnippetAnchorNode.anchor();
!         KlassPointer objectHub = loadHubIntrinsic(PiNode.piCastNonNull(object, anchorNode));
          if (probability(LIKELY_PROBABILITY, objectHub.notEqual(exactHub))) {
              counters.exactMiss.inc();
              return falseValue;
          }
          counters.exactHit.inc();
--- 135,145 ----
      /**
       * A test against a final type.
       */
      @Snippet
      public static Object instanceofExact(Object object, KlassPointer exactHub, Object trueValue, Object falseValue, @ConstantParameter Counters counters) {
!         KlassPointer objectHub = loadHubOrNullIntrinsic(object);
          if (probability(LIKELY_PROBABILITY, objectHub.notEqual(exactHub))) {
              counters.exactMiss.inc();
              return falseValue;
          }
          counters.exactHit.inc();
*** 222,232 ****
          return falseValue;
      }
  
      @Snippet
      public static Object isAssignableFrom(@NonNullParameter Class<?> thisClassNonNull, Class<?> otherClass, Object trueValue, Object falseValue, @ConstantParameter Counters counters) {
!         if (otherClass == null) {
              DeoptimizeNode.deopt(DeoptimizationAction.InvalidateReprofile, DeoptimizationReason.NullCheckException);
              return false;
          }
          GuardingNode anchorNode = SnippetAnchorNode.anchor();
          Class<?> otherClassNonNull = PiNode.piCastNonNullClass(otherClass, anchorNode);
--- 218,228 ----
          return falseValue;
      }
  
      @Snippet
      public static Object isAssignableFrom(@NonNullParameter Class<?> thisClassNonNull, Class<?> otherClass, Object trueValue, Object falseValue, @ConstantParameter Counters counters) {
!         if (BranchProbabilityNode.probability(BranchProbabilityNode.DEOPT_PROBABILITY, otherClass == null)) {
              DeoptimizeNode.deopt(DeoptimizationAction.InvalidateReprofile, DeoptimizationReason.NullCheckException);
              return false;
          }
          GuardingNode anchorNode = SnippetAnchorNode.anchor();
          Class<?> otherClassNonNull = PiNode.piCastNonNullClass(otherClass, anchorNode);