Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/Configuration.cmake

@@ -132,6 +132,8 @@ mark_as_advanced(PHP_DTRACE)
 
 set(PHP_FD_SETSIZE "" CACHE STRING "Size of file descriptor sets")
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND PHP_FD_SETSIZE STREQUAL "")
+  # This allows up to 256 sockets to be select()ed in a single call to select(),
+  # instead of the usual 64.
   set_property(CACHE PHP_FD_SETSIZE PROPERTY VALUE "256")
 endif()
 mark_as_advanced(PHP_FD_SETSIZE)

cmake/cmake/ConfigureChecks.cmake

@@ -446,7 +446,7 @@ if(PHP_FD_SETSIZE MATCHES "^[0-9]+$" AND PHP_FD_SETSIZE GREATER 0)
   target_compile_definitions(
     php_config
     INTERFACE
-      $<$<COMPILE_LANGUAGE:ASM,C,CXX>:FD_SETSIZE=${PHP_FD_SETSIZE}>
+      $<$<COMPILE_LANGUAGE:C,CXX>:FD_SETSIZE=${PHP_FD_SETSIZE}>
   )
 elseif(NOT PHP_FD_SETSIZE STREQUAL "")
   message(
@@ -893,7 +893,7 @@ if(PHP_DMALLOC)
   target_compile_definitions(
     php_config
     INTERFACE
-      $<$<COMPILE_LANGUAGE:ASM,C,CXX>:DMALLOC_FUNC_CHECK>
+      $<$<COMPILE_LANGUAGE:C,CXX>:DMALLOC_FUNC_CHECK>
   )
 
   target_link_libraries(php_config INTERFACE Dmalloc::Dmalloc)

cmake/cmake/Flags.cmake

@@ -195,6 +195,15 @@ if(PHP_HAS_FFP_CONTRACT_OFF_C)
   )
 endif()
 
+# Enable inline reader cache.
+# https://devblogs.microsoft.com/cppblog/visual-studio-2017-throughput-improvements-and-advice/
+if(MSVC)
+  target_compile_options(
+    php_config
+    INTERFACE $<$<COMPILE_LANGUAGE:C,CXX>:/d2FuncCache1>
+  )
+endif()
+
 ################################################################################
 # Sanitizer flags.
 ################################################################################

cmake/main/CMakeLists.txt

@@ -4,7 +4,10 @@ PHP main binding.
 
 include(CheckSymbolExists)
 
-# Compile and link properties for all targets in this directory scope.
+################################################################################
+# Compile and link properties for all binary targets in this directory scope.
+################################################################################
+
 add_compile_definitions(ZEND_ENABLE_STATIC_TSRMLS_CACHE)
 link_libraries(PHP::config)