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

*** 24,41 ****
  
  package org.graalvm.compiler.hotspot.replacements;
  
  import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_INTRINSIC_CONTEXT;
  import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_METAACCESS;
! import static org.graalvm.compiler.serviceprovider.GraalServices.Java8OrEarlier;
  
  import org.graalvm.compiler.api.replacements.ClassSubstitution;
  import org.graalvm.compiler.api.replacements.MethodSubstitution;
  import org.graalvm.compiler.hotspot.HotSpotBackend;
  import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
  import org.graalvm.compiler.nodes.PiNode;
  import org.graalvm.compiler.nodes.extended.RawLoadNode;
  import org.graalvm.compiler.replacements.ReplacementsUtil;
  import org.graalvm.compiler.word.Word;
  import jdk.internal.vm.compiler.word.LocationIdentity;
  import jdk.internal.vm.compiler.word.WordFactory;
  
--- 24,44 ----
  
  package org.graalvm.compiler.hotspot.replacements;
  
  import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_INTRINSIC_CONTEXT;
  import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_METAACCESS;
! import static org.graalvm.compiler.serviceprovider.JavaVersionUtil.Java8OrEarlier;
  
  import org.graalvm.compiler.api.replacements.ClassSubstitution;
+ import org.graalvm.compiler.api.replacements.Fold;
+ import org.graalvm.compiler.api.replacements.Fold.InjectedParameter;
  import org.graalvm.compiler.api.replacements.MethodSubstitution;
  import org.graalvm.compiler.hotspot.HotSpotBackend;
  import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
  import org.graalvm.compiler.nodes.PiNode;
  import org.graalvm.compiler.nodes.extended.RawLoadNode;
+ import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
  import org.graalvm.compiler.replacements.ReplacementsUtil;
  import org.graalvm.compiler.word.Word;
  import jdk.internal.vm.compiler.word.LocationIdentity;
  import jdk.internal.vm.compiler.word.WordFactory;
  
*** 47,62 ****
      public static final String implCompressName = Java8OrEarlier ? "implCompress" : "implCompress0";
  
      @MethodSubstitution(isStatic = false)
      static void implCompress0(Object receiver, byte[] buf, int ofs) {
          Object realReceiver = PiNode.piCastNonNull(receiver, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
!         Object state = RawLoadNode.load(realReceiver, stateOffset(), JavaKind.Object, LocationIdentity.any());
          Word bufAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(buf, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + ofs));
          Word stateAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(state, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Int)));
          HotSpotBackend.shaImplCompressStub(bufAddr, stateAddr);
      }
  
!     static long stateOffset() {
!         return HotSpotReplacementsUtil.getFieldOffset(HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT), "state");
      }
  
  }
--- 50,66 ----
      public static final String implCompressName = Java8OrEarlier ? "implCompress" : "implCompress0";
  
      @MethodSubstitution(isStatic = false)
      static void implCompress0(Object receiver, byte[] buf, int ofs) {
          Object realReceiver = PiNode.piCastNonNull(receiver, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
!         Object state = RawLoadNode.load(realReceiver, stateOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
          Word bufAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(buf, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + ofs));
          Word stateAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(state, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Int)));
          HotSpotBackend.shaImplCompressStub(bufAddr, stateAddr);
      }
  
!     @Fold
!     static long stateOffset(@InjectedParameter IntrinsicContext context) {
!         return HotSpotReplacementsUtil.getFieldOffset(HotSpotReplacementsUtil.methodHolderClass(context), "state");
      }
  
  }