Skip to content

Commit a8e56fd

Browse files
committed
Merge remote-tracking branch 'upstream/PHP-8.6' into true-async
Upstream master moved to 8.7.0-dev; true-async stays on 8.6, so it now follows PHP-8.6 instead of master. Conflicts: - Zend/zend_atomic.h: kept the fork's fetch_add/fetch_sub helpers next to upstream's ZEND_ATOMIC_FENCE_* macros. - Zend/zend_fibers.c: upstream holds the object a callable resolved to (php#24134); applied to the non-coroutine path. The coroutine path keeps zend_fcall_t, which does not hold fci.object yet. - ext/pdo/pdo_dbh.c: added upstream's persistent refcount guard (phpGH-23962) to the fork's in_txn check, which avoids dispatching to the pool. - ext/standard/http_fopen_wrapper.c: took upstream's single release of the last response headers after the request; it also covers headers stored by another coroutine. - main/streams/cast.c: the fork's buffer locking with the new PHP_STREAM_AS_FD_FOR_POLL exemption. - main/streams/streams.c: flush/close results propagate (bug #60110) while the lock-free flush on close and pending_free stay.
2 parents 73389f5 + 7017e83 commit a8e56fd

1,445 files changed

Lines changed: 76432 additions & 40259 deletions

File tree

Some content is hidden

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

‎.claude/CLAUDE.md‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
/ext/pgsql @devnexen
4747
/ext/phar @LamentXU123
4848
/ext/random @TimWolla @zeriyoshi
49+
/ext/readline @LamentXU123
4950
/ext/reflection @DanielEScherzer
5051
/ext/session @Girgias @jorgsowa
5152
/ext/simplexml @devnexen

‎.github/actions/brew/action.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ runs:
66
run: |
77
set -x
88
9+
brew update
10+
911
# Patch brew to overwrite always
1012
formula_installer="$(brew --repo)"/Library/Homebrew/formula_installer.rb
1113
code=" keg.link\(verbose: verbose\?"

‎.github/actions/freebsd/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ runs:
1212
- name: FreeBSD
1313
uses: vmactions/freebsd-vm@v1
1414
with:
15-
release: '13.5'
15+
release: '14.4'
1616
usesh: true
1717
copyback: false
1818
disable-cache: true

‎.github/matrix.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22

33
const BRANCHES = [
4-
['name' => 'master', 'ref' => 'master', 'version' => [8, 6]],
4+
['name' => 'master', 'ref' => 'master', 'version' => [8, 7]],
5+
['name' => 'PHP-8.6', 'ref' => 'PHP-8.6', 'version' => [8, 6]],
56
['name' => 'PHP-8.5', 'ref' => 'PHP-8.5', 'version' => [8, 5]],
67
['name' => 'PHP-8.4', 'ref' => 'PHP-8.4', 'version' => [8, 4]],
78
['name' => 'PHP-8.3', 'ref' => 'PHP-8.3', 'version' => [8, 3]],
@@ -124,11 +125,10 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
124125
: ['debug' => [true], 'zts' => [true]];
125126
}
126127
if ($all_jobs || !$no_jobs || $test_macos) {
127-
$test_arm = version_compare($php_version, '8.4', '>=');
128128
$jobs['MACOS']['matrix'] = $all_variations
129-
? ['arch' => $test_arm ? ['X64', 'ARM64'] : ['X64'], 'debug' => [true, false], 'zts' => [true, false]]
130-
: ['include' => [['arch' => $test_arm ? 'ARM64' : 'X64', 'debug' => true, 'zts' => false]]];
131-
$jobs['MACOS']['config']['arm64_version'] = version_compare($php_version, '8.4', '>=') ? '15' : '14';
129+
? ['arch' => ['ARM64'], 'debug' => [true, false], 'zts' => [true, false]]
130+
: ['include' => [['arch' => 'ARM64', 'debug' => true, 'zts' => false]]];
131+
$jobs['MACOS']['config']['version'] = version_compare($php_version, '8.4', '>=') ? '26' : '15';
132132
}
133133
if ($all_jobs || $test_msan) {
134134
$jobs['MSAN'] = true;
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/sh
2+
set -ex
3+
cd "$(dirname "$0")/../../.."
4+
5+
tmp_dir=/tmp/php-src-download-bundled/jit-ir
6+
rm -rf "$tmp_dir"
7+
8+
revision=93f92f5b5a49a02295685e340ebb0b83562cbe79
9+
10+
git clone --depth 1 --revision="$revision" https://github.com/dstogov/ir.git "$tmp_dir"
11+
12+
rm -rf ext/opcache/jit/ir
13+
cp -R "$tmp_dir" ext/opcache/jit/ir
14+
15+
cd ext/opcache/jit/ir
16+
17+
# remove unneeded files
18+
rm -rf .git
19+
rm -r .github
20+
rm -r bench
21+
rm -r examples
22+
rm -r tests
23+
rm -r tools
24+
rm -r fuzz
25+
rm README.md
26+
rm TODO
27+
rm ir.g
28+
rm ir_cpuinfo.c
29+
rm ir_emit_c.c
30+
rm ir_emit_llvm.c
31+
rm ir_load.c
32+
rm ir_load_llvm.c
33+
rm ir_main.c
34+
rm ir_mem2ssa.c
35+
36+
# add extra files
37+
git restore README

‎.github/scripts/windows/find-target-branch.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
for /f "usebackq tokens=3" %%i in (`findstr PHP_MAJOR_VERSION main\php_version.h`) do set BRANCH=%%i
44
for /f "usebackq tokens=3" %%i in (`findstr PHP_MINOR_VERSION main\php_version.h`) do set BRANCH=%BRANCH%.%%i
55

6-
if /i "%BRANCH%" equ "8.6" (
6+
if /i "%BRANCH%" equ "8.7" (
77
set BRANCH=master
88
)

‎.github/scripts/windows/test_task.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,10 @@ set OPENSSL_CONF=
9090
rem set SSLEAY_CONF=
9191

9292
rem prepare for OPcache
93-
if "%OPCACHE%" equ "1" set OPCACHE_OPTS=-d opcache.enable=1 -d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=64M -d opcache.jit=tracing
93+
set PHP_BUILD_DIR=%PHP_BUILD_OBJ_DIR%\Release
94+
if "%THREAD_SAFE%" equ "1" set PHP_BUILD_DIR=%PHP_BUILD_DIR%_TS
95+
96+
if "%OPCACHE%" equ "1" set OPCACHE_OPTS=-d opcache.enable=1 -d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=64M -d opcache.jit=tracing -d extension_dir=%PHP_BUILD_DIR%
9497

9598
rem prepare for enchant
9699
mkdir %~d0\usr\local\lib\enchant-2
@@ -111,9 +114,6 @@ set MIBDIRS=%DEPS_DIR%\share\mibs
111114
sed -i "s/exec HexTest .*/exec HexTest cscript\.exe \/nologo %GITHUB_WORKSPACE:\=\/%\/ext\/snmp\/tests\/bigtest\.js/g" %GITHUB_WORKSPACE%\ext\snmp\tests\snmpd.conf
112115
start %DEPS_DIR%\bin\snmpd.exe -C -c %GITHUB_WORKSPACE%\ext\snmp\tests\snmpd.conf -Ln
113116

114-
set PHP_BUILD_DIR=%PHP_BUILD_OBJ_DIR%\Release
115-
if "%THREAD_SAFE%" equ "1" set PHP_BUILD_DIR=%PHP_BUILD_DIR%_TS
116-
117117
rem prepare for mail
118118
curl -sLo hMailServer.zip https://downloads.php.net/~windows/php-sdk/deps/vs18/x64/hmailserver-5.7.0-vs18-x64.zip
119119
unzip -q hMailServer.zip -d hMailServer

‎.github/workflows/real-time-benchmark.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,21 @@ jobs:
214214
215215
PHP_JIT=0
216216
EOF
217+
- name: Setup PHP config - benchmarked PHP version with JIT
218+
if: env.JIT == '1'
219+
run: |
220+
set -e
221+
222+
cat << EOF > ./php-version-benchmarks/config/php/this_jit.ini
223+
PHP_NAME="PHP - ${{ env.BRANCH }} (JIT)"
224+
PHP_ID=php_${{ env.ID }}_jit
225+
226+
PHP_REPO=${{ github.server_url }}/${{ env.REPOSITORY }}.git
227+
PHP_BRANCH=${{ env.BRANCH }}
228+
PHP_COMMIT=${{ env.COMMIT }}
229+
230+
PHP_JIT=${{ env.JIT }}
231+
EOF
217232
- name: Setup test config
218233
run: |
219234
set -e

‎.github/workflows/test-suite.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ jobs:
312312
fail-fast: false
313313
matrix: ${{ fromJson(inputs.branch).jobs.MACOS.matrix }}
314314
name: "MACOS_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
315-
runs-on: macos-${{ matrix.arch == 'X64' && '15-intel' || fromJson(inputs.branch).jobs.MACOS.config.arm64_version }}
315+
runs-on: macos-${{ fromJson(inputs.branch).jobs.MACOS.config.version }}
316316
timeout-minutes: 180
317317
steps:
318318
- name: git checkout
@@ -345,18 +345,18 @@ jobs:
345345
if: ${{ inputs.all_variations }}
346346
uses: ./.github/actions/test-macos
347347
- name: Test Tracing JIT
348-
if: ${{ matrix.arch == 'X64' || !matrix.zts }}
348+
if: ${{ !matrix.zts }}
349349
uses: ./.github/actions/test-macos
350350
with:
351351
enableOpcache: true
352352
jitType: tracing
353353
- name: Test OpCache
354-
if: ${{ inputs.all_variations || (matrix.arch == 'ARM64' && matrix.zts) }}
354+
if: ${{ inputs.all_variations || matrix.zts }}
355355
uses: ./.github/actions/test-macos
356356
with:
357357
enableOpcache: true
358358
- name: Test Function JIT
359-
if: ${{ inputs.all_variations && (matrix.arch == 'X64' || !matrix.zts) }}
359+
if: ${{ inputs.all_variations && !matrix.zts }}
360360
uses: ./.github/actions/test-macos
361361
with:
362362
enableOpcache: true
@@ -853,7 +853,7 @@ jobs:
853853
PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
854854
PHP_BUILD_OBJ_DIR: C:\obj
855855
PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
856-
PHP_BUILD_SDK_BRANCH: php-sdk-2.8.2
856+
PHP_BUILD_SDK_BRANCH: php-sdk-2.8.4
857857
PHP_BUILD_CRT: ${{ fromJson(inputs.branch).jobs.WINDOWS.config.vs_crt_version }}
858858
PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
859859
THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"

0 commit comments

Comments
 (0)