Prevent possible incorrect optimization caused by ZEND_ASSUME()

dstogov · dstogov · commit bf98023f1af4 · 2024-08-29T23:10:34.000+03:00
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c
@@ -357,8 +357,6 @@ static size_t zend_shared_alloc_get_largest_free_block(void)
 
 void *zend_shared_alloc(size_t size)
 {
-	ZEND_ASSERT(ZCG(locked));
-
 	int i;
 	unsigned int block_size = ZEND_ALIGNED_SIZE(size);
 
@@ -368,6 +366,7 @@ void *zend_shared_alloc(size_t 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
`@@ -357,8 +357,6 @@ static size_t zend_shared_alloc_get_largest_free_block(void)`
`357`	`357`
`358`	`358`	`void *zend_shared_alloc(size_t size)`
`359`	`359`	`{`
`360`		`- ZEND_ASSERT(ZCG(locked));`
`361`		`-`
`362`	`360`	`int i;`
`363`	`361`	`unsigned int block_size = ZEND_ALIGNED_SIZE(size);`
`364`	`362`
`@@ -368,6 +366,7 @@ void *zend_shared_alloc(size_t size)`
`368`	`366`
`369`	`367`	`#if 1`
`370`	`368`	`if (!ZCG(locked)) {`
	`369`	`+ ZEND_ASSERT(0 && "Shared memory lock not obtained");`
`371`	`370`	`zend_accel_error_noreturn(ACCEL_LOG_ERROR, "Shared memory lock not obtained");`
`372`	`371`	`}`
`373`	`372`	`#endif`