Skip to content

Commit ba93245

Browse files
author
Christian Wimmer
committed
[GR-34751] Remove code specific to JDK 8.
PullRequest: graal/10635
2 parents d9b306e + 488d0b5 commit ba93245

File tree

98 files changed

+379
-1665
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+379
-1665
lines changed

‎substratevm/mx.substratevm/suite.py‎

Lines changed: 21 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,17 @@
147147
"requires" : [
148148
"java.instrument",
149149
],
150+
"requiresConcealed" : {
151+
"java.base" : ["jdk.internal.module"],
152+
},
150153
"javaCompliance": "11+",
151154
"annotationProcessors": [
152155
"compiler:GRAAL_PROCESSOR",
153156
],
154157
"checkstyle": "com.oracle.svm.core",
155158
"workingSets": "SVM",
156159
},
160+
157161
"com.oracle.svm.common": {
158162
"subDir": "src",
159163
"sourceDirs": ["src"],
@@ -167,23 +171,6 @@
167171
"checkstyle": "com.oracle.svm.core",
168172
"workingSets": "SVM",
169173
},
170-
"com.oracle.svm.util.jdk11": {
171-
"subDir": "src",
172-
"sourceDirs": ["src"],
173-
"dependencies": [
174-
"com.oracle.svm.util",
175-
],
176-
"requires" : ["java.instrument"],
177-
"requiresConcealed" : {
178-
"java.base" : ["jdk.internal.module"],
179-
},
180-
"javaCompliance": "11+",
181-
"annotationProcessors": [
182-
"compiler:GRAAL_PROCESSOR",
183-
],
184-
"checkstyle": "com.oracle.svm.core",
185-
"workingSets": "SVM",
186-
},
187174

188175
"com.oracle.svm.core": {
189176
"subDir": "src",
@@ -199,6 +186,7 @@
199186
"java.scripting",
200187
"jdk.management",
201188
"jdk.unsupported",
189+
"java.compiler",
202190
],
203191
"requiresConcealed" : {
204192
"java.base" : [
@@ -214,6 +202,14 @@
214202
"sun.util.calendar",
215203
"sun.util.locale.provider",
216204
"sun.util.resources",
205+
"jdk.internal.module",
206+
"jdk.internal.reflect",
207+
"jdk.internal.misc",
208+
"jdk.internal.logger",
209+
"jdk.internal.loader",
210+
"sun.text.spi",
211+
"jdk.internal.perf",
212+
"jdk.internal.loader"
217213
],
218214
"java.desktop": [
219215
"sun.java2d",
@@ -241,38 +237,11 @@
241237
"spotbugs": "false",
242238
},
243239

244-
"com.oracle.svm.core.jdk11": {
245-
"subDir": "src",
246-
"sourceDirs": ["src"],
247-
"dependencies": ["com.oracle.svm.core"],
248-
"requires" : [
249-
"java.logging",
250-
"jdk.unsupported",
251-
"java.compiler",
252-
],
253-
"requiresConcealed" : {
254-
"java.base" : [
255-
"jdk.internal.module",
256-
"jdk.internal.reflect",
257-
"jdk.internal.misc",
258-
"jdk.internal.logger",
259-
"jdk.internal.loader",
260-
"sun.util.resources",
261-
"sun.text.spi",
262-
"jdk.internal.perf",
263-
"sun.util.locale.provider",
264-
"jdk.internal.loader"
265-
],
266-
},
267-
"javaCompliance": "11+",
268-
"checkstyle": "com.oracle.svm.core",
269-
"workingSets": "SVM",
270-
},
271240

272241
"com.oracle.svm.core.jdk17": {
273242
"subDir": "src",
274243
"sourceDirs": ["src"],
275-
"dependencies": ["com.oracle.svm.core.jdk11"],
244+
"dependencies": ["com.oracle.svm.core"],
276245
"requiresConcealed" : {
277246
"java.base" : [
278247
"jdk.internal.access.foreign",
@@ -426,6 +395,7 @@
426395
],
427396
"workingSets": "SVM",
428397
},
398+
429399
"com.oracle.svm.hosted": {
430400
"subDir": "src",
431401
"sourceDirs": ["src"],
@@ -452,9 +422,12 @@
452422
"sun.security.x509",
453423
"sun.util.locale.provider",
454424
"sun.util.resources",
425+
"jdk.internal.module",
426+
"sun.text.spi",
455427
],
456428
"jdk.internal.vm.ci" : [
457429
"jdk.vm.ci.runtime",
430+
"jdk.vm.ci.meta",
458431
],
459432
},
460433
"javaCompliance": "11+",
@@ -465,29 +438,6 @@
465438
"workingSets": "SVM",
466439
},
467440

