Skip to content

Commit e7fa42e

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Fix JIT on nightly
2 parents 8bad039 + 90c9ec1 commit e7fa42e

File tree

4 files changed

+3
-9
lines changed

4 files changed

+3
-9
lines changed

.github/actions/test-linux/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ runs:
4242
export STACK_LIMIT_DEFAULTS_CHECK=1
4343
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
4444
-d opcache.jit=${{ inputs.jitType }} \
45+
-d opcache.jit_buffer_size=16M \
4546
-j$(/usr/bin/nproc) \
4647
-g FAIL,BORK,LEAK,XLEAK \
4748
--no-progress \

.github/actions/test-macos/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ runs:
2121
export STACK_LIMIT_DEFAULTS_CHECK=1
2222
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
2323
-d opcache.jit=${{ inputs.jitType }} \
24+
-d opcache.jit_buffer_size=16M \
2425
-j$(sysctl -n hw.ncpu) \
2526
-g FAIL,BORK,LEAK,XLEAK \
2627
--no-progress \

.github/workflows/nightly.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ jobs:
118118
${{ matrix.run_tests_parameters }}
119119
-d zend_extension=opcache.so
120120
-d opcache.enable_cli=1
121-
-d opcache.jit_buffer_size=16M
122121
- name: Test OpCache
123122
uses: ./.github/actions/test-linux
124123
with:
@@ -139,7 +138,6 @@ jobs:
139138
${{ matrix.run_tests_parameters }}
140139
-d zend_extension=opcache.so
141140
-d opcache.enable_cli=1
142-
-d opcache.jit_buffer_size=16M
143141
- name: Verify generated files are up to date
144142
uses: ./.github/actions/verify-generated-files
145143
- name: Notify Slack
@@ -210,7 +208,6 @@ jobs:
210208
${{ matrix.run_tests_parameters }}
211209
-d zend_extension=opcache.so
212210
-d opcache.enable_cli=1
213-
-d opcache.jit_buffer_size=16M
214211
- name: Test OpCache
215212
uses: ./.github/actions/test-linux
216213
with:
@@ -226,7 +223,6 @@ jobs:
226223
${{ matrix.run_tests_parameters }}
227224
-d zend_extension=opcache.so
228225
-d opcache.enable_cli=1
229-
-d opcache.jit_buffer_size=16M
230226
- name: Notify Slack
231227
if: failure()
232228
uses: ./.github/actions/notify-slack
@@ -275,7 +271,6 @@ jobs:
275271
-d zend_extension=opcache.so
276272
-d opcache.enable_cli=1
277273
-d opcache.protect_memory=1
278-
-d opcache.jit_buffer_size=16M
279274
- name: Test OpCache
280275
uses: ./.github/actions/test-macos
281276
with:
@@ -293,7 +288,6 @@ jobs:
293288
-d zend_extension=opcache.so
294289
-d opcache.enable_cli=1
295290
-d opcache.protect_memory=1
296-
-d opcache.jit_buffer_size=16M
297291
- name: Verify generated files are up to date
298292
uses: ./.github/actions/verify-generated-files
299293
- name: Notify Slack

.github/workflows/push.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,10 @@ jobs:
128128
uses: ./.github/actions/test-linux
129129
with:
130130
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}_${{ matrix.asan && 'OpCache' || 'Tracing JIT' }}
131-
jitType: tracing
131+
jitType: ${{ matrix.asan && 'disable' || 'tracing' }}
132132
runTestsParameters: >-
133133
-d zend_extension=opcache.so
134134
-d opcache.enable_cli=1
135-
${{ !matrix.asan && '-d opcache.jit_buffer_size=16M' || '' }}
136135
${{ matrix.asan && '--asan -x' || '' }}
137136
- name: Verify generated files are up to date
138137
if: ${{ !matrix.asan }}
@@ -168,7 +167,6 @@ jobs:
168167
-d zend_extension=opcache.so
169168
-d opcache.enable_cli=1
170169
-d opcache.protect_memory=1
171-
-d opcache.jit_buffer_size=16M
172170
- name: Verify generated files are up to date
173171
uses: ./.github/actions/verify-generated-files
174172
WINDOWS:

0 commit comments

Comments
 (0)