Merge branch 'PHP-7.4' into PHP-8.0

cmb69 · cmb69 · commit 952354273300 · 2021-10-05T11:50:31.000+02:00
* PHP-7.4:
  Revert "Fix #81424: PCRE2 10.35 JIT performance regression"
diff --git a/NEWS b/NEWS
@@ -29,9 +29,6 @@ PHP                                                                        NEWS
   . Fixed bug #81472 (Cannot support large linux major/minor device number when
     read /proc/self/maps). (Lin Yang)
 
-- PCRE:
-  . Fixed bug #81424 (PCRE2 10.35 JIT performance regression). (cmb)
-
 - Reflection:
   . ReflectionAttribute is no longer final. (sasezaki)
 
diff --git a/ext/pcre/pcre2lib/pcre2_jit_compile.c b/ext/pcre/pcre2lib/pcre2_jit_compile.c
@@ -11152,7 +11152,7 @@ early_fail_type = (early_fail_ptr & 0x7);
 early_fail_ptr >>= 3;
 
 /* During recursion, these optimizations are disabled. */
-if (common->early_fail_start_ptr == 0 && common->fast_forward_bc_ptr == NULL)
+if (common->early_fail_start_ptr == 0)
   {
   early_fail_ptr = 0;
   early_fail_type = type_skip;

Original file line number	Diff line number	Diff line change
`@@ -11152,7 +11152,7 @@ early_fail_type = (early_fail_ptr & 0x7);`
`11152`	`11152`	`early_fail_ptr >>= 3;`
`11153`	`11153`
`11154`	`11154`	`/* During recursion, these optimizations are disabled. */`
`11155`		`-if (common->early_fail_start_ptr == 0 && common->fast_forward_bc_ptr == NULL)`
	`11155`	`+if (common->early_fail_start_ptr == 0)`
`11156`	`11156`	`{`
`11157`	`11157`	`early_fail_ptr = 0;`
`11158`	`11158`	`early_fail_type = type_skip;`