Skip to content

Commit 3892951

Browse files
committed
[GR-50900] Bump the mx version to start compiling with ECJ 3.36.
PullRequest: graal/16750
2 parents 3affcd5 + f24c049 commit 3892951

File tree

8 files changed

+30
-25
lines changed

8 files changed

+30
-25
lines changed

common.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
55
],
66

7-
"mx_version": "7.6.1",
7+
"mx_version": "7.7.3",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/ArithmeticOpTable.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -917,6 +917,7 @@ public boolean inputCanBeNaN(Stamp inputStamp) {
917917
* Determine if this is a floating-point to integer conversion whose result may be outside
918918
* the range of the target type.
919919
*/
920+
@SuppressWarnings("unused")
920921
public boolean canOverflowInteger(Stamp inputStamp) {
921922
if (op.getCategory().equals(FloatConvertCategory.FloatingPointToInteger)) {
922923
throw GraalError.unimplementedOverride();

substratevm/mx.substratevm/suite.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -690,6 +690,7 @@
690690
],
691691
},
692692
"javaCompliance" : "22+",
693+
"forceJavac": True,
693694
"annotationProcessors": [
694695
"compiler:GRAAL_PROCESSOR",
695696
"SVM_PROCESSOR",
@@ -718,6 +719,7 @@
718719
],
719720
},
720721
"javaCompliance" : "22+",
722+
"forceJavac": True,
721723
"annotationProcessors": [
722724
"compiler:GRAAL_PROCESSOR",
723725
"SVM_PROCESSOR",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public ForkJoinTask<?> submit(Runnable task) {
8484
return ForkJoinPool.commonPool().submit(task);
8585
}
8686

87-
@SuppressWarnings({"unchecked", "static-method"})
87+
@SuppressWarnings({"unchecked", "static-method", "all"})
8888
public <T> List<Future<T>> invokeAllUninterruptibly(Collection<? extends Callable<T>> tasks) {
8989
VMError.guarantee(JavaVersionUtil.JAVA_SPEC >= 22, "invokeAllUninterruptibly only exists in JDK 22+");
9090
var m = ReflectionUtil.lookupMethod(ForkJoinPool.class, "invokeAllUninterruptibly", Collection.class);

sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/LLVMLanguage.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016, 2023, Oracle and/or its affiliates.
2+
* Copyright (c) 2016, 2024, Oracle and/or its affiliates.
33
*
44
* All rights reserved.
55
*
@@ -29,6 +29,21 @@
2929
*/
3030
package com.oracle.truffle.llvm.runtime;
3131

32+
import java.lang.ref.ReferenceQueue;
33+
import java.lang.ref.WeakReference;
34+
import java.nio.ByteOrder;
35+
import java.util.ArrayList;
36+
import java.util.Arrays;
37+
import java.util.List;
38+
import java.util.Objects;
39+
import java.util.concurrent.ConcurrentHashMap;
40+
import java.util.function.Function;
41+
42+
import org.graalvm.collections.EconomicMap;
43+
import org.graalvm.collections.Pair;
44+
import org.graalvm.options.OptionDescriptors;
45+
import org.graalvm.options.OptionValues;
46+
3247
import com.oracle.truffle.api.Assumption;
3348
import com.oracle.truffle.api.CallTarget;
3449
import com.oracle.truffle.api.CompilerAsserts;
@@ -54,7 +69,6 @@
5469
import com.oracle.truffle.llvm.api.Toolchain;
5570
import com.oracle.truffle.llvm.runtime.IDGenerater.BitcodeID;
5671
import com.oracle.truffle.llvm.runtime.LLVMContext.TLSInitializerAccess;
57-
import com.oracle.truffle.llvm.runtime.LLVMLanguageFactory.InitializeContextNodeGen;
5872
import com.oracle.truffle.llvm.runtime.config.Configuration;
5973
import com.oracle.truffle.llvm.runtime.config.Configurations;
6074
import com.oracle.truffle.llvm.runtime.config.LLVMCapability;
@@ -77,20 +91,6 @@
7791
import com.oracle.truffle.llvm.runtime.pointer.LLVMPointer;
7892
import com.oracle.truffle.llvm.runtime.target.TargetTriple;
7993
import com.oracle.truffle.llvm.runtime.types.Type;
80-
import org.graalvm.collections.EconomicMap;
81-
import org.graalvm.collections.Pair;
82-
import org.graalvm.options.OptionDescriptors;
83-
import org.graalvm.options.OptionValues;
84-
85-
import java.lang.ref.ReferenceQueue;
86-
import java.lang.ref.WeakReference;
87-
import java.nio.ByteOrder;
88-
import java.util.ArrayList;
89-
import java.util.Arrays;
90-
import java.util.List;
91-
import java.util.Objects;
92-
import java.util.concurrent.ConcurrentHashMap;
93-
import java.util.function.Function;
9494

9595
@TruffleLanguage.Registration(id = LLVMLanguage.ID, name = LLVMLanguage.NAME, internal = false, interactive = false, defaultMimeType = LLVMLanguage.LLVM_BITCODE_MIME_TYPE, //
9696
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() {
745745
if (sulongInitContextCode == null) {
746746
throw new IllegalStateException("Context cannot be initialized:" + LLVMContext.SULONG_INIT_CONTEXT + " was not found");
747747
}
748-
return InitializeContextNodeGen.create(sulongInitContextCode);
748+
return LLVMLanguageFactory.InitializeContextNodeGen.create(sulongInitContextCode);
749749
}
750750

751751
/**

sulong/tests/com.oracle.truffle.llvm.tests.harness/src/com/oracle/truffle/llvm/tests/harness/TestHarness.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, Oracle and/or its affiliates.
2+
* Copyright (c) 2022, 2024, Oracle and/or its affiliates.
33
*
44
* All rights reserved.
55
*
@@ -38,15 +38,15 @@
3838
import java.util.Map;
3939
import java.util.TreeMap;
4040

41-
import com.oracle.truffle.llvm.tests.pipe.CaptureNativeOutput;
42-
4341
import org.graalvm.polyglot.Context;
42+
import org.graalvm.polyglot.Context.Builder;
4443
import org.graalvm.polyglot.Engine;
4544
import org.graalvm.polyglot.Source;
4645
import org.graalvm.polyglot.Value;
47-
import org.graalvm.polyglot.Context.Builder;
4846
import org.junit.Assert;
4947

48+
import com.oracle.truffle.llvm.tests.pipe.CaptureNativeOutput;
49+
5050
public class TestHarness {
5151
private static Engine testEngine = Engine.newBuilder().allowExperimentalOptions(true).build();
5252

@@ -76,7 +76,7 @@ private static int runBitcode(File bitcodeFile, String[] args, Map<String, Strin
7676
private static int runBitcode(String[] runargs) throws IOException {
7777
File bitcodeFile = Path.of(runargs[0]).toFile();
7878
String[] args = Arrays.copyOfRange(runargs, 1, runargs.length);
79-
return runBitcode(bitcodeFile, args, new TreeMap<String, String>());
79+
return runBitcode(bitcodeFile, args, new TreeMap<>());
8080
}
8181

8282
private static void run(String[] runargs) throws IOException {

tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/JoinableExecutors.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ private JoinableExecutors() {
4343
static ExecutorService newSingleThreadExecutor(ThreadFactory threadFactory) {
4444
return new JoinableThreadPoolExecutor(1, 1,
4545
0L, TimeUnit.MILLISECONDS,
46-
new LinkedBlockingQueue<Runnable>(),
46+
new LinkedBlockingQueue<>(),
4747
threadFactory);
4848
}
4949

truffle/mx.truffle/suite.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -906,6 +906,7 @@
906906
],
907907
"checkstyle" : "com.oracle.truffle.api",
908908
"javaCompliance" : "22+",
909+
"forceJavac": True,
909910
"annotationProcessors" : ["TRUFFLE_DSL_PROCESSOR"],
910911
"workingSets" : "Truffle",
911912
# disable SpotBugs and Jacoco as long as JDK 22 is unsupported [GR-49566]
@@ -1826,6 +1827,7 @@
18261827
},
18271828
"subDir" : "src",
18281829
"javaCompliance" : "22+",
1830+
"forceJavac": True,
18291831
"dependencies" : [
18301832
"com.oracle.truffle.nfi.backend.panama",
18311833
],

0 commit comments

Comments
 (0)