Merge branch 'master' into internal_vm_interrupt

Author: morrisonlevi

.github/CODEOWNERS

@@ -5,6 +5,12 @@
 # the problem area and could aid in deciding whether a pull request is ready
 # for merging.
 #
+# When changing this file, please make sure to commit the changes to the
+# earliest supported PHP branch (PHP-X.Y) and not only to the master branch.
+# GitHub reads the CODEOWNERS file from the pull request's targeted branch.
+# Commit changes here similar to bug fixes:
+# https://github.com/php/php-src/blob/master/CONTRIBUTING.md#pull-requests
+#
 # For more information, see the GitHub CODEOWNERS documentation:
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 

.github/actions/apt-x64/action.yml

@@ -44,7 +44,7 @@ runs:
           libxml2-dev \
           libxslt1-dev \
           libpq-dev \
-          libreadline-dev \
+          libedit-dev \
           libldap2-dev \
           libsodium-dev \
           libargon2-0-dev \

.github/actions/configure-x64/action.yml

@@ -41,7 +41,7 @@ runs:
           --enable-sysvshm \
           --enable-shmop \
           --enable-pcntl \
-          --with-readline \
+          --without-readline --with-libedit \
           --enable-mbstring \
           --with-curl \
           --with-gettext \

NEWS

@@ -1,11 +1,26 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 8.4.0alpha3
+?? ??? ????, PHP 8.4.0beta1
+
+- PHPDBG:
+  . array out of bounds, stack overflow handled for segfault handler on windows.
+    (David Carlier)
+
+
+01 Aug 2024, PHP 8.4.0alpha4
+
+- GMP:
+  . RFC: Change GMP bool cast behavior. (Saki Takamachi)
+
+01 Aug 2024, PHP 8.4.0alpha3
 
 - Core:
   . Fix GH-14978 (The xmlreader extension phpize build). (Peter Kokot)
   . Throw Error exception when encountering recursion during comparison, rather
     than fatal error. (ilutov)
+  . Added missing cstddef include for C++ builds. (cmb)
+  . Fixed bug GH-15108 (Segfault when destroying generator during shutdown).
+    (Arnaud)
 
 - BCMath:
   . Adjust bcround()'s $mode parameter to only accept the RoundingMode
@@ -20,13 +35,17 @@ PHP                                                                        NEWS
   . /dev/poll events.mechanism for Solaris/Illumos setting had been retired.
     (David Carlier)
 
+- GMP:
+  . The GMP class is now final and cannot be extended anymore. (Girgias)
+
 - Intl:
   . Added SpoofChecker::setAllowedChars to set unicode chars ranges.
     (David Carlier)
