[GR-64888] Minor access fixes

PullRequest: graal/20774

Author: tkrodriguez

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PartialEscapeUnsafeStoreTest.java

@@ -24,9 +24,10 @@
  */
 package jdk.graal.compiler.core.test.ea;
 
-import jdk.graal.compiler.core.test.GraalCompilerTest;
 import org.junit.Test;
 
+import jdk.graal.compiler.core.test.GraalCompilerTest;
+
 /**
  * Exercise a mix of unsafe and normal reads ands writes in situations where EA might attempt to
  * fold the operations.
@@ -557,7 +558,7 @@ public void testByteArrayWithIntStoreAndRead() {
     }
 
     public static byte testByteArrayWithLongStoreAndReadSnippet(long v) {
-        byte[] b = new byte[4];
+        byte[] b = new byte[8];
         UNSAFE.putLong(b, byteArrayBaseOffset, v);
         return b[(byteSize / longSize) + 1];
     }
@@ -579,7 +580,7 @@ public void testByteArrayWithFloatStoreAndRead() {
     }
 
     public static byte testByteArrayWithDoubleStoreAndReadSnippet(double v) {
-        byte[] b = new byte[4];
+        byte[] b = new byte[8];
         UNSAFE.putDouble(b, byteArrayBaseOffset, v);
         return b[(byteSize / doubleSize) + 1];
     }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java

@@ -996,7 +996,7 @@ private void lowerOSRStartNode(OSRStartNode osrStart) {
                 graph.addBeforeFixed(migrationEnd, loadDisplacedHeader);
 
                 // we need to initialize the stack slot for the lock
-                BeginLockScopeNode beginLockScope = graph.add(new BeginLockScopeNode(lock.getStackKind(), monitorID.getLockDepth()));
+                BeginLockScopeNode beginLockScope = graph.add(new BeginLockScopeNode(replacements.getProviders().getWordTypes(), monitorID.getLockDepth()));
                 graph.addBeforeFixed(migrationEnd, beginLockScope);
 
                 // write the displaced mark to the correct stack slot

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/BeginLockScopeNode.java

@@ -28,6 +28,8 @@
 import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
 import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
+import org.graalvm.word.LocationIdentity;
+
 import jdk.graal.compiler.core.common.type.StampFactory;
 import jdk.graal.compiler.graph.NodeClass;
 import jdk.graal.compiler.hotspot.HotSpotLIRGenerator;
@@ -40,9 +42,6 @@
 import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import jdk.graal.compiler.word.Word;
 import jdk.graal.compiler.word.WordTypes;
-import org.graalvm.word.LocationIdentity;
-
-import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.Value;
 
 /**
@@ -62,11 +61,6 @@ public BeginLockScopeNode(@InjectedNodeParameter WordTypes wordTypes, int lockDe
         this.lockDepth = lockDepth;
     }
 
-    public BeginLockScopeNode(JavaKind kind, int lockDepth) {
-        super(TYPE, StampFactory.forKind(kind));
-        this.lockDepth = lockDepth;
-    }
-
     @Override
     public boolean hasSideEffect() {
         return false;