Spl dir optimizations

NEWS

@@ -8,6 +8,10 @@ PHP                                                                        NEWS
 
 - Core:
   . Fixed line number of JMP instruction over else block. (ilutov)
+  . Fixed use-of-uninitialized-value with ??= on assert. (ilutov)
+
+- OpenSSL
+  . Added support for additional EC parameters in openssl_pkey_new. (Eno-CN)
 
 06 Jul 2023, PHP 8.3.0alpha3
 

UPGRADING.INTERNALS

@@ -67,6 +67,9 @@ PHP 8.3 INTERNALS UPGRADE NOTES
   - zend_set_user_opcode_handler
   - zend_ssa_inference
 * Removed unused macros PHP_FNV1_32A_INIT and PHP_FNV1A_64_INIT. See GH-11114.
+* _php_stream_dirent now has an extra d_type field that is used to store the
+  directory entry type. This can be used to avoid additional stat calls for
+  types when the type is already known.
 
 ========================
 2. Build system changes
@@ -115,6 +118,7 @@ PHP 8.3 INTERNALS UPGRADE NOTES
  e. ext/spl
    - The PHPAPI spl_iterator_apply() function now returns zend_result instead of int.
      There are no functional changes.
+   - The field _spl_filesystem_object->is_recursive has been removed.
 
  f. ext/dom
    - A new function dom_get_doc_props_read_only() is added to gather the document

Zend/tests/gh11580.phpt

@@ -0,0 +1,13 @@
+--TEST--
+GH-11580: assert() with ??= operator can lead to use-of-uninitialized-value
+--INI--
+zend.assertions=0
+--FILE--
+<?php
+assert(y)[y] ??= y;
+?>
+--EXPECTF--
+Fatal error: Uncaught Error: Undefined constant "y" in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d

Zend/zend_compile.c

@@ -4203,6 +4203,10 @@ static void zend_compile_assert(znode *result, zend_ast_list *args, zend_string
 		zend_op *opline;
 		uint32_t check_op_number = get_next_op_number();
 
+		/* Assert expression may not be memoized and reused as it may not actually be evaluated. */
+		int orig_memoize_mode = CG(memoize_mode);
+		CG(memoize_mode) = ZEND_MEMOIZE_NONE;
+
 		zend_emit_op(NULL, ZEND_ASSERT_CHECK, NULL, NULL);
 
 		if (fbc && fbc_is_finalized(fbc)) {
@@ -4236,6 +4240,8 @@ static void zend_compile_assert(znode *result, zend_ast_list *args, zend_string
 		opline = &CG(active_op_array)->opcodes[check_op_number];
 		opline->op2.opline_num = get_next_op_number();
 		SET_NODE(opline->result, result);
+
+		CG(memoize_mode) = orig_memoize_mode;
 	} else {
 		if (!fbc) {
 			zend_string_release_ex(name, 0);

Zend/zend_virtual_cwd.h

@@ -87,6 +87,16 @@ typedef unsigned short mode_t;
 #else
 #ifdef HAVE_DIRENT_H
 #include <dirent.h>
+
+#ifndef DT_UNKNOWN
+# define DT_UNKNOWN 0
+#endif
+#ifndef DT_DIR
+# define DT_DIR 4
+#endif
+#ifndef DT_REG
+# define DT_REG 8
+#endif
 #endif
 
 #define DEFAULT_SLASH '/'