+  . Fixed bug GH-15087 (IntlChar::foldCase()'s $option is not optional). (cmb)
 
 - Opcache:
   . Fixed bug GH-13775 (Memory leak possibly related to opcache SHM placement).
-    (Arnaud)
+    (Arnaud, nielsdos)
 
 - OpenSSL:
   . Bumped minimum required OpenSSL version to 1.1.0. (cmb)
@@ -41,13 +60,27 @@ PHP                                                                        NEWS
   . pg_convert/pg_insert/pg_update/pg_delete ; regexes are now cached.
     (David Carlier)
 
+- Random:
+  . Fixed bug GH-15094 (php_random_default_engine() is not C++ conforming).
+    (cmb)
+
+- Readline:
+  . Fixed readline_info, rl_line_buffer_length/rl_len globals on update.
+    (David Carlier)
+
 - Standard:
   . Fix references in request_parse_body() options array. (nielsdos)
   . Add RoundingMode enum. (timwolla, saki)
 
 - Tidy:
   . Failures in the constructor now throw exceptions rather than emitting
     warnings and having a broken object. (nielsdos)
+  . Add tidyNode::getNextSibling() and tidyNode::getPreviousSibling().
+    (nielsdos)
+
+- XMLReader:
+  . Fixed bug GH-15123 (var_dump doesn't actually work on XMLReader).
+    (nielsdos)
 
 - XSL:
   . Fix trampoline leak in xpath callables. (nielsdos)

UPGRADING

@@ -48,6 +48,13 @@ PHP 8.4 UPGRADE NOTES
     object. This is no longer possible, and cloning a DOMXPath object now throws
     an error.
 
+- GMP:
+  . The GMP class is now final and cannot be extended anymore.
+    RFC: https://wiki.php.net/rfc/gmp-final
+  . Casting a GMP object to bool changed so that 0 becomes false and everything else
+    becomes true.
+    RFC: https://wiki.php.net/rfc/fix_up_bcmath_number_class
+
 - Intl:
   . resourcebundle_get(), ResourceBundle::get(), and accessing offsets on a
     ResourceBundle object now throw:
@@ -576,8 +583,9 @@ PHP 8.4 UPGRADE NOTES
     decimal number and round it to 0.29. However, "pre-rounding" incorrectly rounds
     certain numbers, so this fix removes "pre-rounding" and changes the way numbers
     are compared, so that the values are correctly rounded as decimal numbers.
-  . The maximum precision that can be handled by round() has been extended by
-    one digit.
+  . The maximum precision that can be handled by round() has been extended by one
+    digit. For example, `round(4503599627370495.5)` returned in `4503599627370495.5`,
+    but now returns `4503599627370496`.
   . The default value of the 'cost' option for PASSWORD_BCRYPT for password_hash()
     has been increased from '10' to '12'.
 
@@ -667,6 +675,9 @@ PHP 8.4 UPGRADE NOTES
     array_any().
     RFC: https://wiki.php.net/rfc/array_find
 
+- Tidy:
+  . Added tidyNode::getNextSibling() and tidyNode::getPreviousSibling().
+
 - XMLReader:
   . Added XMLReader::fromStream(), XMLReader::fromUri(), XMLReader::fromString().
     RFC: https://wiki.php.net/rfc/xmlreader_writer_streams

UPGRADING.INTERNALS

@@ -171,6 +171,9 @@ PHP 8.4 INTERNALS UPGRADE NOTES
    - M4 macro PHP_SETUP_OPENSSL doesn't accept the 3rd argument anymore.
    - M4 macro PHP_EVAL_LIBLINE got a new 3rd argument to override the ext_shared
      checks.
+   - M4 macro PHP_SETUP_LIBXML doesn't define the redundant HAVE_LIBXML symbol
+     anymore.
+   - M4 macro PHP_SETUP_ICONV doesn't define the HAVE_ICONV symbol anymore.
    - TSRM/tsrm.m4 file and its TSRM_CHECK_PTHREADS M4 macro have been removed.
    - Added pkg-config support to find libpq for the pdo_pgsql and pgsql
      extensions. The libpq paths can be customized with the PGSQL_CFLAGS and

Zend/Optimizer/zend_inference.c

@@ -4998,8 +4998,6 @@ ZEND_API bool zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op
 
 	switch (opline->opcode) {
 		case ZEND_NOP:
-		case ZEND_IS_IDENTICAL:
-		case ZEND_IS_NOT_IDENTICAL:
 		case ZEND_QM_ASSIGN:
 		case ZEND_JMP:
 		case ZEND_CHECK_VAR:
@@ -5021,10 +5019,14 @@ ZEND_API bool zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op
 		case ZEND_FUNC_NUM_ARGS:
 		case ZEND_FUNC_GET_ARGS:
 		case ZEND_COPY_TMP:
-		case ZEND_CASE_STRICT:
 		case ZEND_JMP_NULL:
 		case ZEND_JMP_FRAMELESS:
 			return 0;
+		case ZEND_IS_IDENTICAL:
+		case ZEND_IS_NOT_IDENTICAL:
+		case ZEND_CASE_STRICT:
+			/* Array to array comparison may lead to recursion. */
+			return (t1 & t2) & MAY_BE_ARRAY_OF_ARRAY;
 		case ZEND_SEND_VAR:
 		case ZEND_SEND_VAL:
 		case ZEND_SEND_REF:

Zend/tests/gh15108-001.phpt

@@ -0,0 +1,36 @@
+--TEST--
+GH-15108 001: Segfault with delegated generator in suspended fiber
+--FILE--
+<?php
+
+class It implements \IteratorAggregate
+{
+    public function getIterator(): \Generator
+    {
+        yield 'foo';
+        Fiber::suspend();
+        var_dump("not executed");
+    }
+}
+
+function f() {
+    yield from new It();
+}
+
+$iterable = f();
+
+$fiber = new Fiber(function () use ($iterable) {
+    var_dump($iterable->current());
+    $iterable->next();
+    var_dump("not executed");
+});
+
+$ref = $fiber;
+
+$fiber->start();
+
+?>
+==DONE==
+--EXPECT--
+string(3) "foo"
+==DONE==

Zend/tests/gh15108-002.phpt

@@ -0,0 +1,40 @@
+--TEST--
+GH-15108 002: Segfault with delegated generator in suspended fiber
+--FILE--
+<?php
+
+class It implements \IteratorAggregate
+{
+    public function getIterator(): \Generator
+    {
+        yield 'foo';
+        Fiber::suspend();
+        var_dump("not executed");
+    }
+}
+
+function g() {
+    yield from new It();
+}
+
+function f() {
+    yield from g();
+}
+
+$iterable = f();
+
+$fiber = new Fiber(function () use ($iterable) {
+    var_dump($iterable->current());
+    $iterable->next();
+    var_dump("not executed");
+});
+
+$ref = $fiber;
+
+$fiber->start();
+
+?>
+==DONE==
+--EXPECT--
+string(3) "foo"
+==DONE==

Zend/tests/gh15108-003.phpt

@@ -0,0 +1,38 @@
+--TEST--
+GH-15108 003: Segfault with delegated generator in suspended fiber
+--FILE--
+<?php
+
+class It implements \IteratorAggregate
+{
+    public function getIterator(): \Generator
+    {
+        yield 'foo';
+        Fiber::suspend();
+        var_dump("not executed");
+    }
+}
+
+function f($gen) {
+    yield from $gen;
+}
+
+$a = new It();
+$b = f($a);
+$c = f($a);
+
+$fiber = new Fiber(function () use ($a, $b, $c) {
+    var_dump($b->current());
+    $b->next();
+    var_dump("not executed");
+});
+
+$ref = $fiber;
+
+$fiber->start();
+
+?>
+==DONE==
+--EXPECT--
+string(3) "foo"
+==DONE==

Zend/tests/gh15108-004.phpt

@@ -0,0 +1,39 @@
+--TEST--
+GH-15108 004: Segfault with delegated generator in suspended fiber
+--FILE--
+<?php
+
+function gen1() {
+    yield 'foo';
+    Fiber::suspend();
+    var_dump("not executed");
+};
+
+function gen2($gen) {
+    yield from $gen;
+    var_dump("not executed");
+}
+
+$a = gen1();
+/* Both $b and $c have a root marked with IN_FIBER, but only $b is actually
+ * running in a fiber (at shutdown) */
+$b = gen2($a);
+$c = gen2($a);
+
+$fiber = new Fiber(function () use ($a, $b, $c) {
+    var_dump($b->current());
+    var_dump($c->current());
+    $b->next();
+    var_dump("not executed");
+});
+
+$ref = $fiber;
+
+$fiber->start();
+
+?>
+==DONE==
+--EXPECT--
+string(3) "foo"
+string(3) "foo"
+==DONE==

Zend/tests/gh15108-005.phpt

@@ -0,0 +1,45 @@
+--TEST--
+GH-15108 005: Segfault with delegated generator in suspended fiber
+--FILE--
+<?php
+
+class It implements \IteratorAggregate
+{
+    public function getIterator(): \Generator
+    {
+        yield 'foo';
+        Fiber::suspend();
+        var_dump("not executed");
+    }
+}
+
+function f() {
+    yield from new It();
+}
+
+function g() {
+    yield from f();
+}
+
+function h() {
+    /* g() is an intermediate node and will not be marked with IN_FIBER */
+    yield from g();
+}
+
+$iterable = h();
+var_dump($iterable->current());
+
+$fiber = new Fiber(function () use ($iterable) {
+    $iterable->next();
+    var_dump("not executed");
+});
+
+$ref = $fiber;
+
+$fiber->start();
+
+?>
+==DONE==
+--EXPECT--
+string(3) "foo"
+==DONE==