]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorDmitry Stogov <dmitry@zend.com>
Mon, 2 Sep 2019 11:20:01 +0000 (14:20 +0300)
committerDmitry Stogov <dmitry@zend.com>
Mon, 2 Sep 2019 11:20:01 +0000 (14:20 +0300)
* PHP-7.4:
  Free two bits in fn_flags by merging ZEND_ACC_HEAP_RT_CACHE/ZEND_ACC_USER_ARG_INFO and ZEND_ACC_DONE_PASS_TWO/ZEND_ACC_ARENA_ALLOCATED that may be used only for user/internal functions

1  2 
Zend/zend_closures.c
Zend/zend_compile.h

Simple merge
index 4e075a7d1ef51dfca1d52c6ded0f0a57a346acad,3e2a9cbe96edfc2ae53f2a7d499f7c55a8c091d4..ea6fe87d45b1ca84ec1ad55129b43468803bb5dc
@@@ -278,7 -278,7 +278,7 @@@ typedef struct _zend_oparray_context 
  /* Class has unresolved variance obligations.             |     |     |     */
  #define ZEND_ACC_UNRESOLVED_VARIANCE     (1 << 21) /*  X  |     |     |     */
  /*                                                        |     |     |     */
- /* Function Flags                                         |     |     |     */
 -/* Function Flags (unused: 23, 26)                        |     |     |     */
++/* Function Flags (unused: 17, 23, 26)                    |     |     |     */
  /* ==============                                         |     |     |     */
  /*                                                        |     |     |     */
  /* deprecation flag                                       |     |     |     */