[GR-50900] Bump the mx version to start compiling with ECJ 3.36.

PullRequest: graal/16750
oracle · Jan 26, 2024 · 3892951 · 3892951
2 parents 3affcd5 + f24c049
commit 3892951
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 25 deletions.
diff --git a/common.json b/common.json
@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "7.6.1",
+  "mx_version": "7.7.3",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {

diff --git a/...ler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/ArithmeticOpTable.java b/...ler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/ArithmeticOpTable.java
@@ -917,6 +917,7 @@ public boolean inputCanBeNaN(Stamp inputStamp) {
          * Determine if this is a floating-point to integer conversion whose result may be outside
          * the range of the target type.
          */
+        @SuppressWarnings("unused")
         public boolean canOverflowInteger(Stamp inputStamp) {
             if (op.getCategory().equals(FloatConvertCategory.FloatingPointToInteger)) {
                 throw GraalError.unimplementedOverride();

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
@@ -690,6 +690,7 @@
                 ],
             },
             "javaCompliance" : "22+",
+            "forceJavac": True,
             "annotationProcessors": [
                 "compiler:GRAAL_PROCESSOR",
                 "SVM_PROCESSOR",
@@ -718,6 +719,7 @@
                 ],
             },
             "javaCompliance" : "22+",
+            "forceJavac": True,
             "annotationProcessors": [
                 "compiler:GRAAL_PROCESSOR",
                 "SVM_PROCESSOR",

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/DeferredCommonPool.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/DeferredCommonPool.java
@@ -84,7 +84,7 @@ public ForkJoinTask<?> submit(Runnable task) {
         return ForkJoinPool.commonPool().submit(task);
     }
 
-    @SuppressWarnings({"unchecked", "static-method"})
+    @SuppressWarnings({"unchecked", "static-method", "all"})
     public <T> List<Future<T>> invokeAllUninterruptibly(Collection<? extends Callable<T>> tasks) {
         VMError.guarantee(JavaVersionUtil.JAVA_SPEC >= 22, "invokeAllUninterruptibly only exists in JDK 22+");
         var m = ReflectionUtil.lookupMethod(ForkJoinPool.class, "invokeAllUninterruptibly", Collection.class);

diff --git a/...cts/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/LLVMLanguage.java b/...cts/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/LLVMLanguage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates.
  *
  * All rights reserved.
  *
@@ -29,6 +29,21 @@
  */
 package com.oracle.truffle.llvm.runtime;
 
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+
+import org.graalvm.collections.EconomicMap;
+import org.graalvm.collections.Pair;
+import org.graalvm.options.OptionDescriptors;
+import org.graalvm.options.OptionValues;
+
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerAsserts;
@@ -54,7 +69,6 @@
 import com.oracle.truffle.llvm.api.Toolchain;
 import com.oracle.truffle.llvm.runtime.IDGenerater.BitcodeID;
 import com.oracle.truffle.llvm.runtime.LLVMContext.TLSInitializerAccess;
-import com.oracle.truffle.llvm.runtime.LLVMLanguageFactory.InitializeContextNodeGen;
 import com.oracle.truffle.llvm.runtime.config.Configuration;
 import com.oracle.truffle.llvm.runtime.config.Configurations;
 import com.oracle.truffle.llvm.runtime.config.LLVMCapability;
@@ -77,20 +91,6 @@
 import com.oracle.truffle.llvm.runtime.pointer.LLVMPointer;
 import com.oracle.truffle.llvm.runtime.target.TargetTriple;
 import com.oracle.truffle.llvm.runtime.types.Type;
-import org.graalvm.collections.EconomicMap;
-import org.graalvm.collections.Pair;
-import org.graalvm.options.OptionDescriptors;
-import org.graalvm.options.OptionValues;
-
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.WeakReference;
-import java.nio.ByteOrder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Function;
 
 @TruffleLanguage.Registration(id = LLVMLanguage.ID, name = LLVMLanguage.NAME, internal = false, interactive = false, defaultMimeType = LLVMLanguage.LLVM_BITCODE_MIME_TYPE, //
                 byteMimeTypes = {LLVMLanguage.LLVM_BITCODE_MIME_TYPE, LLVMLanguage.LLVM_ELF_SHARED_MIME_TYPE, LLVMLanguage.LLVM_ELF_EXEC_MIME_TYPE, LLVMLanguage.LLVM_MACHO_MIME_TYPE,
@@ -745,7 +745,7 @@ public LLVMStatementNode createInitializeContextNode() {
         if (sulongInitContextCode == null) {
             throw new IllegalStateException("Context cannot be initialized:" + LLVMContext.SULONG_INIT_CONTEXT + " was not found");
         }
-        return InitializeContextNodeGen.create(sulongInitContextCode);
+        return LLVMLanguageFactory.InitializeContextNodeGen.create(sulongInitContextCode);
     }
 
     /**

diff --git a/...cle.truffle.llvm.tests.harness/src/com/oracle/truffle/llvm/tests/harness/TestHarness.java b/...cle.truffle.llvm.tests.harness/src/com/oracle/truffle/llvm/tests/harness/TestHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates.
  *
  * All rights reserved.
  *
@@ -38,15 +38,15 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import com.oracle.truffle.llvm.tests.pipe.CaptureNativeOutput;
-
 import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Context.Builder;
 import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.Value;
-import org.graalvm.polyglot.Context.Builder;
 import org.junit.Assert;
 
+import com.oracle.truffle.llvm.tests.pipe.CaptureNativeOutput;
+
 public class TestHarness {
     private static Engine testEngine = Engine.newBuilder().allowExperimentalOptions(true).build();
 
@@ -76,7 +76,7 @@ private static int runBitcode(File bitcodeFile, String[] args, Map<String, Strin
     private static int runBitcode(String[] runargs) throws IOException {
         File bitcodeFile = Path.of(runargs[0]).toFile();
         String[] args = Arrays.copyOfRange(runargs, 1, runargs.length);
-        return runBitcode(bitcodeFile, args, new TreeMap<String, String>());
+        return runBitcode(bitcodeFile, args, new TreeMap<>());
     }
 
     private static void run(String[] runargs) throws IOException {

diff --git a/...racle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/JoinableExecutors.java b/...racle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/JoinableExecutors.java
@@ -43,7 +43,7 @@ private JoinableExecutors() {
     static ExecutorService newSingleThreadExecutor(ThreadFactory threadFactory) {
         return new JoinableThreadPoolExecutor(1, 1,
                         0L, TimeUnit.MILLISECONDS,
-                        new LinkedBlockingQueue<Runnable>(),
+                        new LinkedBlockingQueue<>(),
                         threadFactory);
     }
 

diff --git a/truffle/mx.truffle/suite.py b/truffle/mx.truffle/suite.py
@@ -906,6 +906,7 @@
       ],
       "checkstyle" : "com.oracle.truffle.api",
       "javaCompliance" : "22+",
+      "forceJavac": True,
       "annotationProcessors" : ["TRUFFLE_DSL_PROCESSOR"],
       "workingSets" : "Truffle",
       # disable SpotBugs and Jacoco as long as JDK 22 is unsupported [GR-49566]
@@ -1826,6 +1827,7 @@
       },
       "subDir" : "src",
       "javaCompliance" : "22+",
+      "forceJavac": True,
       "dependencies" : [
         "com.oracle.truffle.nfi.backend.panama",
       ],