Skip to content

Commit d6d838a

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: Fix asan shadow memory and shared_alloc_mmap clash
2 parents 88ba9dc + 8524da6 commit d6d838a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ext/opcache/shared_alloc_mmap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
# define MAP_HUGETLB MAP_ALIGNED_SUPER
4949
#endif
5050

51-
#if (defined(__linux__) || defined(__FreeBSD__)) && (defined(__x86_64__) || defined (__aarch64__))
51+
#if (defined(__linux__) || defined(__FreeBSD__)) && (defined(__x86_64__) || defined (__aarch64__)) && !defined(__SANITIZE_ADDRESS__)
5252
static void *find_prefered_mmap_base(size_t requested_size)
5353
{
5454
size_t huge_page_size = 2 * 1024 * 1024;
@@ -186,7 +186,7 @@ static int create_segments(size_t requested_size, zend_shared_segment ***shared_
186186
#ifdef MAP_JIT
187187
flags |= MAP_JIT;
188188
#endif
189-
#if (defined(__linux__) || defined(__FreeBSD__)) && (defined(__x86_64__) || defined (__aarch64__))
189+
#if (defined(__linux__) || defined(__FreeBSD__)) && (defined(__x86_64__) || defined (__aarch64__)) && !defined(__SANITIZE_ADDRESS__)
190190
void *hint = find_prefered_mmap_base(requested_size);
191191
if (hint != MAP_FAILED) {
192192
# ifdef MAP_HUGETLB

0 commit comments

Comments
 (0)