[GR-70013] Support JDT builds with project compliance 25

common.json

@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "7.83.3",
+  "mx_version": "7.84.1",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/alloc/BasicBlockOrderUtils.java

@@ -51,7 +51,7 @@ public final class BasicBlockOrderUtils {
      * Initializes the priority queue used for the work list of blocks and adds the start block.
      */
     protected static <T extends BasicBlock<T>> PriorityQueue<T> initializeWorklist(T startBlock, BitSet visitedBlocks) {
-        PriorityQueue<T> result = new PriorityQueue<>(INITIAL_WORKLIST_CAPACITY, new BlockOrderComparator<>());
+        PriorityQueue<T> result = new PriorityQueue<>(INITIAL_WORKLIST_CAPACITY, new BlockOrderComparator<T>());
         result.add(startBlock);
         visitedBlocks.set(startBlock.getId());
         return result;

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/gc/G1WriteBarrierSnippets.java

@@ -244,7 +244,7 @@ public void g1PostWriteBarrier(Address address, Object object, Object value, @Co
                     MembarNode.memoryBarrier(MembarNode.FenceKind.STORE_LOAD, GC_CARD_LOCATION);
                     byte cardByteReload = cardAddress.readByte(0, GC_CARD_LOCATION);
                     if (probability(NOT_FREQUENT_PROBABILITY, cardByteReload != dirtyCardValue())) {
-                        log(trace, "[%d] G1-Post Thread: %p Card: %p \n", gcCycle, thread.rawValue(), Word.unsigned((int) cardByte).rawValue());
+                        log(trace, "[%d] G1-Post Thread: %p Card: %p \n", gcCycle, thread.rawValue(), Word.unsigned(cardByte).rawValue());
                         cardAddress.writeByte(0, dirtyCardValue(), GC_CARD_LOCATION);
                         counters.g1ExecutedPostWriteBarrierCounter.inc();
 

truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/host/ClassInteropTest.java

@@ -107,7 +107,7 @@ public void cannotReadValueAsItIsNotStatic() throws Exception {
     public void canReadValueAfterCreatingNewInstance() throws Exception {
         Object objInst = INTEROP.instantiate(obj);
         assertTrue("It is truffle object", objInst instanceof TruffleObject);
-        XYPlus inst = asJavaObject(XYPlus.class, (TruffleObject) objInst);
+        XYPlus inst = asJavaObject(XYPlus.class, objInst);
         assertEquals("Field read", 42, inst.value());
     }
 
@@ -121,7 +121,7 @@ public void noNonStaticMethods() throws InteropException {
     public void canAccessStaticMemberTypes() throws InteropException {
         Object res = INTEROP.readMember(obj, "XYPlus");
         assertTrue("It is truffle object", res instanceof TruffleObject);
-        Class<?> c = asJavaObject(Class.class, (TruffleObject) res);
+        Class<?> c = asJavaObject(Class.class, res);
         assertSame(XYPlus.class, c);
     }
 
@@ -132,7 +132,7 @@ public void canCreateMemberTypeInstances() throws InteropException {
         TruffleObject truffleType = (TruffleObject) type;
         Object objInst = INTEROP.instantiate(truffleType, 22);
         assertTrue("Created instance is a truffle object", objInst instanceof TruffleObject);
-        Object res = asJavaObject(Object.class, (TruffleObject) objInst);
+        Object res = asJavaObject(Object.class, objInst);
         assertTrue("Instance is of correct type", res instanceof Zed);
         assertEquals("Constructor was invoked", 22, ((Zed) res).val);
     }
@@ -141,7 +141,7 @@ public void canCreateMemberTypeInstances() throws InteropException {
     public void canListStaticTypes() throws InteropException {
         Object type = INTEROP.getMembers(obj);
         assertTrue("Type is a truffle object", type instanceof TruffleObject);
-        String[] names = asJavaObject(String[].class, (TruffleObject) type);
+        String[] names = asJavaObject(String[].class, type);
         int zed = 0;
         int xy = 0;
         int eman = 0;
@@ -186,7 +186,7 @@ public void nonpublicTypeNotvisible() throws InteropException {
 
         Object type = INTEROP.getMembers(obj);
         assertTrue("Type is a truffle object", type instanceof TruffleObject);
-        String[] names = asJavaObject(String[].class, (TruffleObject) type);
+        String[] names = asJavaObject(String[].class, type);
         assertEquals("Non-public member type not enumerated", -1, Arrays.asList(names).indexOf("NonStaticInterface"));
 
         INTEROP.readMember(obj, "NonStaticInterface");

truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/host/VarArgsTest.java

@@ -174,17 +174,17 @@ public void testGenericReturnType() throws InteropException {
             result = INTEROP.invokeMember(container, "withPorts", 80);
             Assert.assertEquals(container, result);
             result = INTEROP.invokeMember(container, "getPorts");
-            Assert.assertEquals(Arrays.asList(80), asJavaObject(List.class, (TruffleObject) result));
+            Assert.assertEquals(Arrays.asList(80), asJavaObject(List.class, result));
 
             result = INTEROP.invokeMember(container, "withPorts", new ListBasedTO(Arrays.asList(80)));
             Assert.assertEquals(container, result);
             result = INTEROP.invokeMember(container, "getPorts");
-            Assert.assertEquals(Arrays.asList(80), asJavaObject(List.class, (TruffleObject) result));
+            Assert.assertEquals(Arrays.asList(80), asJavaObject(List.class, result));
 
             result = INTEROP.invokeMember(container, "withPorts", asTruffleObject(new int[]{80}));
             Assert.assertEquals(container, result);
             result = INTEROP.invokeMember(container, "getPorts");
-            Assert.assertEquals(Arrays.asList(80), asJavaObject(List.class, (TruffleObject) result));
+            Assert.assertEquals(Arrays.asList(80), asJavaObject(List.class, result));
         }
     }
 

truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostToTypeNode.java

@@ -214,7 +214,7 @@ private static Object convertImpl(Node node, Object value, Class<?> targetType,
             }
             return null;
         } else if (value instanceof TruffleObject) {
-            convertedValue = asJavaObject(node, context, (TruffleObject) value, targetType, genericType, allowsImplementation);
+            convertedValue = asJavaObject(node, context, value, targetType, genericType, allowsImplementation);
             if (convertedValue != null) {
                 return convertedValue;
             }