Merge branch 'PHP-7.4'

* PHP-7.4:
  Skip new watch point test under asan

diff --cc sapi/phpdbg/tests/bug73927.phpt
index f1890e48501ae11fb6a6365f66b13311727ece5a,bb54f4e176172d441faf3d13d52657f2f4bdda07..ff2e32d1ef05c145e8c24d56e970ef73febb3662
--- 1/sapi/phpdbg/tests/bug73927.phpt
--- 2/sapi/phpdbg/tests/bug73927.phpt
+++ b/sapi/phpdbg/tests/bug73927.phpt
@@@ -2,9 -2,9 +2,11 @@@
  Bug #73927 (phpdbg fails with windows error prompt at "watch array")
  --SKIPIF--
  <?php
- }
+ if (getenv('SKIP_ASAN')) {
+     die("skip intentionally causes segfaults");
+ }
 +if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
 +    die('xfail breakpoint/watchpoint issues with JIT on Windows');
  ?>
  --PHPDBG--
  b 19