Skip to content

zend_portability: Simplify definition of ZEND_NORETURN - #23908

Merged
TimWolla merged 1 commit into
php:masterfrom
TimWolla:noreturn
Sep 29, 2026
Merged

TimWolla merged 1 commit into
php:masterfrom
TimWolla:noreturn

Conversation

@TimWolla

Copy link
Copy Markdown
Member

No description provided.

Comment thread ext/ffi/php_ffi.h Outdated
@TimWolla TimWolla changed the title tree-wide: Replace ZEND_NORETURN by noreturn zend_portability: Simplify definition of ZEND_NORETURN Sep 25, 2026
@TimWolla
TimWolla requested review from Girgias and removed request for arnaud-lb, devnexen and dstogov September 25, 2026 11:44
@TimWolla
TimWolla force-pushed the noreturn branch 2 times, most recently from 56b9411 to 0990a3a Compare September 25, 2026 12:10

@Girgias Girgias left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If CI is green.

Comment thread UPGRADING.INTERNALS

@arnaud-lb arnaud-lb left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@TimWolla

Copy link
Copy Markdown
Member Author

@Girgias Fresh review request for the adjusted changelog. CI is green now.

@TimWolla
TimWolla merged commit 83e2394 into php:master Sep 29, 2026
18 checks passed
@TimWolla
TimWolla deleted the noreturn branch September 29, 2026 12:25
bukka added a commit to bukka/php-src that referenced this pull request Sep 29, 2026
* upstream/master: (99 commits)
  NEWS
  Fix property hook escape analysis causing misoptimization
  Fix __isset escape analysis causing misoptimization
  Fix memory leak when closing a statement on a killed connection
  Reset field_count for OK packet (php#23890)
  Fix phpGH-23986: Clear the realpath cache in the child after pcntl_fork() (php#23987)
  ext/standard: Remove redundant if-branch in rot13 (php#23795)
  ext/pdo: Throw a ValueError from bindColumn() for an unknown column (php#23835)
  Zend: rename zend_object* parameter to "this_ptr" for zend_call_* functions (php#23989)
  ext/pdo: Release driver options after bindParam and bindColumn
  tests: Raise test stack for stream error depth limit under MSan (php#23985)
  Zend: Remove zend_atomic.[ch] abstraction (php#23927)
  fibers: fix phpGH-23921 (Fibers start with error_reporting = 0 when the error_reporting INI directive is not set)
  ext/pdo: Keep statement class when ATTR_STATEMENT_CLASS is rejected
  Verify bundled sources using CI - Opcache JIT IR (php#20179)
  zend_portability: Simplify definition of `ZEND_NORETURN` (php#23908)
  Fix phpGH-23758: PDO_Firebird returns null for empty BLOBs (php#23763)
  Remove redundant parentheses in session tests (php#23609)
  Update IR (php#23861)
  Fix OSS-Fuzz #552682112: assertion failure wrt zp_arg_must_be_sent_by_ref() (php#23760)
  ...

# Conflicts:
#	ext/openssl/xp_ssl.c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants