Update to NetBeans 26 and add workaround for GraalVM JDK 24

Author: tkrodriguez

compiler/mx.compiler/mx_graal_tools.py

@@ -96,17 +96,17 @@ def igv(args):
 
     """
     v17 = mx.VersionSpec("17")
-    v23 = mx.VersionSpec("23")
+    v25 = mx.VersionSpec("25")
     def _igvJdkVersionCheck(version):
-        return v17 <= version < v23
+        return v17 <= version < v25
 
     jdkhome = None
     if not '--jdkhome' in args:
         def _do_not_abort(msg):
             pass
 
         # try to find a fully supported version first
-        jdk = mx.get_tools_jdk(versionCheck=_igvJdkVersionCheck, versionDescription='IGV prefers JDK 17 through JDK 22', abortCallback=_do_not_abort)
+        jdk = mx.get_tools_jdk(versionCheck=_igvJdkVersionCheck, versionDescription='IGV prefers JDK 17 through JDK 24', abortCallback=_do_not_abort)
         if jdk is None:
             # try any JDK
             jdk = mx.get_jdk()
@@ -119,6 +119,12 @@ def _do_not_abort(msg):
                 mx.warn('If you experience any problems try to use a JDK 17 or JDK 21 instead.')
                 mx.warn(f'mx help igv provides more details.')
 
+    v24 = mx.VersionSpec("24")
+    if jdk.version >= v24 and 'org.graalvm.word' in (jmd.name for jmd in jdk.get_modules()):
+        # disable JVMCI if jargraal is available to avoid collision with jdk.graal.compiler.graphio
+        args.append('-J-XX:-UseJVMICompiler')
+        args.append('-J-XX:-EnableJVMCI')
+
     run_netbeans_app('IdealGraphVisualizer', jdkhome, args=args, dist='IDEALGRAPHVISUALIZER_DIST')
 
 def c1visualizer(args):

visualizer/IdealGraphVisualizer/application/pom.xml

@@ -86,7 +86,6 @@
                     <systemPropertyVariables>
                         <all.clusters>${all.clusters}</all.clusters>
                         <branding.token>${brandingToken}</branding.token>
-                        <java.awt.headless>true</java.awt.headless>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>

visualizer/IdealGraphVisualizer/pom.xml

@@ -46,8 +46,10 @@
                         <systemPropertyVariables>
                             <java.awt.headless>true</java.awt.headless>
                         </systemPropertyVariables>
-                        <argLine>--add-opens=java.base/java.net=ALL-UNNAMED
+                        <argLine>
+                            --add-opens=java.base/java.net=ALL-UNNAMED
                             --add-exports=java.desktop/sun.awt=ALL-UNNAMED
+                            -Dpolyglot.engine.WarnInterpreterOnly=false
                         </argLine>
                     </configuration>
                 </plugin>
@@ -74,8 +76,8 @@
                             <configuration>
                                 <rules>
                                     <requireJavaVersion>
-                                        <version>[17,22)</version>
-                                        <message>The IGV Netbeans platform requires a JDK version between 17 and 22</message>
+                                        <version>[17,24)</version>
+                                        <message>The IGV Netbeans platform requires a JDK version between 17 and 24</message>
                                     </requireJavaVersion>
                                 </rules>
                             </configuration>
@@ -117,7 +119,7 @@
         <module>ViewerApi</module>
     </modules>
     <properties>
-        <netbeans.version>RELEASE220</netbeans.version>
+        <netbeans.version>RELEASE260</netbeans.version>
         <brandingToken>idealgraphvisualizer</brandingToken>
         <swinglayouts.version>1.0.2</swinglayouts.version>
         <nbmmvnplugin.version>4.8</nbmmvnplugin.version>

visualizer/mx.visualizer/mx_visualizer.py

@@ -166,6 +166,12 @@ def igv(args):
 
     if mx.get_opts().verbose:
         args.append('-J-Dnetbeans.logger.console=true')
+
+    v24 = mx.VersionSpec("24")
+    if mx.get_jdk().version >= v24 and 'org.graalvm.word' in (jmd.name for jmd in mx.get_jdk().get_modules()):
+        # disable JVMCI if jargraal is available to avoid collision with jdk.graal.compiler.graphio
+        args.append('-J-XX:-UseJVMICompiler')
+        args.append('-J-XX:-EnableJVMCI')
     mx.run([join(igvDir, 'application', 'target', 'idealgraphvisualizer', 'bin', 'idealgraphvisualizer.exe' if mx.is_windows() else 'idealgraphvisualizer'), '--jdkhome', mx.get_jdk().home] + args)
 
 @mx.command(_suite.name, 'unittest')