Merge branch 'PHP-8.0'

nikic · nikic · commit 0896f36bc6a6 · 2020-12-15T10:18:54.000+01:00
* PHP-8.0:
  JIT: Update invalid opcache.jit INI value message to include "tracing" and "function" values
diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
@@ -4129,7 +4129,7 @@ ZEND_EXT_API int zend_jit_config(zend_string *jit, int stage)
 	}
 
 failure:
-	zend_error(E_WARNING, "Invalid \"opcache.jit\" setting. Should be \"disable\", \"on\", \"off\" or 4-digit number");
+	zend_error(E_WARNING, "Invalid \"opcache.jit\" setting. Should be \"disable\", \"on\", \"off\", \"tracing\", \"function\" or 4-digit number");
 	JIT_G(enabled) = 0;
 	JIT_G(on) = 0;
 	return FAILURE;

Original file line number	Diff line number	Diff line change
`@@ -4129,7 +4129,7 @@ ZEND_EXT_API int zend_jit_config(zend_string *jit, int stage)`
`4129`	`4129`	`}`
`4130`	`4130`
`4131`	`4131`	`failure:`
`4132`		`- zend_error(E_WARNING, "Invalid \"opcache.jit\" setting. Should be \"disable\", \"on\", \"off\" or 4-digit number");`
	`4132`	`+ zend_error(E_WARNING, "Invalid \"opcache.jit\" setting. Should be \"disable\", \"on\", \"off\", \"tracing\", \"function\" or 4-digit number");`
`4133`	`4133`	`JIT_G(enabled) = 0;`
`4134`	`4134`	`JIT_G(on) = 0;`
`4135`	`4135`	`return FAILURE;`