[GR-19220] On jt graph, keep the graph file around (#2712)

PullRequest: truffleruby/3471

Author: eregon

.gitignore

@@ -100,7 +100,8 @@ doc/user/README.md
 # Ignore .rb files at the root, it's temporary files to debug some issue
 /*.rb
 
-# Ignore Seafoam generated illustrations
+# Ignore graphs and Seafoam generated illustrations
+/*.bgv
 /*.pdf
 /*.svg
 

lib/cext/ABI_check.txt

@@ -1 +1 @@
-8
+9

src/main/c/cext/string.c

@@ -175,7 +175,7 @@ void rb_str_set_len(VALUE string, long length) {
   if (length > capacity || length < 0) {
     rb_raise(rb_eRuntimeError, "probable buffer overflow: %ld for %ld", length, capacity);
   }
-  rb_tr_wrap(polyglot_invoke(RUBY_CEXT, "rb_str_set_len", rb_tr_unwrap(string), length));
+  polyglot_invoke(RUBY_CEXT, "rb_str_set_len", rb_tr_unwrap(string), length);
 }
 
 VALUE rb_str_new_frozen(VALUE value) {

test/mri/excludes/TestOpenURI.rb

@@ -1,2 +1,2 @@
 exclude :test_encoding, "needs investigation"
-exclude :test_open_timeout, "transient" if RUBY_PLATFORM.start_with?('aarch64-darwin')
+exclude :test_open_timeout, "different exception due to different logic in Net::HTTP#connect [GR-40759]"

tool/jt.rb

@@ -841,6 +841,7 @@ def help
                               --simplify             simplify the graph by disabling some optimizations which tend to duplicate parts of the graph
                               --igv                  send the graphs to IGV over the network instead of using seafoam
                               --describe             describe the shape of the graph (linear, branches, loops, calls, deopts)
+                              SEAFOAM_DIR            use the seafoam in the given directory
       jt igv                                         launches IdealGraphVisualizer
       jt next                                        tell you what to work on next (give you a random core library spec)
       jt install [jvmci|eclipse]                     install [the right JVMCI JDK | Eclipse] in the parent directory
@@ -2069,6 +2070,7 @@ def profile(*args)
   end
 
   def graph(*args)
+    in_truffleruby_repo_root!
     truffleruby_compiler!
 
     test_file = nil
@@ -2078,8 +2080,9 @@ def graph(*args)
     describe = false
     json = false
     seafoam_args = []
-    igv = args.delete('--igv')
 
+    # Must be handled before ruby_options() otherwise that would consume it
+    igv = args.delete('--igv')
     args.unshift '--igv-network' if igv
 
     vm_args, remaining_args, _parsed_options = ruby_options({}, args)
@@ -2171,7 +2174,10 @@ def graph(*args)
         graph = graphs.last
         raise "Could not find graph in #{dumps}" unless graph
 
-        list = run_gem_test_pack_gem_or_install('seafoam', SEAFOAM_VERSION, '--json', graph, 'list', capture: :out, no_print_cmd: true)
+        FileUtils.cp graph, 'graph.bgv'
+        graph = 'graph.bgv'
+
+        list = seafoam('--json', graph, 'list', capture: :out, no_print_cmd: true)
         decoded = JSON.parse(list)
         graph_names = decoded.map { |entry| entry.fetch('graph_name_components').last }
         before_lowering_regexp = /Before.+Lowering/
@@ -2181,7 +2187,7 @@ def graph(*args)
 
         json_args = json ? %w[--json] : []
         action = describe ? 'describe' : 'render'
-        run_gem_test_pack_gem_or_install('seafoam', SEAFOAM_VERSION, *json_args, "#{graph}:#{n}", action, *seafoam_args)
+        seafoam(*json_args, "#{graph}:#{n}", action, *seafoam_args)
       end
 
       break unless watch
@@ -2193,6 +2199,16 @@ def graph(*args)
     end
   end
 
+  private def seafoam(*args)
+    seafoam_dir = ENV['SEAFOAM_DIR']
+    if seafoam_dir
+      sh(RbConfig.ruby, "-I#{seafoam_dir}/lib", "#{seafoam_dir}/bin/seafoam", *args)
+    else
+      run_gem_test_pack_gem_or_install('seafoam', SEAFOAM_VERSION, *args)
+    end
+  end
+  ruby2_keywords :seafoam if respond_to?(:ruby2_keywords, true)
+
   def igv
     clone_enterprise
     graal_enterprise = File.expand_path '../graal-enterprise/graal-enterprise', TRUFFLERUBY_DIR