🌐 AI搜索 & 代理 主页
Skip to content

Commit fe49c59

Browse files
tekknolagitekknolagi
authored
Merge branch 'master' into mb-zjit-iongraph-script
2 parents a51169f + c890903 commit fe49c59

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+1523
-506
lines changed

‎.github/workflows/compilers.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ jobs:
244244
- { uses: './.github/actions/compilers', name: 'RGENGC_CHECK_MODE', with: { cppflags: '-DRGENGC_CHECK_MODE' }, timeout-minutes: 5 }
245245
- { uses: './.github/actions/compilers', name: 'VM_CHECK_MODE', with: { cppflags: '-DVM_CHECK_MODE' }, timeout-minutes: 5 }
246246
- { uses: './.github/actions/compilers', name: 'USE_EMBED_CI=0', with: { cppflags: '-DUSE_EMBED_CI=0' }, timeout-minutes: 5 }
247-
- { uses: './.github/actions/compilers', name: 'USE_FLONUM=0', with: { cppflags: '-DUSE_FLONUM=0', append_configure: '--disable-yjit' }, timeout-minutes: 5 }
247+
- { uses: './.github/actions/compilers', name: 'USE_FLONUM=0', with: { cppflags: '-DUSE_FLONUM=0', append_configure: '--disable-yjit --disable-zjit' }, timeout-minutes: 5 }
248248

249249
compileX:
250250
name: 'omnibus compilations, #10'

‎.github/workflows/ubuntu.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,56 @@ jobs:
202202
203203
steps: *make-steps
204204

205+
# Separated from `make` job to avoid making it a required status check
206+
ruby-bench:
207+
strategy:
208+
matrix:
209+
include:
210+
# Using the same setup as ZJIT jobs
211+
- bench_opts: '--warmup=1 --bench=1'
212+
213+
runs-on: ubuntu-24.04
214+
215+
if: >-
216+
${{!(false
217+
|| contains(github.event.head_commit.message, '[DOC]')
218+
|| contains(github.event.pull_request.title, '[DOC]')
219+
|| contains(github.event.pull_request.labels.*.name, 'Documentation')
220+
|| (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
221+
)}}
222+
223+
steps:
224+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
225+
226+
- uses: ./.github/actions/setup/ubuntu
227+
228+
- uses: ./.github/actions/setup/directories
229+
with:
230+
srcdir: src
231+
builddir: build
232+
makeup: true
233+
234+
- name: Run configure
235+
run: ../src/configure -C --disable-install-doc --prefix="$(pwd)/install"
236+
237+
- run: make install
238+
239+
- name: Checkout ruby-bench
240+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
241+
with:
242+
repository: ruby/ruby-bench
243+
path: ruby-bench
244+
245+
- name: Run ruby-bench
246+
run: ruby run_benchmarks.rb -e "ruby::../build/install/bin/ruby" ${{ matrix.bench_opts }}
247+
working-directory: ruby-bench
248+
249+
- uses: ./.github/actions/slack
250+
with:
251+
label: ruby-bench ${{ matrix.bench_opts }} ${{ matrix.ruby_opts }}
252+
SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
253+
if: ${{ failure() }}
254+
205255
result:
206256
if: ${{ always() }}
207257
name: ${{ github.workflow }} result

‎.github/workflows/zjit-macos.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ jobs:
158158
include:
159159
# Test --call-threshold=2 with 2 iterations in total
160160
- ruby_opts: '--zjit-call-threshold=2'
161-
bench_opts: '--warmup=1 --bench=1'
161+
bench_opts: '--warmup=1 --bench=1 --excludes=fluentd,psych-load,railsbench'
162162
configure: '--enable-zjit=dev_nodebug' # --enable-zjit=dev is too slow
163163

164164
runs-on: macos-14

‎.github/workflows/zjit-ubuntu.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ jobs:
215215
include:
216216
# Test --call-threshold=2 with 2 iterations in total
217217
- ruby_opts: '--zjit-call-threshold=2'
218-
bench_opts: '--warmup=1 --bench=1'
218+
bench_opts: '--warmup=1 --bench=1 --excludes=fluentd,psych-load,railsbench'
219219
configure: '--enable-zjit=dev_nodebug' # --enable-zjit=dev is too slow
220220

221221
runs-on: ubuntu-24.04

‎NEWS.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -234,30 +234,32 @@ releases.
234234
235235
The following default gem is added.
236236
237-
* win32-registry 0.1.1
237+
* win32-registry 0.1.2
238238
239239
The following default gems are updated.
240240
241241
* RubyGems 4.0.1
242242
* bundler 4.0.1
243-
* date 3.5.0
243+
* date 3.5.1
244244
* digest 3.2.1
245245
* english 0.8.1
246246
* erb 6.0.0
247247
* etc 1.4.6
248248
* fcntl 1.3.0
249249
* fileutils 1.8.0
250+
* forwardable 1.4.0
250251
* io-console 0.8.1
251252
* io-nonblock 0.3.2
252253
* io-wait 0.4.0.dev
254+
* ipaddr 1.2.8
253255
* json 2.17.1
254256
* net-http 0.8.0
255257
* openssl 4.0.0.pre
256-
* optparse 0.8.0
258+
* optparse 0.8.1
257259
* pp 0.6.3
258260
* prism 1.6.0
259-
* psych 5.2.6
260-
* resolv 0.6.3
261+
* psych 5.3.0
262+
* resolv 0.7.0
261263
* stringio 3.1.9.dev
262264
* strscan 3.1.6.dev
263265
* timeout 0.5.0

‎bootstraptest/test_ractor.rb‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1494,6 +1494,9 @@ class C
14941494
unless a[i].equal?(b[i])
14951495
raise [a[i], b[i]].inspect
14961496
end
1497+
unless a[i] == i.to_s
1498+
raise [i, a[i], b[i]].inspect
1499+
end
14971500
end
14981501
:ok
14991502
}

‎box.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@ static int
760760
cleanup_local_extension_i(VALUE key, VALUE value, VALUE arg)
761761
{
762762
#if defined(_WIN32)
763-
HMODULE h = (HMODULE)NUM2SVALUE(value);
763+
HMODULE h = (HMODULE)NUM2PTR(value);
764764
WCHAR module_path[MAXPATHLEN];
765765
DWORD len = GetModuleFileNameW(h, module_path, numberof(module_path));
766766

‎compile.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -610,8 +610,6 @@ branch_coverage_valid_p(rb_iseq_t *iseq, int first_line)
610610
return 1;
611611
}
612612

613-
#define PTR2NUM(x) (rb_int2inum((intptr_t)(void *)(x)))
614-
615613
static VALUE
616614
setup_branch(const rb_code_location_t *loc, const char *type, VALUE structure, VALUE key)
617615
{

0 commit comments

Comments
 (0)