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

rev 56282 : [mq]: graal

*** 111,120 ****
--- 111,121 ----
  import org.graalvm.compiler.nodes.NodeView;
  import org.graalvm.compiler.nodes.ReturnNode;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.ValueNode;
  import org.graalvm.compiler.nodes.debug.DynamicCounterNode;
+ import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
  import org.graalvm.compiler.nodes.extended.ForeignCallNode;
  import org.graalvm.compiler.nodes.extended.MembarNode;
  import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
  import org.graalvm.compiler.nodes.java.MonitorExitNode;
  import org.graalvm.compiler.nodes.java.RawMonitorEnterNode;
*** 472,482 ****
       */
      @Snippet
      public static void monitorenterStub(Object object, @ConstantParameter int lockDepth, @ConstantParameter boolean trace) {
          verifyOop(object);
          incCounter();
!         if (object == null) {
              DeoptimizeNode.deopt(DeoptimizationAction.InvalidateReprofile, DeoptimizationReason.NullCheckException);
          }
          // BeginLockScope nodes do not read from object so a use of object
          // cannot float about the null check above
          final Word lock = beginLockScope(lockDepth);
--- 473,483 ----
       */
      @Snippet
      public static void monitorenterStub(Object object, @ConstantParameter int lockDepth, @ConstantParameter boolean trace) {
          verifyOop(object);
          incCounter();
!         if (BranchProbabilityNode.probability(BranchProbabilityNode.DEOPT_PROBABILITY, object == null)) {
              DeoptimizeNode.deopt(DeoptimizationAction.InvalidateReprofile, DeoptimizationReason.NullCheckException);
          }
          // BeginLockScope nodes do not read from object so a use of object
          // cannot float about the null check above
          final Word lock = beginLockScope(lockDepth);