Skip to content

Commit eef7202

Browse files
committed
removed remaining biased locking code
1 parent 8080a1e commit eef7202

File tree

3 files changed

+4
-21
lines changed

3 files changed

+4
-21
lines changed

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@ default JavaConstant getJavaMirror() {
105105

106106
int superCheckOffset();
107107

108-
long prototypeMarkWord();
109-
110108
int layoutHelper();
111109

112110
@Override

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,12 +1079,6 @@ public int superCheckOffset() {
10791079
return UNSAFE.getInt(getKlassPointer() + config.superCheckOffsetOffset);
10801080
}
10811081

1082-
@Override
1083-
public long prototypeMarkWord() {
1084-
HotSpotVMConfig config = config();
1085-
return config.prototypeMarkWord();
1086-
}
1087-
10881082
@Override
10891083
public ResolvedJavaField findInstanceFieldWithOffset(long offset, JavaKind expectedEntryKind) {
10901084
ResolvedJavaField[] declaredFields = getInstanceFields(true);

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotVMConfig.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
*/
2323
package jdk.vm.ci.hotspot;
2424

25-
import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
26-
import static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
27-
28-
import jdk.vm.ci.common.JVMCIError;
2925
import jdk.internal.misc.Unsafe;
3026
import jdk.internal.util.Architecture;
27+
import jdk.vm.ci.common.JVMCIError;
3128

3229
import java.util.Objects;
3330

31+
import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
32+
import static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
33+
3434
/**
3535
* Used to access native configuration details.
3636
* <p>
@@ -136,15 +136,6 @@ static String getHostArchitectureName() {
136136
// This is only valid on AMD64.
137137
final int runtimeCallStackSize = getConstant("frame::arg_reg_save_area_bytes", Integer.class, Architecture.isX64() ? null : 0);
138138

139-
private final int markWordNoHashInPlace = getConstant("markWord::no_hash_in_place", Integer.class);
140-
private final int markWordNoLockInPlace = getConstant("markWord::no_lock_in_place", Integer.class);
141-
142-
/**
143-
* See {@code markWord::prototype()}.
144-
*/
145-
long prototypeMarkWord() {
146-
return markWordNoHashInPlace | markWordNoLockInPlace;
147-
}
148139

149140
final int methodAccessFlagsOffset = getFieldOffset("Method::_access_flags", Integer.class, "AccessFlags");
150141
final int methodConstMethodOffset = getFieldOffset("Method::_constMethod", Integer.class, "ConstMethod*");

0 commit comments

Comments
 (0)