src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeNode.java

rev 52509 : [mq]: graal

*** 22,32 ****
   */
  
  
  package org.graalvm.compiler.nodes;
  
! import jdk.vm.ci.meta.JavaKind;
  
  import org.graalvm.compiler.core.common.type.Stamp;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.graph.NodeClass;
  import org.graalvm.compiler.nodeinfo.InputType;
--- 22,44 ----
   */
  
  
  package org.graalvm.compiler.nodes;
  
! import static org.graalvm.compiler.nodeinfo.InputType.Extension;
! import static org.graalvm.compiler.nodeinfo.InputType.Memory;
! import static org.graalvm.compiler.nodeinfo.InputType.State;
! import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
! import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
! import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
! import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
! import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
! import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
! import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
! import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
! 
! import java.util.Map;
  
  import org.graalvm.compiler.core.common.type.Stamp;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.graph.NodeClass;
  import org.graalvm.compiler.nodeinfo.InputType;
*** 43,65 ****
  import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
  import org.graalvm.compiler.nodes.spi.UncheckedInterfaceProvider;
  import org.graalvm.compiler.nodes.util.GraphUtil;
  import jdk.internal.vm.compiler.word.LocationIdentity;
  
! import java.util.Map;
! 
! import static org.graalvm.compiler.nodeinfo.InputType.Extension;
! import static org.graalvm.compiler.nodeinfo.InputType.Memory;
! import static org.graalvm.compiler.nodeinfo.InputType.State;
! import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
! import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
! import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
! import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
! import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
! import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
! import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
! import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
  
  /**
   * The {@code InvokeNode} represents all kinds of method calls.
   */
  // @formatter:off
--- 55,65 ----
  import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
  import org.graalvm.compiler.nodes.spi.UncheckedInterfaceProvider;
  import org.graalvm.compiler.nodes.util.GraphUtil;
  import jdk.internal.vm.compiler.word.LocationIdentity;
  
! import jdk.vm.ci.meta.JavaKind;
  
  /**
   * The {@code InvokeNode} represents all kinds of method calls.
   */
  // @formatter:off
*** 248,258 ****
          return classInit;
      }
  
      @Override
      public NodeCycles estimatedNodeCycles() {
!         switch (callTarget().invokeKind()) {
              case Interface:
                  return CYCLES_64;
              case Special:
              case Static:
                  return CYCLES_2;
--- 248,261 ----
          return classInit;
      }
  
      @Override
      public NodeCycles estimatedNodeCycles() {
!         if (callTarget == null) {
!             return CYCLES_UNKNOWN;
!         }
!         switch (callTarget.invokeKind()) {
              case Interface:
                  return CYCLES_64;
              case Special:
              case Static:
                  return CYCLES_2;
*** 263,273 ****
          }
      }
  
      @Override
      public NodeSize estimatedNodeSize() {
!         switch (callTarget().invokeKind()) {
              case Interface:
                  return SIZE_64;
              case Special:
              case Static:
                  return SIZE_2;
--- 266,279 ----
          }
      }
  
      @Override
      public NodeSize estimatedNodeSize() {
!         if (callTarget == null) {
!             return SIZE_UNKNOWN;
!         }
!         switch (callTarget.invokeKind()) {
              case Interface:
                  return SIZE_64;
              case Special:
              case Static:
                  return SIZE_2;