Skip to content

Commit e19371d

Browse files
committed
Fix incorrect type for BeginLockScopeNoode
1 parent 385070e commit e19371d

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ private void lowerOSRStartNode(OSRStartNode osrStart) {
996996
graph.addBeforeFixed(migrationEnd, loadDisplacedHeader);
997997

998998
// we need to initialize the stack slot for the lock
999-
BeginLockScopeNode beginLockScope = graph.add(new BeginLockScopeNode(lock.getStackKind(), monitorID.getLockDepth()));
999+
BeginLockScopeNode beginLockScope = graph.add(new BeginLockScopeNode(replacements.getProviders().getWordTypes(), monitorID.getLockDepth()));
10001000
graph.addBeforeFixed(migrationEnd, beginLockScope);
10011001

10021002
// write the displaced mark to the correct stack slot

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
2929
import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
3030

31+
import org.graalvm.word.LocationIdentity;
32+
3133
import jdk.graal.compiler.core.common.type.StampFactory;
3234
import jdk.graal.compiler.graph.NodeClass;
3335
import jdk.graal.compiler.hotspot.HotSpotLIRGenerator;
@@ -40,9 +42,6 @@
4042
import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
4143
import jdk.graal.compiler.word.Word;
4244
import jdk.graal.compiler.word.WordTypes;
43-
import org.graalvm.word.LocationIdentity;
44-
45-
import jdk.vm.ci.meta.JavaKind;
4645
import jdk.vm.ci.meta.Value;
4746

4847
/**
@@ -62,11 +61,6 @@ public BeginLockScopeNode(@InjectedNodeParameter WordTypes wordTypes, int lockDe
6261
this.lockDepth = lockDepth;
6362
}
6463

65-
public BeginLockScopeNode(JavaKind kind, int lockDepth) {
66-
super(TYPE, StampFactory.forKind(kind));
67-
this.lockDepth = lockDepth;
68-
}
69-
7064
@Override
7165
public boolean hasSideEffect() {
7266
return false;

0 commit comments

Comments
 (0)