diff --git a/test/ruby/test_zjit.rb b/test/ruby/test_zjit.rb index 83af7347d61da9..c6dbc01dc2e129 100644 --- a/test/ruby/test_zjit.rb +++ b/test/ruby/test_zjit.rb @@ -2127,6 +2127,7 @@ def test = 1 # After reset, counters should be zero or at least much smaller # (some instructions might execute between reset and reading stats) :zjit_insn_count.then { |s| initial_stats[s] > 0 && reset_stats[s] < initial_stats[s] }, + :compiled_iseq_count.then { |s| initial_stats[s] > 0 && reset_stats[s] < initial_stats[s] } ].all? }, stats: true end diff --git a/tool/merger.rb b/tool/merger.rb index 8b12334b735df4..795e97a86ee529 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -263,7 +263,7 @@ def execute(*cmd, interactive: false) end # Merge revision from Git patch - git_uri = "https://git.ruby-lang.org/ruby.git/patch/?id=#{git_rev}" + git_uri = "https://github.com/ruby/ruby/commit/#{git_rev}.patch" resp = Net::HTTP.get_response(URI(git_uri)) if resp.code != '200' abort "'#{git_uri}' returned status '#{resp.code}':\n#{resp.body}" diff --git a/zjit/src/stats.rs b/zjit/src/stats.rs index 323af0f3ed2695..a9b7270444a7a5 100644 --- a/zjit/src/stats.rs +++ b/zjit/src/stats.rs @@ -48,13 +48,13 @@ macro_rules! make_counters { } impl Counter { - pub fn name(&self) -> String { + pub fn name(&self) -> &'static str { match self { - $( Counter::$default_counter_name => stringify!($default_counter_name).to_string(), )+ - $( Counter::$exit_counter_name => stringify!($exit_counter_name).to_string(), )+ - $( Counter::$dynamic_send_counter_name => stringify!($dynamic_send_counter_name).to_string(), )+ - $( Counter::$optimized_send_counter_name => stringify!($optimized_send_counter_name).to_string(), )+ - $( Counter::$counter_name => stringify!($counter_name).to_string(), )+ + $( Counter::$default_counter_name => stringify!($default_counter_name), )+ + $( Counter::$exit_counter_name => stringify!($exit_counter_name), )+ + $( Counter::$dynamic_send_counter_name => stringify!($dynamic_send_counter_name), )+ + $( Counter::$optimized_send_counter_name => stringify!($optimized_send_counter_name), )+ + $( Counter::$counter_name => stringify!($counter_name), )+ } } }