update to C1Visualizer 1.10 (GR-32846)

chrischiedo · Jan 12, 2022 · f9385ee · f9385ee
1 parent 70ae47e
commit f9385ee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/compiler/mx.compiler/mx_graal_tools.py b/compiler/mx.compiler/mx_graal_tools.py
@@ -82,10 +82,11 @@ def igv(args):
 def c1visualizer(args):
     """run the C1 Compiler Visualizer"""
     v8u40 = mx.VersionSpec("1.8.0_40")
+    v12 = mx.VersionSpec("12")
     def _c1vJdkVersionCheck(version):
-        return version >= v8u40 and str(version).startswith('1.8.0')
+        return version >= v8u40 and version < v12
     env = dict(os.environ)
-    env['jdkhome'] = mx.get_jdk(_c1vJdkVersionCheck, versionDescription='(1.8 JDK that is >= 1.8.0u40 )', purpose="running C1 Visualizer").home
+    env['jdkhome'] = mx.get_jdk(_c1vJdkVersionCheck, versionDescription='(JDK that is >= 1.8.0u40 and <= 11)', purpose="running C1 Visualizer").home
     run_netbeans_app('C1Visualizer', env, args() if callable(args) else args)
 
 def hsdis(args, copyToDir=None):

diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
@@ -96,8 +96,8 @@
     },
 
     "C1VISUALIZER_DIST" : {
-      "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/c1visualizer/c1visualizer-1.7.zip"],
-      "sha1" : "305a772ccbdc0e42dfa233b0ce6762d0dd1de6de",
+      "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/c1visualizer/c1visualizer-1.10.zip"],
+      "sha1" : "548e383a732944a84456c2caf36b163b9a8db495",
       "packedResource": True,
     },