Merge branch 'PHP-8.0' into PHP-8.1

cmb69 · cmb69 · commit 34cd6cbfe041 · 2021-10-05T11:52:32.000+02:00
* PHP-8.0:
  Revert "Fix #81424: PCRE2 10.35 JIT performance regression"
diff --git a/NEWS b/NEWS
@@ -10,6 +10,9 @@ PHP                                                                        NEWS
     Doleček)
   . Fixed bug #81380 (Observer may not be initialized properly). (krakjoe)
 
+- PCRE:
+  . Unfixed bug #81424 (PCRE2 10.35 JIT performance regression). (cmb)
+
 - Standard:
   . Fixed bug #81491 (Incorrectly using libsodium for argon2 hashing).
     (Dan Pock)
diff --git a/ext/pcre/pcre2lib/pcre2_jit_compile.c b/ext/pcre/pcre2lib/pcre2_jit_compile.c
@@ -11228,7 +11228,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
`@@ -11228,7 +11228,7 @@ early_fail_type = (early_fail_ptr & 0x7);`
`11228`	`11228`	`early_fail_ptr >>= 3;`
`11229`	`11229`
`11230`	`11230`	`/* During recursion, these optimizations are disabled. */`
`11231`		`-if (common->early_fail_start_ptr == 0 && common->fast_forward_bc_ptr == NULL)`
	`11231`	`+if (common->early_fail_start_ptr == 0)`
`11232`	`11232`	`{`
`11233`	`11233`	`early_fail_ptr = 0;`
`11234`	`11234`	`early_fail_type = type_skip;`