Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/Zend/CMakeLists.txt

@@ -486,8 +486,8 @@ if(BISON_FOUND)
     zend_ini_parser
     zend_ini_parser.y
     ${CMAKE_CURRENT_SOURCE_DIR}/zend_ini_parser.c
-    COMPILE_FLAGS "-Wall -d"
-    VERBOSE REPORT_FILE ${CMAKE_CURRENT_BINARY_DIR}/zend_ini_parser.output
+    COMPILE_FLAGS "${PHP_DEFAULT_BISON_FLAGS}"
+    VERBOSE REPORT_FILE zend_ini_parser.output
     DEFINES_FILE ${CMAKE_CURRENT_SOURCE_DIR}/zend_ini_parser.h
   )
 
@@ -498,8 +498,8 @@ if(BISON_FOUND)
     zend_language_parser
     zend_language_parser.y
     ${CMAKE_CURRENT_SOURCE_DIR}/zend_language_parser.c
-    COMPILE_FLAGS "-Wall -d"
-    VERBOSE REPORT_FILE ${CMAKE_CURRENT_BINARY_DIR}/zend_language_parser.output
+    COMPILE_FLAGS "${PHP_DEFAULT_BISON_FLAGS}"
+    VERBOSE REPORT_FILE zend_language_parser.output
     DEFINES_FILE ${CMAKE_CURRENT_SOURCE_DIR}/zend_language_parser.h
   )
 

cmake/cmake/BuildTypes.cmake

@@ -22,8 +22,10 @@ block()
         allowedBuildTypes
           Debug           # Debug info, assertions, not optimized.
           DebugAssertions # Custom PHP debug build type with assertions enabled
-                          # in the release mode. TODO: Adjust the flags.
-          MinSizeRel      # Optimized for size rather than speed.
+                          # in the RelWithDebInfo mode: optimized, debug info,
+                          # assertions.
+          MinSizeRel      # Same as Release but optimized for size rather than
+                          # speed.
           Release         # No debug info, no assertions, optimized.
           RelWithDebInfo  # Debug info, optimized, no assertions.
       )
@@ -51,3 +53,14 @@ target_compile_definitions(
   INTERFACE
     $<IF:$<CONFIG:Debug,DebugAssertions>,ZEND_DEBUG=1,ZEND_DEBUG=0>
 )
+
+# Set CMAKE_<LANG>_FLAGS_<CONFIG> variables for the DebugAssertions build type.
+foreach(prefix CMAKE_C_FLAGS CMAKE_CXX_FLAGS CMAKE_ASM_FLAGS)
+  string(
+    REGEX REPLACE
+    "(-DNDEBUG|/DNDEBUG)"
+    ""
+    ${prefix}_DEBUGASSERTIONS
+    "${${prefix}_RELWITHDEBINFO}"
+  )
+endforeach()

cmake/cmake/Requirements.cmake

@@ -89,6 +89,9 @@ if(
       TYPE REQUIRED
       PURPOSE "Necessary to generate PHP parser files."
   )
+  # TODO: Add Bison options based on the build type.
+  #set(PHP_DEFAULT_BISON_FLAGS "-Wall $<$<CONFIG:Release,MinSizeRel>:-l>")
+  set(PHP_DEFAULT_BISON_FLAGS "-Wall")
 endif()
 
 # Check if re2c is required.
@@ -113,7 +116,11 @@ if(
   endif()
 
   set(RE2C_ENABLE_DOWNLOAD TRUE)
-  set(RE2C_DEFAULT_OPTIONS --no-generation-date)
+  set(
+    RE2C_DEFAULT_OPTIONS
+      --no-generation-date # Suppress date output in the generated file.
+      $<$<CONFIG:Release,MinSizeRel>:-i> # Do not output line directives.
+  )
 
   find_package(RE2C 1.0.3)
   set_package_properties(

cmake/cmake/modules/FindRE2C.cmake

@@ -260,10 +260,11 @@ function(re2c_target)
 
     list(APPEND outputs ${header})
 
-    # Before version 1.2 also --bit-vectors (-c) option is required when header
-    # option is used.
+    # When header option is used before version 1.2, also the '-c' option is
+    # required. Before 1.1 -c long variant is '--start-conditions' and after 1.1
+    # '--conditions'.
     if(RE2C_VERSION VERSION_LESS_EQUAL 1.2)
-      list(APPEND options "--bit-vectors")
+      list(APPEND options -c)
     endif()
 
     # Since version 3.0, --header is the new alias option for --type-header.

cmake/ext/json/CMakeLists.txt

@@ -31,7 +31,8 @@ if(BISON_FOUND)
     php_json_parser
     json_parser.y
     ${CMAKE_CURRENT_SOURCE_DIR}/json_parser.tab.c
-    COMPILE_FLAGS "-Wall --defines -l"
+    COMPILE_FLAGS "${PHP_DEFAULT_BISON_FLAGS}"
+    VERBOSE REPORT_FILE json_parser.tab.output
     DEFINES_FILE ${CMAKE_CURRENT_SOURCE_DIR}/json_parser.tab.h
   )
 
@@ -45,6 +46,6 @@ if(RE2C_FOUND)
     json_scanner.re
     ${CMAKE_CURRENT_SOURCE_DIR}/json_scanner.c
     HEADER ${CMAKE_CURRENT_SOURCE_DIR}/php_json_scanner_defs.h
-    OPTIONS -bci
+    OPTIONS -bc
   )
 endif()

cmake/sapi/phpdbg/CMakeLists.txt

@@ -192,8 +192,8 @@ if(BISON_FOUND)
     php_phpdbg_parser
     phpdbg_parser.y
     ${CMAKE_CURRENT_SOURCE_DIR}/phpdbg_parser.c
-    COMPILE_FLAGS "-Wall -d"
-    VERBOSE REPORT_FILE ${CMAKE_CURRENT_BINARY_DIR}/phpdbg_parser.output
+    COMPILE_FLAGS "${PHP_DEFAULT_BISON_FLAGS}"
+    VERBOSE REPORT_FILE phpdbg_parser.output
     DEFINES_FILE ${CMAKE_CURRENT_SOURCE_DIR}/phpdbg_parser.h
   )