468-
"com.oracle.svm.hosted.jdk11": {
469-
"subDir": "src",
470-
"sourceDirs": ["src"],
471-
"dependencies": [
472-
"com.oracle.svm.hosted",
473-
"com.oracle.svm.core.jdk11"
474-
],
475-
"requires" : ["java.instrument"],
476-
"requiresConcealed" : {
477-
"jdk.internal.vm.ci": ["jdk.vm.ci.meta"],
478-
"java.base": [
479-
"jdk.internal.module",
480-
"sun.text.spi",
481-
"sun.util.resources"
482-
],
483-
},
484-
"javaCompliance": "11+",
485-
"checkstyle" : "com.oracle.svm.hosted",
486-
"annotationProcessors": [
487-
"compiler:GRAAL_PROCESSOR",
488-
],
489-
"workingSets": "SVM",
490-
},
491441
"com.oracle.svm.hosted.jdk17": {
492442
"subDir": "src",
493443
"sourceDirs": ["src"],
@@ -706,20 +656,6 @@
706656
"spotbugs": "false",
707657
},
708658

709-
"com.oracle.svm.driver.jdk11": {
710-
"subDir": "src",
711-
"sourceDirs": [
712-
"src",
713-
],
714-
"checkstyle": "com.oracle.svm.driver",
715-
"workingSets": "SVM",
716-
"annotationProcessors": [
717-
"compiler:GRAAL_PROCESSOR",
718-
],
719-
"javaCompliance" : "11+",
720-
"spotbugs": "false",
721-
},
722-
723659
"com.oracle.svm.junit": {
724660
"subDir": "src",
725661
"sourceDirs": [
@@ -748,7 +684,9 @@
748684
"SVM",
749685
],
750686
"requires": [
751-
"jdk.unsupported"
687+
"jdk.unsupported",
688+
"java.compiler",
689+
"jdk.jfr",
752690
],
753691
"requiresConcealed": {
754692
"java.base": [
@@ -764,28 +702,6 @@
764702
"spotbugs": "false",
765703
},
766704

767-
"com.oracle.svm.test.jdk11": {
768-
"subDir": "src",
769-
"sourceDirs": ["src"],
770-
"dependencies": [
771-
"mx:JUNIT_TOOL",
772-
"sdk:GRAAL_SDK",
773-
"SVM",
774-
],
775-
"requires" : [
776-
"java.compiler",
777-
"jdk.jfr",
778-
],
779-
"checkstyle": "com.oracle.svm.core",
780-
"workingSets": "SVM",
781-
"annotationProcessors": [
782-
"compiler:GRAAL_PROCESSOR",
783-
],
784-
"javaCompliance": "11+",
785-
"spotbugs": "false",
786-
"testProject": True,
787-
},
788-
789705
"com.oracle.svm.configure.test": {
790706
"subDir": "src",
791707
"sourceDirs": ["src"],
@@ -1092,22 +1008,6 @@
10921008
"spotbugs": "false",
10931009
},
10941010

1095-
"com.oracle.svm.configure.jdk11": {
1096-
"subDir": "src",
1097-
"sourceDirs": [
1098-
"src",
1099-
],
1100-
"dependencies": [
1101-
"com.oracle.svm.configure",
1102-
],
1103-
"checkstyle": "com.oracle.svm.driver",
1104-
"workingSets": "SVM",
1105-
"annotationProcessors": [
1106-
],
1107-
"javaCompliance": "11+",
1108-
"spotbugs": "false",
1109-
},
1110-
11111011
"com.oracle.svm.jvmtiagentbase": {
11121012
"subDir": "src",
11131013
"sourceDirs": [
@@ -1192,10 +1092,8 @@
11921092
"com.oracle.svm.graal",
11931093
"com.oracle.svm.truffle",
11941094
"com.oracle.svm.hosted",
1195-
"com.oracle.svm.hosted.jdk11",
11961095
"com.oracle.svm.hosted.jdk17",
11971096
"com.oracle.svm.core",
1198-
"com.oracle.svm.core.jdk11",
11991097
"com.oracle.svm.core.jdk17",
12001098
"com.oracle.svm.core.graal.amd64",
12011099
"com.oracle.svm.core.graal.aarch64",
@@ -1451,7 +1349,6 @@
14511349
"mainClass": "com.oracle.svm.driver.NativeImage",
14521350
"dependencies": [
14531351
"com.oracle.svm.driver",
1454-
"com.oracle.svm.driver.jdk11",
14551352
"svm-compiler-flags-builder",
14561353
],
14571354
"distDependencies": [
@@ -1525,7 +1422,6 @@
15251422
"mainClass": "com.oracle.svm.configure.ConfigurationTool",
15261423
"dependencies": [
15271424
"com.oracle.svm.configure",
1528-
"com.oracle.svm.configure.jdk11",
15291425
],
15301426
"distDependencies": [
15311427
"LIBRARY_SUPPORT",
@@ -1545,7 +1441,6 @@
15451441
"dependencies": [
15461442
"com.oracle.svm.common",
15471443
"com.oracle.svm.util",
1548-
"com.oracle.svm.util.jdk11",
15491444
],
15501445
"distDependencies": [
15511446
"compiler:GRAAL",
@@ -1627,20 +1522,6 @@
16271522
"testDistribution" : True,
16281523
},
16291524

1630-
"SVM_TESTS_JDK11" : {
1631-
"subDir": "src",
1632-
"relpath" : True,
1633-
"dependencies" : [
1634-
"com.oracle.svm.test.jdk11",
1635-
],
1636-
"distDependencies": [
1637-
"mx:JUNIT_TOOL",
1638-
"SVM",
1639-
],
1640-
"javaCompliance": "11+",
1641-
"testDistribution" : True,
1642-
},
1643-
16441525
"POLYGLOT_NATIVE_API" : {
16451526
"subDir": "src",
16461527
"dependencies": [

‎substratevm/src/com.oracle.svm.configure.jdk11/src/com/oracle/svm/configure/jdk11/filters/ModuleFilterTools.java‎ renamed to ‎substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/jdk11/filters/ModuleFilterTools.java‎

File renamed without changes.

‎substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/SunMiscSubstitutions.java‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@
4242
import com.oracle.svm.core.annotate.AutomaticFeature;
4343
import com.oracle.svm.core.annotate.Substitute;
4444
import com.oracle.svm.core.annotate.TargetClass;
45-
import com.oracle.svm.core.annotate.TargetElement;
4645
import com.oracle.svm.core.headers.LibC;
47-
import com.oracle.svm.core.jdk.JDK11OrLater;
48-
import com.oracle.svm.core.jdk.JDK8OrEarlier;
4946
import com.oracle.svm.core.jdk.RuntimeSupport;
5047
import com.oracle.svm.core.log.Log;
5148
import com.oracle.svm.core.os.IsDefined;
@@ -72,14 +69,7 @@ public String apply(TargetClass annotation) {
7269
final class Target_jdk_internal_misc_Signal {
7370

7471
@Substitute
75-
@TargetElement(onlyWith = JDK8OrEarlier.class)
76-
private static /* native */ int findSignal(String signalName) {
77-
return Util_jdk_internal_misc_Signal.numberFromName(signalName);
78-
}
79-
80-
@Substitute
81-
@TargetElement(onlyWith = JDK11OrLater.class)
82-
private static /* native */ int findSignal0(String signalName) {
72+
private static int findSignal0(String signalName) {
8373
return Util_jdk_internal_misc_Signal.numberFromName(signalName);
8474
}
8575

@@ -416,7 +406,7 @@ public void run() {
416406
}
417407
}
418408

419-
@TargetClass(className = "jdk.internal.misc.VM", onlyWith = JDK11OrLater.class)
409+
@TargetClass(className = "jdk.internal.misc.VM")
420410
final class Target_jdk_internal_misc_VM {
421411

422412
/* Implementation from src/hotspot/share/prims/jvm.cpp#L286 translated to Java. */

‎substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Reference.java‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,8 @@
4949
import com.oracle.svm.core.annotate.TargetElement;
5050
import com.oracle.svm.core.annotate.Uninterruptible;
5151
import com.oracle.svm.core.annotate.UnknownClass;
52-
import com.oracle.svm.core.jdk.JDK11OrLater;
5352
import com.oracle.svm.core.jdk.JDK17OrLater;
5453
import com.oracle.svm.core.jdk.JDK17_0_2OrLater;
55-
import com.oracle.svm.core.jdk.JDK8OrEarlier;
5654
import com.oracle.svm.core.util.VMError;
5755
import com.oracle.svm.util.ReflectionUtil;
5856

@@ -159,45 +157,17 @@ boolean refersTo0(Object obj) {
159157
@KeepOriginal
160158
native boolean isEnqueued();
161159

162-
@Substitute
163-
@TargetElement(onlyWith = JDK8OrEarlier.class)
164-
@SuppressWarnings("unused")
165-
static boolean tryHandlePending(boolean waitForNotify) {
166-
/*
167-
* This method in JDK 8 was replaced by waitForReferenceProcessing in JDK 11. On JDK 8, it
168-
* helped with reference handling by handling a single reference (if one is available). The
169-
* only caller (apart from the reference handling thread itself) in the JDK is
170-
* `Bits.reserveMemory`, which passes `false` as the parameter `waitForNotify`. So our
171-
* substitution, which always waits, is a considerable change in semantics. However, since
172-
* `Bits.reserveMemory` did not change much between JDK 8 and JDK 11, this is OK.
173-
*/
174-
try {
175-
return ReferenceInternals.waitForReferenceProcessing();
176-
} catch (InterruptedException ex) {
177-
Thread.currentThread().interrupt();
178-
/*
179-
* The caller might loop until "there is no more progress", i.e., until this method
180-
* returns false. So returning true could lead to an infinite loop in the caller that is
181-
* not interruptible.
182-
*/
183-
return false;
184-
}
185-
}
186-
187160
/** May be used by {@code JavaLangRefAccess} via {@code SharedSecrets}. */
188161
@Substitute
189-
@TargetElement(onlyWith = JDK11OrLater.class)
190162
static boolean waitForReferenceProcessing() throws InterruptedException {
191163
return ReferenceInternals.waitForReferenceProcessing();
192164
}
193165

194166
@Override
195167
@KeepOriginal //
196-
@TargetElement(onlyWith = JDK11OrLater.class) //
197168
protected native Object clone() throws CloneNotSupportedException;
198169

199170
@Substitute //
200-
@TargetElement(onlyWith = JDK11OrLater.class) //
201171
@SuppressWarnings("unused")
202172
static void reachabilityFence(Object ref) {
203173
GraalDirectives.blackhole(ref);

0 commit comments

Comments
 (0)