Merge branch 'PHP-8.3'

dstogov · dstogov · commit 80efb3aba484 · 2024-08-29T23:12:56.000+03:00
* PHP-8.3:
  Prevent possible incorrect optimization caused by ZEND_ASSUME()
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c
@@ -366,13 +366,12 @@ static size_t zend_shared_alloc_get_largest_free_block(void)
 
 void *zend_shared_alloc(size_t size)
 {
-	ZEND_ASSERT(ZCG(locked));
-
 	int i;
 	size_t block_size = ZEND_ALIGNED_SIZE(size);
 
 #if 1
 	if (!ZCG(locked)) {
+		ZEND_ASSERT(0 && "Shared memory lock not obtained");
 		zend_accel_error_noreturn(ACCEL_LOG_ERROR, "Shared memory lock not obtained");
 	}
 #endif

Original file line number	Diff line number	Diff line change
`@@ -366,13 +366,12 @@ static size_t zend_shared_alloc_get_largest_free_block(void)`
`366`	`366`
`367`	`367`	`void *zend_shared_alloc(size_t size)`
`368`	`368`	`{`
`369`		`- ZEND_ASSERT(ZCG(locked));`
`370`		`-`
`371`	`369`	`int i;`
`372`	`370`	`size_t block_size = ZEND_ALIGNED_SIZE(size);`
`373`	`371`
`374`	`372`	`#if 1`
`375`	`373`	`if (!ZCG(locked)) {`
	`374`	`+ ZEND_ASSERT(0 && "Shared memory lock not obtained");`
`376`	`375`	`zend_accel_error_noreturn(ACCEL_LOG_ERROR, "Shared memory lock not obtained");`
`377`	`376`	`}`
`378`	`377`	`#endif`