Skip to content

Commit 0bd8317

Browse files
committed
[JDK-8358882] Adapt JDK-8358731: Remove jdk.internal.access.JavaAWTAccess.java
PullRequest: graal/21045
2 parents 6fcc7dc + c5f0d24 commit 0bd8317

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

common.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
11-
"galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-26+2-33", "platformspecific": true, "extrabundles": ["static-libs"]},
11+
"galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-26+2-38", "platformspecific": true, "extrabundles": ["static-libs"]},
1212

1313
"oraclejdk17": {"name": "jpg-jdk", "version": "17.0.7", "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
1414
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunMiscSubstitutions.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,6 @@ private Class<?> defineClass0(String name, byte[] b, int off, int len, ClassLoad
198198

199199
@TargetClass(jdk.internal.access.SharedSecrets.class)
200200
final class Target_jdk_internal_access_SharedSecrets {
201-
@Substitute
202-
private static Target_jdk_internal_access_JavaAWTAccess getJavaAWTAccess() {
203-
return null;
204-
}
205-
206201
/**
207202
* The JavaIOAccess implementation installed by the class initializer of java.io.Console
208203
* captures state like "is a tty". The only way to remove such state is by resetting the field.
@@ -215,10 +210,6 @@ private static Target_jdk_internal_access_JavaAWTAccess getJavaAWTAccess() {
215210
final class Target_jdk_internal_access_JavaIOAccess {
216211
}
217212

218-
@TargetClass(jdk.internal.access.JavaAWTAccess.class)
219-
final class Target_jdk_internal_access_JavaAWTAccess {
220-
}
221-
222213
@TargetClass(className = "sun.reflect.misc.MethodUtil")
223214
final class Target_sun_reflect_misc_MethodUtil {
224215
@Substitute

0 commit comments

Comments
 (0)