diff --git a/dockerfiles/ci/alpine_compile_extension/docker-compose.yml b/dockerfiles/ci/alpine_compile_extension/docker-compose.yml index 0201dc852bb..52892420c92 100644 --- a/dockerfiles/ci/alpine_compile_extension/docker-compose.yml +++ b/dockerfiles/ci/alpine_compile_extension/docker-compose.yml @@ -128,8 +128,8 @@ services: context: . x-bake: *bake args: - phpVersion: 8.4.21 - phpSha256Hash: db96ee0a8e5ee7b73a4913a2aeddc162ba2ef16cd34b9347b5b9a6150e1f8e48 + phpVersion: 8.4.22 + phpSha256Hash: a012c2c9724baf214a70b41b40a7e130906b8855e54268afa5bc4ae17bc9d823 phpApi: 20240924 volumes: - ../../:/app @@ -140,8 +140,8 @@ services: context: . x-bake: *bake args: - phpVersion: 8.5.6 - phpSha256Hash: "169aaa21c2834b38df8e39169f43bc5bea8d4059a816cfbc59be08fc2bae60cd" + phpVersion: 8.5.7 + phpSha256Hash: "e5eba93fd6dd3241d0e61e932eb99a3783b40568553fb0e511b660ecd863a049" phpApi: 20250925 volumes: - ../../:/app diff --git a/dockerfiles/ci/bookworm/docker-compose.yml b/dockerfiles/ci/bookworm/docker-compose.yml index 08e8d54cff2..8f167dfb7e6 100644 --- a/dockerfiles/ci/bookworm/docker-compose.yml +++ b/dockerfiles/ci/bookworm/docker-compose.yml @@ -23,8 +23,8 @@ services: args: <<: *build-base phpVersion: "8.5" - phpTarGzUrl: https://www.php.net/distributions/php-8.5.6.tar.gz - phpSha256Hash: "169aaa21c2834b38df8e39169f43bc5bea8d4059a816cfbc59be08fc2bae60cd" + phpTarGzUrl: https://www.php.net/distributions/php-8.5.7.tar.gz + phpSha256Hash: "e5eba93fd6dd3241d0e61e932eb99a3783b40568553fb0e511b660ecd863a049" php-8.4: image: datadog/dd-trace-ci:php-8.4_bookworm-$BOOKWORM_NEXT_VERSION @@ -35,8 +35,8 @@ services: args: <<: *build-base phpVersion: "8.4" - phpTarGzUrl: https://www.php.net/distributions/php-8.4.21.tar.gz - phpSha256Hash: "db96ee0a8e5ee7b73a4913a2aeddc162ba2ef16cd34b9347b5b9a6150e1f8e48" + phpTarGzUrl: https://www.php.net/distributions/php-8.4.22.tar.gz + phpSha256Hash: "a012c2c9724baf214a70b41b40a7e130906b8855e54268afa5bc4ae17bc9d823" php-8.3: image: datadog/dd-trace-ci:php-8.3_bookworm-$BOOKWORM_NEXT_VERSION diff --git a/dockerfiles/ci/bookworm/php-8.5/0001-Disable-preserve_none-under-ASan.patch b/dockerfiles/ci/bookworm/php-8.5/0001-Disable-preserve_none-under-ASan.patch deleted file mode 100644 index 7014fac1c71..00000000000 --- a/dockerfiles/ci/bookworm/php-8.5/0001-Disable-preserve_none-under-ASan.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Levi Morrison -Date: Mon, 07 Apr 2026 00:00:00 +0000 -Subject: [PATCH] Disable preserve_none under ASan - -preserve_none combined with -fsanitize=address crashes clang 19+ on -x86-64. Disable it when ASan is active, following the same fix applied -in llvm-project (commit 996157c). - -See: https://github.com/llvm/llvm-project/issues/95928 ---- - Zend/zend_portability.h | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h -index 6546ebfb5b7..3b657f7b9d9 100644 ---- a/Zend/zend_portability.h -+++ b/Zend/zend_portability.h -@@ -333,7 +333,12 @@ char *alloca(); - #endif - - #ifdef HAVE_PRESERVE_NONE --# define ZEND_PRESERVE_NONE __attribute__((preserve_none)) -+# if __has_feature(address_sanitizer) || defined(__SANITIZE_ADDRESS__) -+/* preserve_none + ASan crashes clang 19+ on x86-64, see llvm/llvm-project#95928 */ -+# define ZEND_PRESERVE_NONE -+# else -+# define ZEND_PRESERVE_NONE __attribute__((preserve_none)) -+# endif - #endif - - diff --git a/dockerfiles/ci/bookworm/php-8.5/Dockerfile b/dockerfiles/ci/bookworm/php-8.5/Dockerfile index 0be7910cfd7..6ef866f59fb 100644 --- a/dockerfiles/ci/bookworm/php-8.5/Dockerfile +++ b/dockerfiles/ci/bookworm/php-8.5/Dockerfile @@ -10,14 +10,12 @@ COPY php-8.5/suppr.txt /home/circleci/suppr.txt FROM --platform=$BUILDPLATFORM $BUILD_BASE AS src ARG phpTarGzUrl ARG phpSha256Hash -COPY php-8.5/0001-Disable-preserve_none-under-ASan.patch /home/circleci RUN set -eux; \ curl -fsSL -o /tmp/php.tar.gz "${phpTarGzUrl}"; \ (echo "${phpSha256Hash} /tmp/php.tar.gz" | sha256sum -c -); \ tar xf /tmp/php.tar.gz -C "${PHP_SRC_DIR}" --strip-components=1; \ rm -f /tmp/php.tar.gz; \ cd ${PHP_SRC_DIR}; \ - git apply /home/circleci/0001-Disable-preserve_none-under-ASan.patch; \ # We need to remove the dl() calls from run-tests as some extensions don't properly switch interned string storage for INIs. \ sed -i 's/\bdl(/(bool)(/' run-tests.php; \ ./buildconf --force; diff --git a/dockerfiles/ci/centos/7/docker-compose.yml b/dockerfiles/ci/centos/7/docker-compose.yml index e1378570db4..2b427a95ba1 100644 --- a/dockerfiles/ci/centos/7/docker-compose.yml +++ b/dockerfiles/ci/centos/7/docker-compose.yml @@ -117,8 +117,8 @@ services: x-bake: *bake args: phpVersion: "8.4" - phpTarGzUrl: https://www.php.net/distributions/php-8.4.21.tar.gz - phpSha256Hash: "db96ee0a8e5ee7b73a4913a2aeddc162ba2ef16cd34b9347b5b9a6150e1f8e48" + phpTarGzUrl: https://www.php.net/distributions/php-8.4.22.tar.gz + phpSha256Hash: "a012c2c9724baf214a70b41b40a7e130906b8855e54268afa5bc4ae17bc9d823" image: 'datadog/dd-trace-ci:php-8.4_centos-7' php-8.5: @@ -128,6 +128,6 @@ services: x-bake: *bake args: phpVersion: "8.5" - phpTarGzUrl: https://www.php.net/distributions/php-8.5.6.tar.gz - phpSha256Hash: "169aaa21c2834b38df8e39169f43bc5bea8d4059a816cfbc59be08fc2bae60cd" + phpTarGzUrl: https://www.php.net/distributions/php-8.5.7.tar.gz + phpSha256Hash: "e5eba93fd6dd3241d0e61e932eb99a3783b40568553fb0e511b660ecd863a049" image: 'datadog/dd-trace-ci:php-8.5_centos-7' diff --git a/dockerfiles/ci/windows/docker-compose.yml b/dockerfiles/ci/windows/docker-compose.yml index 2e87bdc12fc..86fde8f34e9 100644 --- a/dockerfiles/ci/windows/docker-compose.yml +++ b/dockerfiles/ci/windows/docker-compose.yml @@ -66,10 +66,10 @@ services: - windows/amd64 context: . args: - phpVersion: "8.5.6" + phpVersion: "8.5.7" vsVersion: "vs17" - phpTarGzUrl: https://www.php.net/distributions/php-8.5.6.tar.gz - phpSha256Hash: "169aaa21c2834b38df8e39169f43bc5bea8d4059a816cfbc59be08fc2bae60cd" + phpTarGzUrl: https://www.php.net/distributions/php-8.5.7.tar.gz + phpSha256Hash: "e5eba93fd6dd3241d0e61e932eb99a3783b40568553fb0e511b660ecd863a049" php-8.4: image: datadog/dd-trace-ci:php-8.4_windows @@ -78,10 +78,10 @@ services: - windows/amd64 context: . args: - phpVersion: "8.4.21" + phpVersion: "8.4.22" vsVersion: "vs17" - phpTarGzUrl: https://www.php.net/distributions/php-8.4.21.tar.gz - phpSha256Hash: "db96ee0a8e5ee7b73a4913a2aeddc162ba2ef16cd34b9347b5b9a6150e1f8e48" + phpTarGzUrl: https://www.php.net/distributions/php-8.4.22.tar.gz + phpSha256Hash: "a012c2c9724baf214a70b41b40a7e130906b8855e54268afa5bc4ae17bc9d823" php-8.3: image: datadog/dd-trace-ci:php-8.3_windows diff --git a/tests/opcache/jit_trace_num_bailout.phpt b/tests/opcache/jit_trace_num_bailout.phpt index 2712990961b..1510a14e551 100644 --- a/tests/opcache/jit_trace_num_bailout.phpt +++ b/tests/opcache/jit_trace_num_bailout.phpt @@ -12,6 +12,8 @@ crash in zend_jit_trace_exit(). if (PHP_VERSION_ID < 80000) die('skip: JIT is only available on PHP 8+'); if (!extension_loaded('Zend OPcache')) die('skip: Zend OPcache is required'); ?> +--XFAIL-- +PHP 8.5 Bookworm image needs to be rebuilt with ASAN preserve_none enabled --ENV-- DD_TRACE_GENERATE_ROOT_SPAN=0 DD_TRACE_LOG_LEVEL=off