Merge branch 'PHP-8.1' into PHP-8.2

iluuu1994 · iluuu1994 · commit 18942459a29a · 2023-10-11T12:11:59.000+02:00
* PHP-8.1:
  Report warning if JIT cannot be enabled
diff --git a/NEWS b/NEWS
@@ -5,6 +5,9 @@ PHP                                                                        NEWS
 - Core:
   . Fixed double-free of non-interned enum case name. (ilutov)
 
+- Opcache:
+  . Added warning when JIT cannot be enabled. (danog)
+
 26 Oct 2023, PHP 8.2.12
 
 - Core:
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -3278,6 +3278,7 @@ static zend_result accel_post_startup(void)
 			 || zend_jit_startup(ZSMMG(reserved), jit_size, reattached) != SUCCESS) {
 				JIT_G(enabled) = false;
 				JIT_G(on) = false;
+				zend_accel_error(ACCEL_LOG_WARNING, "Could not enable JIT!");
 			}
 		}
 #endif

Original file line number	Diff line number	Diff line change
`@@ -3278,6 +3278,7 @@ static zend_result accel_post_startup(void)`
`3278`	`3278`	`\|\| zend_jit_startup(ZSMMG(reserved), jit_size, reattached) != SUCCESS) {`
`3279`	`3279`	`JIT_G(enabled) = false;`
`3280`	`3280`	`JIT_G(on) = false;`
	`3281`	`+ zend_accel_error(ACCEL_LOG_WARNING, "Could not enable JIT!");`
`3281`	`3282`	`}`
`3282`	`3283`	`}`
`3283`	`3284`	`#endif`