Merge branch 'master'

Author: mvorisek

.github/workflows/push.yml

@@ -20,6 +20,9 @@ on:
       - '**'
 permissions:
   contents: read
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.url || github.run_id }}
+  cancel-in-progress: true
 env:
   CC: ccache gcc
   CXX: ccache g++
@@ -186,7 +189,7 @@ jobs:
       - name: git config
         run: git config --global core.autocrlf false && git config --global core.eol lf
       - name: git checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup MySQL
         run: |
           choco install mysql -y --no-progress --params="/port:3306"

TSRM/threads.m4

@@ -73,7 +73,7 @@ void *thread_routine(void *data) {
     return data;
 }
 
-int main() {
+int main(void) {
     pthread_t thd;
     pthread_mutexattr_t mattr;
     int data = 1;

UPGRADING

@@ -96,6 +96,10 @@ PHP 8.3 UPGRADE NOTES
   . password_hash() will now chain the underlying Random\RandomException
     as the ValueError’s $previous Exception when salt generation fails.
   . proc_open() $command array must now have at least one non empty element.
+  . array_sum() and array_product() now warn when values in the array cannot be converted to int/float.
+    Previously arrays and objects where ignored whilst every other value was cast to int.
+    Moreover, objects that define a numeric cast (e.g. GMP) are now casted instead of ignored.
+    RFC: https://wiki.php.net/rfc/saner-array-sum-product
 
 ========================================
 6. New Functions

UPGRADING.INTERNALS

@@ -37,6 +37,8 @@ PHP 8.3 INTERNALS UPGRADE NOTES
 * The return types of the following functions have been changed from
   `bool` to `zend_result`:
   - zend_fiber_init_context()
+* The fast_add_function() has been removed, use add_function() that will
+  call the static inline add_function_fast() instead.
 
 ========================
 2. Build system changes

Zend/Zend.m4

@@ -162,7 +162,7 @@ int stack_grows_downwards(uintptr_t arg) {
     return (uintptr_t)&local < arg;
 }
 
-int main() {
+int main(void) {
     int local;
 
     f = stack_grows_downwards;
@@ -250,7 +250,7 @@ typedef union _mm_align_test {
 #define ZEND_MM_ALIGNMENT (sizeof(mm_align_test))
 #endif
 
-int main()
+int main(void)
 {
   size_t i = ZEND_MM_ALIGNMENT;
   int zeros = 0;

Zend/tests/gh10709.phpt

@@ -0,0 +1,21 @@
+--TEST--
+GH-10709: Recursive class constant evaluation
+--FILE--
+<?php
+
+class B { const C = A::C . "B"; }
+
+spl_autoload_register(function ($class) {
+    class A { const C = "A"; }
+    var_dump(B::C);
+});
+
+try {
+    new B();
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+string(2) "AB"

Zend/tests/gh10709_2.phpt

@@ -0,0 +1,30 @@
+--TEST--
+GH-10709: Recursive class constant evaluation
+--FILE--
+<?php
+
+class B {
+    public $prop = A::C;
+}
+
+spl_autoload_register(function ($class) {
+    class A { const C = "A"; }
+    var_dump(new B());
+});
+
+try {
+    var_dump(new B());
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+object(B)#2 (1) {
+  ["prop"]=>
+  string(1) "A"
+}
+object(B)#2 (1) {
+  ["prop"]=>
+  string(1) "A"
+}

Zend/tests/gh10709_3.phpt

@@ -0,0 +1,43 @@
+--TEST--
+GH-10709: Recursive class constant evaluation with outer call failing
+--FILE--
+<?php
+
+class S {
+    public function __toString() {
+        static $i = 0;
+        $i++;
+        if ($i === 1) {
+            return 'S';
+        } else {
+            throw new \Exception('Thrown from S');
+        }
+    }
+}
+
+const S = new S();
+
+class B {
+    public $prop = A::C . S;
+}
+
+spl_autoload_register(function ($class) {
+    class A { const C = "A"; }
+    var_dump(new B());
+});
+
+var_dump(new B());
+
+?>
+--EXPECTF--
+object(B)#3 (1) {
+  ["prop"]=>
+  string(2) "AS"
+}
+
+Fatal error: Uncaught Exception: Thrown from S in %s:%d
+Stack trace:
+#0 %s(%d): [constant expression]()
+#1 %s(%d): S->__toString()
+#2 {main}
+  thrown in %s on line %d

Zend/tests/readonly_props/readonly_clone_error1.phpt

@@ -1,11 +1,5 @@
 --TEST--
 Readonly property cannot be reset twice during cloning
---SKIPIF--
-<?php
-if (function_exists('opcache_get_status') && (opcache_get_status()["jit"]["enabled"] ?? false)) {
-    die('skip Not yet implemented for JIT');
-}
-?>
 --FILE--
 <?php
 

Zend/tests/readonly_props/readonly_clone_error4.phpt

@@ -0,0 +1,44 @@
+--TEST--
+Readonly property cannot be op-assigned twice during cloning
+--FILE--
+<?php
+
+class Foo {
+    public function __construct(
+        public readonly int $bar
+    ) {}
+
+    public function __clone()
+    {
+        $this->bar += 2;
+        var_dump($this);
+        $this->bar += 3;
+    }
+}
+
+$foo = new Foo(1);
+
+try {
+    clone $foo;
+} catch (Error $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+try {
+    clone $foo;
+} catch (Error $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+?>
+--EXPECT--
+object(Foo)#2 (1) {
+  ["bar"]=>
+  int(3)
+}
+Cannot modify readonly property Foo::$bar
+object(Foo)#2 (1) {
+  ["bar"]=>
+  int(3)
+}
+Cannot modify readonly property Foo::$bar

Zend/tests/readonly_props/readonly_clone_error5.phpt

@@ -0,0 +1,76 @@
+--TEST--
+Readonly property clone indirect variation for JIT
+--FILE--
+<?php
+
+trait CloneSetOnceTrait {
+    public function __clone() {
+        $this->prop[] = 1;
+    }
+}
+
+trait CloneSetTwiceTrait {
+    public function __clone() {
+        $this->prop[] = 1;
+        $this->prop[] = 2;
+    }
+}
+
+class TestSetOnce {
+    use CloneSetOnceTrait;
+    public readonly array $prop;
+    public function __construct() {
+        $this->prop = [];
+    }
+}
+
+class TestSetTwice {
+    use CloneSetTwiceTrait;
+    public readonly array $prop;
+    public function __construct() {
+        $this->prop = [];
+    }
+}
+
+try {
+    var_dump(clone (new TestSetOnce()));
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+try {
+    var_dump(clone (new TestSetOnce()));
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+try {
+    var_dump(clone (new TestSetTwice()));
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+try {
+    var_dump(clone (new TestSetTwice()));
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+object(TestSetOnce)#2 (1) {
+  ["prop"]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+}
+object(TestSetOnce)#1 (1) {
+  ["prop"]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+}
+Cannot modify readonly property TestSetTwice::$prop
+Cannot modify readonly property TestSetTwice::$prop

Zend/tests/readonly_props/readonly_clone_success1.phpt

@@ -1,11 +1,5 @@
 --TEST--
 Readonly property can be reset once during cloning
---SKIPIF--
-<?php
-if (function_exists('opcache_get_status') && (opcache_get_status()["jit"]["enabled"] ?? false)) {
-    die('skip Not yet implemented for JIT');
-}
-?>
 --FILE--
 <?php
 

Zend/tests/readonly_props/readonly_clone_success3.phpt

@@ -1,11 +1,5 @@
 --TEST--
 __clone() can indirectly modify unlocked readonly properties
---SKIPIF--
-<?php
-if (function_exists('opcache_get_status') && (opcache_get_status()["jit"]["enabled"] ?? false)) {
-    die('skip Not yet implemented for JIT');
-}
-?>
 --FILE--
 <?php
 

Zend/zend.c

@@ -1281,6 +1281,34 @@ ZEND_API void zend_deactivate(void) /* {{{ */
 
 	zend_destroy_rsrc_list(&EG(regular_list));
 
+	/* See GH-8646: https://github.com/php/php-src/issues/8646
+	 *
+	 * Interned strings that hold class entries can get a corresponding slot in map_ptr for the CE cache.
+	 * map_ptr works like a bump allocator: there is a counter which increases to allocate the next slot in the map.
+	 *
+	 * For class name strings in non-opcache we have:
+	 *   - on startup: permanent + interned
+	 *   - on request: interned
+	 * For class name strings in opcache we have:
+	 *   - on startup: permanent + interned
+	 *   - on request: either not interned at all, which we can ignore because they won't get a CE cache entry
+	 *                 or they were already permanent + interned
+	 *                 or we get a new permanent + interned string in the opcache persistence code
+	 *
+	 * Notice that the map_ptr layout always has the permanent strings first, and the request strings after.
+	 * In non-opcache, a request string may get a slot in map_ptr, and that interned request string
+	 * gets destroyed at the end of the request. The corresponding map_ptr slot can thereafter never be used again.
+	 * This causes map_ptr to keep reallocating to larger and larger sizes.
+	 *
+	 * We solve it as follows:
+	 * We can check whether we had any interned request strings, which only happens in non-opcache.
+	 * If we have any, we reset map_ptr to the last permanent string.
+	 * We can't lose any permanent strings because of map_ptr's layout.
+	 */
+	if (zend_hash_num_elements(&CG(interned_strings)) > 0) {
+		zend_map_ptr_reset();
+	}
+
 #if GC_BENCH
 	fprintf(stderr, "GC Statistics\n");
 	fprintf(stderr, "-------------\n");