[GR-17457] IGV must be run on a LTS JDK so always do that for jt igv

PullRequest: truffleruby/4374
oracle · Oct 21, 2024 · 44ded82 · 44ded82
2 parents 83e825d + b45c865
commit 44ded82
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/main/java/org/truffleruby/extra/TruffleGraalNodes.java b/src/main/java/org/truffleruby/extra/TruffleGraalNodes.java
@@ -228,6 +228,26 @@ Object blackhole(Object value) {
 
     }
 
+    @CoreMethod(names = "boundary", onSingleton = true)
+    public abstract static class BoundaryNode extends CoreMethodArrayArgumentsNode {
+
+        @TruffleBoundary(allowInlining = false)
+        @Specialization
+        Object boundary() {
+            return nil;
+        }
+    }
+
+    @CoreMethod(names = "boundary_allow_inlining", onSingleton = true)
+    public abstract static class BoundaryAllowInliningNode extends CoreMethodArrayArgumentsNode {
+
+        @TruffleBoundary(allowInlining = true)
+        @Specialization
+        Object boundaryAllowInlining() {
+            return nil;
+        }
+    }
+
     @CoreMethod(names = "total_compilation_time", onSingleton = true)
     public abstract static class TotalCompilationTimeNode extends CoreMethodArrayArgumentsNode {
 
@@ -236,7 +256,7 @@ public abstract static class TotalCompilationTimeNode extends CoreMethodArrayArg
         @SuppressFBWarnings("LI_LAZY_INIT_STATIC")
         @TruffleBoundary
         @Specialization
-        final long totalCompilationTime() {
+        long totalCompilationTime() {
             if (bean == null) {
                 var compilationMXBean = ManagementFactory.getCompilationMXBean();
                 VarHandle.storeStoreFence();

diff --git a/tool/jt.rb b/tool/jt.rb
@@ -79,6 +79,7 @@
 ENV['GEM_HOME'] = File.expand_path(ENV['GEM_HOME']) if ENV['GEM_HOME']
 
 JDK_VERSIONS = %w[latest 21]
+LTS_JDK_VERSION = '21'
 DEFAULT_JDK_VERSION = 'latest'
 
 MRI_TEST_RELATIVE_PREFIX = 'test/mri/tests'
@@ -2367,6 +2368,7 @@ def graph(*args)
 
   def igv
     compiler = "#{GRAAL_DIR}/compiler"
+    @jdk_version = LTS_JDK_VERSION
     mx('igv', chdir: compiler)
   end