Skip to content

[pull] master from ruby:master #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
Oct 6, 2025
Merged

[pull] master from ruby:master #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3020d7
ZJIT: strengthen test_reset_stats (#14738)
nvh0412 Oct 6, 2025
7333a27
ZJIT: reduce string allocation in the Counter::name() (#14743)
nvh0412 Oct 6, 2025
56b3b91
tool/merger.rb: Fetch diff from GitHub instead of cgit
k0kubun Oct 6, 2025
cc98234
tool/merger.rb: Fetch a diff in the patch format
k0kubun Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions test/ruby/test_zjit.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tool/merger.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
12 changes: 6 additions & 6 deletions zjit/src/stats.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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), )+
}
}
}
Expand Down