[GR-42220] Support compiling substratevm with JDK 20.

PullRequest: graal/13449

Author: pejovica

substratevm/ci/ci.jsonnet

@@ -50,15 +50,11 @@
     },
   }),
 
-  local linux_amd64_jdk17 = common.linux_amd64   + common.labsjdk17,
-  local linux_amd64_jdk19 = common.linux_amd64   + common.labsjdk19,
-  local darwin_jdk17      = common.darwin_amd64  + common.labsjdk17,
-  local windows_jdk17     = common.windows_amd64 + common.labsjdk17 + common.devkits["windows-jdk17"],
-
   // JDKs
   local jdk_name_to_dict = {
     "jdk17"+: common.labsjdk17,
     "jdk19"+: common.labsjdk19,
+    "jdk20"+: common.labsjdk20,
   },
 
   local default_os_arch = {
@@ -82,23 +78,27 @@
       tools.delete_timelimit(jdk_name_to_dict[b.jdk] + default_os_arch[b.os][b.arch])
   })),
 
-  local no_jobs = {
-    "<all-os>"+: run_spec.exclude,
+  local all_jobs = {
+    "windows:aarch64"+: exclude,
+  },
+  local no_jobs = all_jobs {
+    "*"+: exclude,
   },
+
   local feature_map = {
     libc: {
-      musl: {
-        "<all-os>"+: exclude + use_musl,
+      musl: no_jobs {
+        "*"+: use_musl,
       },
     },
     optlevel: {
-      quickbuild: {
-        "<all-os>"+: exclude + add_quickbuild,
+      quickbuild: no_jobs {
+        "*"+: add_quickbuild,
       },
     },
     "java-compiler": {
-      ecj: {
-        "<all-os>"+: exclude + sg.use_ecj,
+      ecj: no_jobs {
+        "*"+: sg.use_ecj,
       },
     },
   },
@@ -108,10 +108,10 @@
 
   // START MAIN BUILD DEFINITION
   local task_dict = {
-    "style-fullbuild": mxgate("fullbuild,style,nativeimagehelp") + eclipse + jdt + maven + jsonschema + mx_build_exploded + gdb("10.2") + platform_spec(no_jobs) + platform_spec({
-      "linux:amd64:jdk17": gate + t("30:00"),
+    "style-fullbuild": mxgate("fullbuild,style,nativeimagehelp") + eclipse + jdt + maven + mx_build_exploded + gdb("10.2") + platform_spec(no_jobs) + platform_spec({
+      "linux:amd64:jdk20": gate + t("30:00"),
     }),
-    "basics": mxgate("build,helloworld,native_unittests,truffle_unittests,debuginfotest,hellomodule") + maven + platform_spec(no_jobs) + platform_spec({
+    "basics": mxgate("build,helloworld,native_unittests,truffle_unittests,debuginfotest,hellomodule") + maven + jsonschema + platform_spec(no_jobs) + platform_spec({
       "linux:amd64:jdk19": gate + gdb("10.2") + t("55:00"),
       "windows:amd64:jdk17": gate + t("1:30:00"),
     }) + variants({

substratevm/mx.substratevm/mx_substratevm.py

@@ -415,7 +415,7 @@ def help_stdout_check(output):
         if t:
             hellomodule(args.extra_image_builder_arguments)
 
-    with Task('Validate JSON build info', tasks, tags=[mx_gate.Tags.style]) as t:
+    with Task('Validate JSON build info', tasks, tags=[GraalTags.helloworld]) as t:
         if t:
             import json
             try:

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfARangesSectionImpl.java

@@ -26,18 +26,19 @@
 
 package com.oracle.objectfile.elf.dwarf;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.graalvm.compiler.debug.DebugContext;
+
 import com.oracle.objectfile.LayoutDecision;
 import com.oracle.objectfile.LayoutDecisionMap;
 import com.oracle.objectfile.ObjectFile;
 import com.oracle.objectfile.debugentry.ClassEntry;
 import com.oracle.objectfile.debugentry.CompiledMethodEntry;
 import com.oracle.objectfile.debugentry.Range;
-import org.graalvm.compiler.debug.DebugContext;
-
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * Section generator for debug_aranges section.
@@ -119,7 +120,7 @@ private static int deoptEntrySize(ClassEntry classEntry) {
     }
 
     private static int entrySize(Stream<CompiledMethodEntry> compiledEntries) {
-        int size = 0;
+        long size = 0;
         // allow for header data
         size += DW_AR_HEADER_SIZE;
         // align to 2 * address size.
@@ -128,7 +129,7 @@ private static int entrySize(Stream<CompiledMethodEntry> compiledEntries) {
         size += compiledEntries.count() * (2 * 8);
         // allow for two trailing zeroes to terminate
         size += 2 * 8;
-        return size;
+        return Math.toIntExact(size);
     }
 
     @Override

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfLineSectionImpl.java

@@ -26,18 +26,19 @@
 
 package com.oracle.objectfile.elf.dwarf;
 
+import java.util.Iterator;
+import java.util.Map;
+
+import org.graalvm.compiler.debug.DebugContext;
+
 import com.oracle.objectfile.LayoutDecision;
 import com.oracle.objectfile.LayoutDecisionMap;
 import com.oracle.objectfile.ObjectFile;
 import com.oracle.objectfile.debugentry.ClassEntry;
+import com.oracle.objectfile.debugentry.CompiledMethodEntry;
 import com.oracle.objectfile.debugentry.DirEntry;
 import com.oracle.objectfile.debugentry.FileEntry;
-import com.oracle.objectfile.debugentry.CompiledMethodEntry;
 import com.oracle.objectfile.debugentry.Range;
-import org.graalvm.compiler.debug.DebugContext;
-
-import java.util.Iterator;
-import java.util.Map;
 
 /**
  * Section generator for debug_line section.
@@ -436,7 +437,7 @@ private int writeFileTable(DebugContext context, ClassEntry classEntry, byte[] b
         return pos;
     }
 
-    private int debugLine = 1;
+    private long debugLine = 1;
     private int debugCopyCount = 0;
 
     private int writeCompiledMethodLineInfo(DebugContext context, ClassEntry classEntry, CompiledMethodEntry compiledEntry, byte[] buffer, int p) {

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfLocSectionImpl.java

@@ -295,7 +295,7 @@ private int writeStackLocation(DebugContext context, int offset, byte[] buffer,
         if (sp < 32) {
             // fold the base reg index into the op
             stackOp = DwarfDebugInfo.DW_OP_breg0;
-            stackOp += sp;
+            stackOp += (byte) sp;
         } else {
             // pass base reg index as a ULEB operand
             stackOp = DwarfDebugInfo.DW_OP_bregx;

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/io/AssemblyBuffer.java

@@ -180,7 +180,7 @@ public void writeSLEB128(long v) {
             if ((vv == 0L && (b & 0x40) == 0) || (vv == -1L && (b & 0x40) == 0x40)) {
                 more = false;
             } else {
-                b |= 0x80;
+                b |= (byte) 0x80;
             }
             writeByte(b);
         }

substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinStackOverflowSupport.java

@@ -68,8 +68,8 @@ private static boolean isProtected(int prot) {
     }
 
     @Uninterruptible(reason = "Called from uninterruptible code.")
-    private static int vmComputeStackGuard(UnsignedWord stackend) {
-        int guardsize = 0;
+    private static UnsignedWord vmComputeStackGuardSize(UnsignedWord stackend) {
+        UnsignedWord guardsize = WordFactory.zero();
 
         WordPointer address = StackValue.get(WordPointer.class);
         address.write(stackend);
@@ -85,11 +85,11 @@ private static int vmComputeStackGuard(UnsignedWord stackend) {
             count.write(VM_REGION_SUBMAP_INFO_COUNT_64());
 
             if (mach_vm_region(task, address, size, VM_REGION_BASIC_INFO_64(), info, count, dummyobject) != 0) {
-                return -1;
+                throw VMError.shouldNotReachHere();
             }
 
             if (isProtected(info.protection())) {
-                guardsize += size.read().rawValue();
+                guardsize = guardsize.add(size.read());
             }
 
             UnsignedWord currentAddress = address.read();
@@ -116,8 +116,8 @@ public void lookupStack(WordPointer stackBasePtr, WordPointer stackEndPtr, Unsig
         UnsignedWord stacksize = DarwinPthread.pthread_get_stacksize_np(self);
         stackBasePtr.write(stackaddr);
 
-        int guardsize = vmComputeStackGuard(stackaddr.subtract(stacksize));
-        VMError.guarantee(guardsize >= 0 && guardsize < 100 * 1024);
+        UnsignedWord guardsize = vmComputeStackGuardSize(stackaddr.subtract(stacksize));
+        VMError.guarantee(guardsize.belowThan(100 * 1024));
         VMError.guarantee(stacksize.aboveThan(guardsize));
 
         stacksize = stacksize.subtract(guardsize);

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/Deoptimizer.java

@@ -32,6 +32,7 @@
 import java.nio.ByteOrder;
 import java.util.ArrayList;
 
+import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.core.common.util.TypeConversion;
 import org.graalvm.compiler.options.Option;
 import org.graalvm.compiler.word.BarrieredAccess;
@@ -812,7 +813,7 @@ public static void logRecentDeoptimizationEvents(Log log) {
     private VirtualFrame constructTargetFrame(CodeInfoQueryResult targetInfo, FrameInfoQueryResult sourceFrame) {
         FrameInfoQueryResult targetFrame = targetInfo.getFrameInfo();
         int savedBasePointerSize = FrameAccess.singleton().savedBasePointerSize();
-        long targetFrameSize = targetInfo.getTotalFrameSize() - FrameAccess.returnAddressSize() - savedBasePointerSize;
+        int targetFrameSize = NumUtil.safeToInt(targetInfo.getTotalFrameSize()) - FrameAccess.returnAddressSize() - savedBasePointerSize;
         VirtualFrame result = new VirtualFrame(targetFrame);
 
         if (savedBasePointerSize != 0) {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateObjectCloneSnippets.java

@@ -30,6 +30,7 @@
 import java.util.Map;
 
 import org.graalvm.compiler.api.replacements.Snippet;
+import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
@@ -136,7 +137,7 @@ private static Object doClone(Object original) throws CloneNotSupportedException
         long entryStart = referenceMapIndex + InstanceReferenceMapEncoder.MAP_HEADER_SIZE;
         for (long idx = entryStart; idx < entryStart + entryCount * InstanceReferenceMapEncoder.MAP_ENTRY_SIZE; idx += InstanceReferenceMapEncoder.MAP_ENTRY_SIZE) {
             int objectOffset = NonmovableByteArrayReader.getS4(referenceMapEncoding, idx);
-            long count = NonmovableByteArrayReader.getU4(referenceMapEncoding, idx + 4);
+            int count = NumUtil.safeToInt(NonmovableByteArrayReader.getU4(referenceMapEncoding, idx + 4));
             assert objectOffset >= firstFieldOffset : "must not overwrite the object header";
 
             // copy non-object data

substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/RuntimeCompilationFeature.java

@@ -405,7 +405,7 @@ protected final void beforeCompilationHelper() {
             try {
                 /* Strip optional comment string from MaxRuntimeCompileMethods value */
                 numberStr = value.split("#")[0];
-                maxMethods += Long.parseLong(numberStr);
+                maxMethods += Integer.parseInt(numberStr);
             } catch (NumberFormatException ex) {
                 throw UserError.abort("Invalid value for option 'MaxRuntimeCompileMethods': '%s' is not a valid number", numberStr);
             }